From 6857572e3d303daaf3c28e639aad91c0bdf2fc42 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 15 八月 2023 14:30:10 +0800
Subject: [PATCH] bug修复及对应参数联调
---
src/views/client/client/DetailClientManage.vue | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index 6ff1c1a..7d9a0fb 100644
--- a/src/views/client/client/DetailClientManage.vue
+++ b/src/views/client/client/DetailClientManage.vue
@@ -28,7 +28,7 @@
<el-tab-pane label="閿�鍞�诲崟" name="master"></el-tab-pane>
<el-tab-pane label="閿�鍞瓙鍗�" name="sub"></el-tab-pane>
<el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane>
- <el-tab-pane label="鏀舵鍗�" name="plan"></el-tab-pane>
+ <el-tab-pane label="鏀舵鍗�" name="receipt"></el-tab-pane>
</el-tabs>
</div>
<div v-if="activeName === 'first'" class="detail">
@@ -47,7 +47,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -69,7 +69,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -91,7 +91,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -113,7 +113,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -135,7 +135,7 @@
<div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
</div>
<div v-if="item.rightStr" class="right">
- <div class="content-title">{{ item.rightStr }}</div>
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
<div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
@@ -161,7 +161,7 @@
</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>
@@ -177,32 +177,28 @@
</li>
</ul>
</div>
- </div>
+ </div> -->
</div>
<div v-if="activeName === 'contact'" class="second">
- <Contacts :isDetail="true" />
+ <Contacts :isDetail="true" :add-config="addContactsConfig" />
</div>
<div v-if="activeName === 'second'" class="second">
- <FollowupRecords
- :isDetail="true"
- :follow-record="detailConfig.infomation.follow_record"
- :add-config="addConfig"
- />
+ <FollowupRecords :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'salesOpportunity'" class="second">
- <SalesOpportunity :isDetail="true" />
+ <SalesOpportunity :isDetail="true" :add-config="addContactsConfig" />
</div>
<div v-if="activeName === 'quotation'" class="second">
- <Quotation :isDetail="true" />
+ <Quotation :isDetail="true" :add-config="addContactsConfig" />
</div>
<div v-if="activeName === 'master'" class="second">
- <MasterOrder :isDetail="true" />
+ <MasterOrder :isDetail="true" :add-config="addContactsConfig" />
</div>
<div v-if="activeName === 'sub'" class="second">
- <SubOrder :isDetail="true" />
+ <SubOrder :isDetail="true" :add-config="addContactsConfig" />
</div>
<div v-if="activeName === 'detail'" class="second">
- <SalesDetails :isDetail="true" />
+ <SalesDetails :isDetail="true" :add-config="addContactsConfig" />
</div>
</div>
</el-drawer>
@@ -248,7 +244,10 @@
addressInfoList: [],
isRemarkExpand: true, // 澶囨敞淇℃伅
isAnnexExpand: true, // 闄勪欢淇℃伅
- addConfig: {}
+ addConfig: {},
+ addContactsConfig: {
+ client_name: this.clientManageDetail.infomation.name
+ }
}
},
created() {
@@ -277,7 +276,7 @@
leftStr: "瀹㈡埛鐘舵��",
leftValue: item.client_status,
rightStr: "閿�鍞礋璐ｄ汉",
- rightValue: item.member_id
+ rightValue: item.member.username
},
{
leftStr: "瀹㈡埛绫诲瀷",
@@ -379,15 +378,15 @@
this.addressInfoList = [
{
leftStr: "鍥藉",
- leftValue: item.Country.name,
+ leftValue: "涓浗",
rightStr: "鐪佷唤",
rightValue: item.Province.name
},
{
leftStr: "鍩庡競",
leftValue: item.City.name,
- rightStr: "鍖哄煙",
- rightValue: item.Region.name
+ rightStr: "",
+ rightValue: ""
},
{
leftStr: "璇︾粏鍦板潃",
--
Gitblit v1.8.0