From b169e0fe3ecad3713880626bd6152c58d8ed4222 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 10 十月 2023 19:59:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/sales/subOrder/DetailSubOrder.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/sales/subOrder/DetailSubOrder.vue b/src/views/sales/subOrder/DetailSubOrder.vue
index 277c4a7..8638f95 100644
--- a/src/views/sales/subOrder/DetailSubOrder.vue
+++ b/src/views/sales/subOrder/DetailSubOrder.vue
@@ -120,8 +120,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
--
Gitblit v1.8.0