From 0bdc7d10c8c4b13a993f5f1474b7fb2fc8c88fc9 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 17 十月 2023 14:26:40 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn
---
src/views/client/contacts/DetailContacts.vue | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 46 deletions(-)
diff --git a/src/views/client/contacts/DetailContacts.vue b/src/views/client/contacts/DetailContacts.vue
index 97e078c..3a1f128 100644
--- a/src/views/client/contacts/DetailContacts.vue
+++ b/src/views/client/contacts/DetailContacts.vue
@@ -10,7 +10,7 @@
<template slot="title">
<div class="header">
<span class="header-label">鑱旂郴浜哄鍚�</span>
- <span class="header-title">{{ detailConfig.infomation.contact_name }}</span>
+ <span class="header-title">{{ detailConfig.infomation.name }}</span>
</div>
</template>
<div class="content">
@@ -22,7 +22,7 @@
<div>璺熻繘璁板綍<el-badge type="primary" :value="2"> </el-badge></div>
</template> -->
</el-tab-pane>
- <el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane>
+ <!-- <el-tab-pane label="閿�鍞槑缁嗗崟" name="detail"></el-tab-pane> -->
<el-tab-pane label="鏈嶅姟鍚堝悓" name="serviceContract"></el-tab-pane>
</el-tabs>
</div>
@@ -39,11 +39,11 @@
<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 v-if="item.rightStr" class="right">
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+ <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
</ul>
@@ -61,11 +61,11 @@
<li v-for="(item, i) in addressInfoList" :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 v-if="item.rightStr" class="right">
+ <div class="content-title">{{ item.rightStr + "锛�" }}</div>
+ <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
</div>
</li>
</ul>
@@ -83,14 +83,14 @@
<li>
<div class="left remark">
<div class="content-title">{{ "澶囨敞锛�" }}</div>
- <div class="content-data">{{ "澶囨敞鍐呭" }}</div>
+ <div class="content-data">{{ detailConfig.infomation.desc }}</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>
@@ -106,16 +106,16 @@
</li>
</ul>
</div>
- </div>
+ </div> -->
</div>
<div v-if="activeName === 'second'" class="second">
- <FollowupRecords :isDetail="true" />
+ <FollowupRecords :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'detail'" class="second">
- <SalesDetails :isDetail="true" />
+ <SalesDetails :isDetail="true" :add-config="addConfig" />
</div>
<div v-if="activeName === 'serviceContract'" class="second">
- <ServiceContract :isDetail="true" />
+ <ServiceContract :isDetail="true" :add-config="addConfig" />
</div>
</div>
</el-drawer>
@@ -150,75 +150,82 @@
isAddressExpand: true, // 鍦板潃淇℃伅
addressInfoList: [],
isRemarkExpand: true, // 澶囨敞淇℃伅
- isAnnexExpand: true // 闄勪欢淇℃伅
+ isAnnexExpand: true, // 闄勪欢淇℃伅
+ addConfig: {}
}
},
created() {
- this.setData()
+ this.setData(this.detailConfig.infomation)
+ this.addConfig = {
+ id_name: "contact_name",
+ id: this.detailConfig.infomation.id,
+ common_name: this.detailConfig.infomation.name,
+ client_name: this.detailConfig.infomation.client_name,
+ contact_name: this.detailConfig.infomation.name,
+ client_status_id: this.detailConfig.infomation.Client.client_status_id,
+ contact_id: this.detailConfig.infomation.id,
+ client_id: this.detailConfig.infomation.client_id,
+ keyword: this.detailConfig.infomation.name,
+ keywordType: "鑱旂郴浜哄鍚�"
+ }
},
mounted() {},
methods: {
- setData() {
+ setData(item) {
this.basicInfoList = [
{
leftStr: "鑱旂郴浜哄鍚�",
- leftValue: "",
+ leftValue: item.name,
rightStr: "鑱旂郴浜虹紪鍙�",
- rightValue: ""
+ rightValue: item.number
},
{
leftStr: "瀹㈡埛鍚嶇О",
- leftValue: "",
+ leftValue: item.Client.name,
rightStr: "鎵嬫満",
- rightValue: ""
+ rightValue: item.phone
},
{
leftStr: "鑱屽姟",
- leftValue: "",
+ leftValue: item.position,
rightStr: "閿�鍞礋璐ｄ汉",
- rightValue: ""
+ rightValue: item.member.username
},
{
leftStr: "棣栬鑱旂郴浜�",
- leftValue: "",
+ leftValue: item.is_first ? "鏄�" : "鍚�",
rightStr: "寰俊鍙�",
- rightValue: ""
+ rightValue: item.wechat
},
{
leftStr: "鐢熸棩",
- leftValue: "",
+ leftValue: item.birthday,
rightStr: "鑱旂郴浜篍mail",
+ rightValue: item.email
+ },
+ {
+ leftStr: "涓嬫鍥炶鏃ユ湡",
+ leftValue: item.Client.next_visit_time,
+ rightStr: "鏈�鏂拌仈绯绘棩鏈�",
rightValue: ""
},
{
- leftStr: "绛惧埌",
+ leftStr: "鏈仈绯诲ぉ鏁�",
leftValue: "",
- rightStr: "涓嬫鍥炶鏃ユ湡",
- rightValue: ""
- },
- {
- leftStr: "鏈�鏂拌仈绯绘棩鏈�",
- leftValue: "",
- rightStr: "鏈仈绯诲ぉ鏁�",
+ rightStr: "",
rightValue: ""
}
]
this.addressInfoList = [
{
leftStr: "鍥藉",
- leftValue: "",
+ leftValue: "涓浗",
rightStr: "鐪佷唤",
- rightValue: ""
+ rightValue: item.Province.name
},
{
leftStr: "鍩庡競",
- leftValue: "",
- rightStr: "鍖哄煙",
- rightValue: ""
- },
- {
- leftStr: "閭紪",
- leftValue: "",
+ leftValue: item.City.name,
rightStr: "",
rightValue: ""
}
@@ -331,7 +338,7 @@
align-items: center;
height: 40px;
.content-title {
- width: 220px;
+ width: 320px;
text-align: right;
color: #555;
}
--
Gitblit v1.8.0