From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/views/sales/masterOrder/DetailMasterOrder.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/views/sales/masterOrder/DetailMasterOrder.vue b/src/views/sales/masterOrder/DetailMasterOrder.vue
index 9f11216..af8d514 100644
--- a/src/views/sales/masterOrder/DetailMasterOrder.vue
+++ b/src/views/sales/masterOrder/DetailMasterOrder.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>
@@ -67,7 +67,7 @@
</div> -->
</div>
<div v-if="activeName === 'sub'" class="second">
- <SubOrder :isDetail="true" />
+ <SubOrder :isDetail="true" :add-config="addCommonConfig" />
</div>
</div>
</el-drawer>
@@ -97,11 +97,19 @@
activeName: "first",
isBasicExpand: true, // 鍩烘湰淇℃伅
basicInfoList: [],
- isAnnexExpand: true // 闄勪欢淇℃伅
+ isAnnexExpand: true, // 闄勪欢淇℃伅
+ addCommonConfig: {}
}
},
created() {
this.setData(this.detailConfig.infomation)
+ this.addCommonConfig = {
+ id_name: "master_order_number",
+ id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.number,
+ master_order_number: this.masterOrderDetail.infomation.number,
+ masterOrderId: this.masterOrderDetail.infomation.id
+ }
},
mounted() {},
methods: {
@@ -338,6 +346,7 @@
}
.second {
background: #fff;
+ height: calc(100vh - 111px);
.followup-records {
.table-view {
margin-top: 0 !important;
--
Gitblit v1.8.0