From 78cf30802189becef2725af73f37b5d2cb28600f Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 11 八月 2023 10:57:48 +0800
Subject: [PATCH] 新建跟进记录入参修改
---
src/views/sales/masterOrder/index.vue | 92 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 79 insertions(+), 13 deletions(-)
diff --git a/src/views/sales/masterOrder/index.vue b/src/views/sales/masterOrder/index.vue
index d01e15d..685e9e5 100644
--- a/src/views/sales/masterOrder/index.vue
+++ b/src/views/sales/masterOrder/index.vue
@@ -1,11 +1,28 @@
<template>
<div class="master-order">
- <SearchCommonView ref="searchCommonView" :query-class-options="queryClassOptions" :search-options="searchOptions" />
- <div class="btn-pager">
- <PublicFunctionBtnView :operates-list="operatesList" />
- <PagerView class="page" />
+ <div v-if="isDetail" class="detail-top">
+ <DetailListCommonBtn :query-class-options="queryClassOptions" />
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
- <TableCommonView ref="tableListRef" :show-summary="showSummary" :table-list="tableList">
+ <div v-else class="top">
+ <SearchCommonView
+ ref="searchCommonView"
+ :query-class-options="queryClassOptions"
+ :search-options="searchOptions"
+ />
+ <div class="btn-pager">
+ <PublicFunctionBtnView :operates-list="operatesList" />
+ <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
+ </div>
+ </div>
+ <TableCommonView
+ ref="tableListRef"
+ :show-summary="showSummary"
+ :table-list="tableList"
+ :select-box="!isDetail"
+ @selClientClick="selClientClick"
+ @selCommonClick="selCommonClick"
+ >
<template slot="tableButton">
<el-table-column label="鎿嶄綔" width="90">
<template slot-scope="scope">
@@ -17,18 +34,32 @@
</TableCommonView>
<!-- 鏂板缓/缂栬緫 -->
<AddMasterOrderDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
+ <!-- 閿�鍞瓙鍗曡鎯� -->
+ <DetailMasterOrder v-if="masterOrderDeail.visible" :master-order-detail="masterOrderDeail" />
+ <!-- 瀹㈡埛璇︽儏 -->
+ <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
</div>
</template>
<script>
import AddMasterOrderDialog from "@/views/sales/masterOrder/AddMasterOrderDialog"
import { getMasterOrderList, getDelMasterOrder } from "@/api/sales/masterOrder"
+import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import DetailMasterOrder from "@/views/sales/masterOrder/DetailMasterOrder"
export default {
name: "MasterOrder",
- props: {},
+ props: {
+ isDetail: {
+ type: Boolean,
+ default: false
+ }
+ },
+ mixins: [pageMixin],
components: {
- AddMasterOrderDialog
+ AddMasterOrderDialog,
+ DetailMasterOrder,
+ DetailClientManage: () => import("@/views/client/client/DetailClientManage")
},
computed: {},
data() {
@@ -62,6 +93,14 @@
show: true,
sumProp: ["money"],
mergeNumber: 5
+ },
+ masterOrderDeail: {
+ visible: false,
+ infomation: {}
+ },
+ clientDeail: {
+ visible: false,
+ infomation: {}
}
}
},
@@ -74,8 +113,8 @@
this.tableList = {
tableInfomation: [],
tableColumn: [
- { label: "鍗曟嵁缂栧彿", prop: "number", min: 100 }, // 鍗曟嵁缂栧彿
- { label: "瀹㈡埛鍚嶇О", prop: "client_id", min: 120 }, // 瀹㈡埛鍚嶇О
+ { label: "鍗曟嵁缂栧彿", prop: "number", min: 100, isCommonClick: true }, // 鍗曟嵁缂栧彿
+ { label: "瀹㈡埛鍚嶇О", prop: "client_name", min: 120, isClientClick: true }, // 瀹㈡埛鍚嶇О
{ label: "鏈嶅姟寮�濮嬫椂闂�", prop: "start_time", isTime: true }, // 鏈嶅姟寮�濮嬫椂闂�
{ label: "鏈嶅姟鎴鏃堕棿", prop: "end_time", isTime: true }, // 鏈嶅姟鎴鏃堕棿
{ label: "鍚堝悓閲戦", prop: "money" }, // 鍚堝悓閲戦
@@ -92,17 +131,23 @@
// 璇锋眰鏁版嵁
async getData() {
this.loading = true
- await getMasterOrderList()
+ await getMasterOrderList({
+ keyword: "",
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
.then((res) => {
console.log(res)
if (res.code === 200) {
if (res.data.list && res.data.list.length > 0) {
const list = res.data.list.map((item) => {
return {
- ...item
+ ...item,
+ client_name: item.client.name
}
})
this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.data.count
} else {
this.tableList.tableInfomation = []
}
@@ -143,7 +188,7 @@
.then((response) => {
if (response.code === 200) {
this.$message.success("鍒犻櫎鎴愬姛")
- this.getUserList()
+ this.getData()
} else {
this.$message.warning("鍒犻櫎澶辫触")
}
@@ -152,6 +197,18 @@
},
getSelectArray(val) {
console.log(val)
+ },
+ // 瀹㈡埛鍚嶇О璇︽儏
+ selClientClick(row) {
+ console.log(row)
+ this.clientDeail.visible = true
+ this.clientDeail.infomation = { ...row }
+ },
+ // 鏈轰細鍚嶇О璇︽儏
+ selCommonClick(row) {
+ console.log(row)
+ this.masterOrderDeail.visible = true
+ this.masterOrderDeail.infomation = { ...row }
}
}
}
@@ -160,7 +217,16 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.master-order {
- .btn-pager {
+ .top {
+ margin-bottom: 20px;
+ .btn-pager {
+ display: flex;
+ .page {
+ margin-left: auto;
+ }
+ }
+ }
+ .detail-top {
display: flex;
.page {
margin-left: auto;
--
Gitblit v1.8.0