From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复

---
 src/views/sales/subOrder/index.vue |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/sales/subOrder/index.vue b/src/views/sales/subOrder/index.vue
index bd300a8..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: {
@@ -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) {
@@ -305,5 +311,8 @@
   .el-table__header th {
     height: 48px;
   }
+  .el-table__footer-wrapper tbody td.el-table__cell {
+    height: 48px;
+  }
 }
 </style>

--
Gitblit v1.8.0