From b7968858014ab02aa91e52e63c2a266963d3a8f9 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期四, 24 八月 2023 18:06:22 +0800
Subject: [PATCH] 4807 4812）
---
src/views/sales/subOrder/index.vue | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index b5369b2..1a0baab 100644
--- a/src/views/sales/subOrder/index.vue
+++ b/src/views/sales/subOrder/index.vue
@@ -20,8 +20,8 @@
</div>
<TableCommonView
ref="tableListRef"
- :show-summary="showSummary"
:table-list="tableList"
+ :show-summary="showSummary"
:select-box="!isDetail"
@selClientClick="selClientClick"
@selMasterClick="selMasterClick"
@@ -109,7 +109,7 @@
},
showSummary: {
show: true,
- sumProp: ["number1"],
+ sumProp: ["productAmount"],
mergeNumber: 6
},
subOrderDeail: {
@@ -138,7 +138,7 @@
this.search_map = {}
} else {
this.search_map = {
- [this.addConfig.id_name]: this.addConfig.client_name
+ [this.addConfig.id_name]: this.addConfig.common_name
}
}
this.getData(this.search_map)
@@ -153,8 +153,8 @@
{ label: "閿�鍞�诲崟", prop: "master_order_number", min: 90, isMasterClick: true }, // 閿�鍞�诲崟
{ label: "璐熻矗浜�", prop: "member_name" }, // 璐熻矗浜�
// { label: "瀹℃壒鐘舵��", prop: "approvalStatus" }, // 瀹℃壒鐘舵��
- { label: "浜у搧鍚嶇О", prop: "productName" }, // 浜у搧鍚嶇О
- { label: "鏁伴噺", prop: "number1", min: 100 } // 鏁伴噺
+ { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true }, // 浜у搧鍚嶇О
+ { label: "鏁伴噺", prop: "productAmount", isProductAmount: true } // 鏁伴噺
]
}
this.searchOptions = []
@@ -216,14 +216,14 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { ...this.addConfig }
+ this.editConfig.infomation = { ...this.addConfig, currency: "浜烘皯甯�" }
},
// 缂栬緫
handleClick(row) {
console.log(row)
this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- this.editConfig.infomation = { ...row, masterOrderNumber: "" }
+ this.editConfig.infomation = { ...row, masterOrderNumber: "", currency: "浜烘皯甯�" }
},
// 鍒犻櫎
delClick() {
@@ -260,7 +260,13 @@
selClientClick(row) {
console.log(row)
this.clientDeail.visible = true
- this.clientDeail.infomation = { ...row, client_name: row.name }
+ this.clientDeail.infomation = {
+ ...row.client,
+ client_name: row.client.name,
+ client_level: row.client.client_level.name,
+ client_status: row.client.client_status.name,
+ contact_name: row.name
+ }
},
// 閿�鍞�诲崟璇︽儏
selMasterClick(row) {
@@ -297,4 +303,16 @@
}
}
}
+::v-deep {
+ .el-table .el-table__cell {
+ padding: 0;
+ }
+ .el-table__header tr,
+ .el-table__header th {
+ height: 48px;
+ }
+ .el-table__footer-wrapper tbody td.el-table__cell {
+ height: 48px;
+ }
+}
</style>
--
Gitblit v1.8.0