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/salesDetails/index.vue | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue index 8c8a14e..71efa8f 100644 --- a/src/views/sales/salesDetails/index.vue +++ b/src/views/sales/salesDetails/index.vue @@ -76,7 +76,7 @@ color: TabsIndex==1 ? '#fff' : '#666' }" > - 搴撳瓨淇℃伅 + 鍙戣揣淇℃伅 </div> <div class="tab-pane" @@ -195,17 +195,20 @@ { label: "浜у搧鍚嶇О", prop: "name" }, { label: "鏁伴噺", prop: "amount" }, { label: "鍗曚綅", prop: "unit" }, - { label: "鍙戣揣鍗�", prop: "invoice" }, - { label: "鎵胯繍鍟�", prop: "carrier" }, - { label: "杩愬崟鍙�", prop: "waybillNumber" }, { label: "閿�鍞崟浠�", prop: "salePrice", price: true }, - { label: "浠风◣鍚堣", prop: "valorem", price: true } + { label: "鎴愭湰鍗曚环", prop: "cost" }, + { label: "姣涘埄", prop: "profit" }, + { label: "姣涘埄鐜�(%)", prop: "margin",}, + { label: "浠风◣鍚堣", prop: "total", price: true } ] // 搴撳瓨淇℃伅 const inventoryColumn = [ { label: "浜у搧缂栧彿", prop: "number", default: true }, { label: "浜у搧鍚嶇О", prop: "name" }, { label: "璁㈠崟鏁伴噺", prop: "orderAmount" }, + { label: "鍙戣揣鍗�", prop: "invoice" }, + { label: "鎵胯繍鍟�", prop: "carrier" }, + { label: "杩愬崟鍙�", prop: "waybill" }, { label: "浠撳簱", prop: "warehouse" }, { label: "鍦ㄥ簱鏁伴噺", prop: "amount" }, { label: "鍙敤搴撳瓨", prop: "availableNumber" }, @@ -306,9 +309,9 @@ TabsIndex: "0", productTableList: {}, productColumn: productColumn, - showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "鍙戣揣鍗�", "鎵胯繍鍟�", "杩愬崟鍙�", "閿�鍞崟浠�", "浠风◣鍚堣"], + showProductCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "鏁伴噺", "鍗曚綅", "閿�鍞崟浠�","鎴愭湰鍗曚环", "姣涘埄", "姣涘埄鐜�(%)","浠风◣鍚堣"], inventoryColumn: inventoryColumn, - showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"], + showInventoryCol: ["浜у搧缂栧彿", "浜у搧鍚嶇О", "璁㈠崟鏁伴噺", "鍙戣揣鍗�", "鎵胯繍鍟�", "杩愬崟鍙�","浠撳簱", "鍦ㄥ簱鏁伴噺", "鍙敤搴撳瓨", "鍗曚綅"], makeColumn: makeColumn, showMakeCol: ["鐢熶骇璁㈠崟", "浜у搧鍚嶇О", "璁㈠崟鐘舵��", "宸ュ崟缂栧彿", "宸ュ崟鐘舵��", "璁″垝寮�濮嬫椂闂�", "璁″垝缁撴潫鏃堕棿"], // 閲囪喘 @@ -471,7 +474,7 @@ }, // 鑾峰彇浜у搧/搴撳瓨淇℃伅 async getProductInventoryInfo(row) { - if (row.status === 1) { + if (this.TabsIndex == 0||row.status==1) { this.productTableList.tableInfomation = row.products || [] } else { this.loading = true -- Gitblit v1.8.0