From da3dbb56388ae49097e50ded584ed2abb7f5022d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 14:16:25 +0800
Subject: [PATCH] bug修复（5243）
---
src/views/sales/masterOrder/DetailMasterOrder.vue | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/src/views/sales/masterOrder/DetailMasterOrder.vue b/src/views/sales/masterOrder/DetailMasterOrder.vue
index e09653c..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>
@@ -37,18 +37,18 @@
<li v-for="(item, i) in basicInfoList" :key="i">
<div class="left">
<div class="content-title">{{ item.leftStr + "锛�" }}</div>
- <div class="content-data">{{ item.leftValue }}</div>
+ <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div class="right">
- <div class="content-title">{{ item.rightStr }}</div>
- <div class="content-data">{{ item.rightValue }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+ <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
</ul>
</div>
</div>
<!-- 闄勪欢淇℃伅 -->
- <div class="basic-info">
+ <!-- <div class="basic-info">
<div class="basic-info-label" @click="expandClick('annex')">
<i v-if="isAnnexExpand" class="el-icon-arrow-down"></i>
<i v-else class="el-icon-arrow-up"></i>
@@ -64,10 +64,10 @@
</li>
</ul>
</div>
- </div>
+ </div> -->
</div>
<div v-if="activeName === 'sub'" class="second">
- <SubOrder :isDetail="true" />
+ <SubOrder :isDetail="true" :add-config="addCommonConfig" />
</div>
</div>
</el-drawer>
@@ -97,25 +97,33 @@
activeName: "first",
isBasicExpand: true, // 鍩烘湰淇℃伅
basicInfoList: [],
- isAnnexExpand: true // 闄勪欢淇℃伅
+ isAnnexExpand: true, // 闄勪欢淇℃伅
+ addCommonConfig: {}
}
},
created() {
- this.setData()
+ 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: {
- setData() {
+ setData(item) {
this.basicInfoList = [
{
leftStr: "瀹㈡埛鍚嶇О",
- leftValue: "",
+ leftValue: item.client_name,
rightStr: "鍗曟嵁缂栧彿",
- rightValue: ""
+ rightValue: item.number
},
{
leftStr: "璐熻矗浜�",
- leftValue: "",
+ leftValue: item.member_name,
rightStr: "鍒涘缓浜�",
rightValue: ""
},
@@ -128,26 +136,26 @@
{
leftStr: "鏇存柊鏃堕棿",
leftValue: "",
- rightStr: "瀹℃壒鐘舵��",
- rightValue: ""
- },
- {
- leftStr: "鏈�鏂板鎵规椂闂�",
- leftValue: "",
- rightStr: "涓婁竴姝ュ鎵逛汉",
- rightValue: ""
- },
- {
- leftStr: "褰撳墠瀹℃壒浜�",
- leftValue: "",
rightStr: "鏈嶅姟寮�濮嬫椂闂�",
- rightValue: ""
+ rightValue: item.start_time
},
+ // {
+ // leftStr: "瀹℃壒鐘舵��",
+ // leftValue: "",
+ // rightStr: "鏈�鏂板鎵规椂闂�",
+ // rightValue: ""
+ // },
+ // {
+ // leftStr: "涓婁竴姝ュ鎵逛汉",
+ // leftValue: "",
+ // rightStr: "褰撳墠瀹℃壒浜�",
+ // rightValue: ""
+ // },
{
leftStr: "鏈嶅姟鎴鏃堕棿",
- leftValue: "",
- rightStr: "",
- rightValue: ""
+ leftValue: item.end_time,
+ rightStr: "鍚堝悓閲戦",
+ rightValue: item.money
}
]
},
@@ -338,6 +346,7 @@
}
.second {
background: #fff;
+ height: calc(100vh - 111px);
.followup-records {
.table-view {
margin-top: 0 !important;
--
Gitblit v1.8.0