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/salesDetails/index.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/views/sales/salesDetails/index.vue b/src/views/sales/salesDetails/index.vue
index 560a58d..fad5aa4 100644
--- a/src/views/sales/salesDetails/index.vue
+++ b/src/views/sales/salesDetails/index.vue
@@ -112,6 +112,7 @@
           "uninvoicedAmount",
           "number",
           "unOutoundNo",
+          "taxUnitPrice",
           "priceTax"
         ],
         mergeNumber: 6
@@ -154,17 +155,16 @@
           { label: "瀹㈡埛鍚嶇О", prop: "client_name", isClientClick: true },
           { label: "绛剧害鏃ユ湡", prop: "signTime", width: 150 },
           { label: "閿�鍞礋璐d汉", prop: "member_name" },
-          { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
+          // { label: "鍑哄簱鐘舵��", prop: "outboundStatus" },
           { label: "宸叉敹鎬婚", prop: "receiveTotalAmount", price: true },
           { label: "鍚堣", prop: "total", price: true },
           { label: "搴旀敹浣欓", prop: "amountReceivable", price: true },
           { label: "宸插紑绁ㄩ噾棰�", prop: "invoicedAmount", price: true },
           { label: "鏈紑绁ㄩ噾棰�", prop: "uninvoicedAmount", price: true },
-          { label: "浜у搧鍚嶇О", prop: "productName" },
-          { label: "鏁伴噺", prop: "number1" },
-          { label: "鍚◣鍗曚环", prop: "taxUnitPrice", price: true },
-          { label: "鏈嚭搴撴暟閲�", prop: "unOutoundNo" },
-          { label: "浠风◣鍚堣", prop: "priceTax", price: true }
+          { label: "浜у搧鍚嶇О", prop: "productName", isProductName: true },
+          { label: "鏁伴噺", prop: "productNumber", isProductAmount: true },
+          { label: "閿�鍞崟浠�", prop: "taxUnitPrice", isProductPrice: true },
+          { label: "浠风◣鍚堣", prop: "priceTax", isProductTotal: true }
         ]
       }
       this.searchOptions = []
@@ -225,14 +225,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, sale_chance_name: "" }
+      this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "浜烘皯甯�" }
     },
     // 鍒犻櫎
     delClick() {
@@ -269,7 +269,13 @@
     selClientClick(row) {
       console.log(row)
       this.clientDeail.visible = true
-      this.clientDeail.infomation = { ...row, client_name: row.name }
+      this.clientDeail.infomation = {
+        ...row.client,
+        member: row.Member,
+        client_name: row.client.name,
+        client_level: row.client.client_level.name,
+        client_status: row.client.client_status.name
+      }
     },
     // 鑱旂郴浜鸿鎯�
     selCommonClick(row) {
@@ -301,9 +307,15 @@
   }
 }
 ::v-deep {
-  .el-table .cell,
-  .el-table th.el-table__cell > .cell {
-    padding: 0 2px;
+  .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