From 33836e44d74759010d8e79f3cc702186c4bdf4ea Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 11:22:56 +0800
Subject: [PATCH] bug修复(5235 5236)

---
 src/views/sales/salesDetails/DetailSpecification.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 2667545..e4f1699 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -9,7 +9,7 @@
     >
       <template slot="title">
         <div class="header">
-          <span class="header-label">璁㈠崟缂栧彿</span>
+          <span class="header-label">閿�鍞槑缁嗗崟</span>
           <span class="header-title">{{ detailConfig.infomation.number }}</span>
         </div>
       </template>
@@ -48,7 +48,7 @@
             <el-tab-pane label="閿�鍞彂绁�" name="invoice"></el-tab-pane>
             <el-tab-pane label="閿�鍞��璐у崟" name="return"> </el-tab-pane>
             <el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
-            <el-tab-pane label="閿�鍞��娆惧崟" name="refundForm"></el-tab-pane>
+            <!-- <el-tab-pane label="閿�鍞��娆惧崟" name="refundForm"></el-tab-pane> -->
           </el-tabs>
         </div>
         <div v-if="activeName === 'first'" class="detail">
@@ -257,8 +257,8 @@
       showSummary: {
         show: true,
         total: true,
-        sumProp: ["other1", "other2", "other3", "other4"],
-        mergeNumber: 3
+        sumProp: ["amount", "price", "total"],
+        mergeNumber: 1
       },
       productTableList: {},
       addConfig: {}
@@ -275,7 +275,8 @@
       client_name: this.detailConfig.infomation.client.name,
       contact_name: this.detailConfig.infomation.contact_name,
       client_id: this.detailConfig.infomation.client_id,
-      contact_id: this.detailConfig.infomation.contact_id
+      contact_id: this.detailConfig.infomation.contact_id,
+      amountTotal: this.detailConfig.infomation.amountTotal
     }
     this.setTableForm()
   },
@@ -339,7 +340,7 @@
           leftStr: "鍒涘缓浜�",
           leftValue: "",
           rightStr: "鍒涘缓鏃堕棿",
-          rightValue: ""
+          rightValue: item.createTime
         }
       ]
       this.deliveryInfoList = [
@@ -359,7 +360,7 @@
       this.dynamicInfoList = [
         {
           leftStr: "淇敼鏃堕棿",
-          leftValue: "",
+          leftValue: item.updateTime,
           rightStr: "鍑哄簱鐘舵��",
           rightValue: ""
         },

--
Gitblit v1.8.0