From b01b18c05b3e0d00576a02c9c83df8c8033e5986 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 11 十月 2023 16:28:06 +0800
Subject: [PATCH] Merge branch 'zhengwenfeng/modify-style' into dev
---
src/views/sales/masterOrder/DetailMasterOrder.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/views/sales/masterOrder/DetailMasterOrder.vue b/src/views/sales/masterOrder/DetailMasterOrder.vue
index 9f11216..9380e6e 100644
--- a/src/views/sales/masterOrder/DetailMasterOrder.vue
+++ b/src/views/sales/masterOrder/DetailMasterOrder.vue
@@ -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