From 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期二, 10 十月 2023 15:35:58 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/adjust-style
---
src/views/sales/salesDetails/DetailSpecification.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/sales/salesDetails/DetailSpecification.vue b/src/views/sales/salesDetails/DetailSpecification.vue
index 2667545..4deabf7 100644
--- a/src/views/sales/salesDetails/DetailSpecification.vue
+++ b/src/views/sales/salesDetails/DetailSpecification.vue
@@ -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