From 75e27a973b76fa78ff12b96b503487c3d7e33688 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 16:06:13 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/crm-web into dev
---
src/views/sales/quotation/index.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index e4b68f6..9ac2a32 100644
--- a/src/views/sales/quotation/index.vue
+++ b/src/views/sales/quotation/index.vue
@@ -111,8 +111,8 @@
{ label: "閿�鍞崟浠�", prop: "price" },
{ label: "鎴愭湰鍗曚环", prop: "cost" },
{ label: "姣涘埄", prop: "profit" },
- { label: "姣涘埄鐜�", prop: "margin",},
- { label: "浠风◣鍚堣", prop: "valorem", price: true }
+ { label: "姣涘埄鐜�(%)", prop: "margin",},
+ { label: "浠风◣鍚堣", prop: "total", price: true }
]
return {
tableList: {},
@@ -163,11 +163,11 @@
{ label: "閿�鍞礋璐ｄ汉", prop: "member_name" }, // 閿�鍞礋璐ｄ汉
{ label: "鏈夋晥鏈�", prop: "validity_date", min: 100 }, // 淇敼鏃堕棿
// { label: "灏忚", prop: "subTotal" }, // 灏忚
- // { label: "鍚堣", prop: "total" }, // 鍚堣
+ { label: "鍚堣", prop: "amountTotal", price:true}, // 鍚堣
{ label: "瀹㈡埗鍚嶇О", prop: "client_name",min: 120,},
{ label: "鐘舵��", prop: "quotationStatus",}
],
- showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О","鐘舵��"],
+ showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�", "閿�鍞礋璐ｄ汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О",'鍚堣',"鐘舵��"],
selectRow: {},
loading:false,
// 澧炲姞 浜у搧淇℃伅鍒楄〃
@@ -176,7 +176,7 @@
showBottomCol: [],
productTableList: {},
productColumn: productColumn,
- showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�", "浠风◣鍚堣"],
+ showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)", "浠风◣鍚堣"],
}
},
created() {
@@ -326,12 +326,11 @@
},
// 缂栬緫
handleClick(row) {
- console.log(row)
- this.editConfig.visible = true
this.editConfig.title = "缂栬緫"
- console.log("dddddddd")
- console.log(row)
- this.editConfig.infomation = { ...row, currency: "浜烘皯甯�" }
+ let params = JSON.parse(JSON.stringify(row));
+ this.editConfig.infomation = { ...params, currency: "浜烘皯甯�" }
+ console.log(this.editConfig.infomation.products,'===products')
+ this.editConfig.visible = true
},
// 鎵归噺鍒犻櫎
delClick() {
--
Gitblit v1.8.0