From 213e33c0501b2067dceae06c7887c695d78b1f48 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 27 十二月 2023 16:01:06 +0800
Subject: [PATCH] 报价单列表增加合计+对应的产品信息价税合计不显示的问题修改

---
 src/views/sales/quotation/index.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/sales/quotation/index.vue b/src/views/sales/quotation/index.vue
index 05e9396..24e3613 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: "閿�鍞礋璐d汉", prop: "member_name" }, // 閿�鍞礋璐d汉
         { 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: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�",  "閿�鍞礋璐d汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О","鐘舵��"],
+      showCol: ["鎶ヤ环鍗曞彿", "鎶ヤ环鍗曞悕绉�",  "閿�鍞礋璐d汉", "鏈夋晥鏈�", "瀹㈡埗鍚嶇О",'鍚堣',"鐘舵��"],
       selectRow: {},
       loading:false,
       // 澧炲姞 浜у搧淇℃伅鍒楄〃
@@ -176,7 +176,7 @@
       showBottomCol: [],
       productTableList: {},
       productColumn: productColumn,
-      showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�", "浠风◣鍚堣"],
+      showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�", "鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)", "浠风◣鍚堣"],
     }
   },
   created() {

--
Gitblit v1.8.0