From 01cea4bc73210e43f748d82a02a432cce615be2d Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 24 十月 2023 17:52:04 +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 | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/sales/subOrder/DetailSubOrder.vue b/src/views/sales/subOrder/DetailSubOrder.vue
index 277c4a7..9046af6 100644
--- a/src/views/sales/subOrder/DetailSubOrder.vue
+++ b/src/views/sales/subOrder/DetailSubOrder.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>
@@ -120,8 +120,8 @@
showSummary: {
show: true,
total: true,
- sumProp: ["other1", "other2", "other3", "other4"],
- mergeNumber: 3
+ sumProp: ["amount", "price", "total"],
+ mergeNumber: 1
},
productTableList: {},
addConfig: {}
@@ -136,7 +136,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,
+ subbill_name: this.detailConfig.infomation.number
}
this.setTableForm()
},
--
Gitblit v1.8.0