From 28e0aa1d40bff8985ac3e662d3a7726594d919c3 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 14 八月 2023 19:45:26 +0800
Subject: [PATCH] 销售机会联调及bug修复

---
 src/views/client/client/DetailClientManage.vue |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/views/client/client/DetailClientManage.vue b/src/views/client/client/DetailClientManage.vue
index 428d650..6ff1c1a 100644
--- a/src/views/client/client/DetailClientManage.vue
+++ b/src/views/client/client/DetailClientManage.vue
@@ -44,11 +44,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 v-if="item.rightStr" class="right">
                     <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -66,11 +66,11 @@
                 <li v-for="(item, i) in contactList" :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 v-if="item.rightStr" class="right">
                     <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -88,11 +88,11 @@
                 <li v-for="(item, i) in dynamicInfoList" :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 v-if="item.rightStr" class="right">
                     <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -110,11 +110,11 @@
                 <li v-for="(item, i) in businessInfoList" :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 v-if="item.rightStr" class="right">
                     <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -132,11 +132,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 v-if="item.rightStr" class="right">
                     <div class="content-title">{{ item.rightStr }}</div>
-                    <div class="content-data">{{ item.rightValue }}</div>
+                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                   </div>
                 </li>
               </ul>
@@ -183,7 +183,11 @@
           <Contacts :isDetail="true" />
         </div>
         <div v-if="activeName === 'second'" class="second">
-          <FollowupRecords :isDetail="true" />
+          <FollowupRecords
+            :isDetail="true"
+            :follow-record="detailConfig.infomation.follow_record"
+            :add-config="addConfig"
+          />
         </div>
         <div v-if="activeName === 'salesOpportunity'" class="second">
           <SalesOpportunity :isDetail="true" />
@@ -243,11 +247,21 @@
       isAddressExpand: true, // 鍦板潃淇℃伅
       addressInfoList: [],
       isRemarkExpand: true, // 澶囨敞淇℃伅
-      isAnnexExpand: true // 闄勪欢淇℃伅
+      isAnnexExpand: true, // 闄勪欢淇℃伅
+      addConfig: {}
     }
   },
   created() {
     this.setData(this.detailConfig.infomation)
+    this.addConfig = {
+      id_name: "client_id",
+      id: this.detailConfig.infomation.id,
+      client_name: this.detailConfig.infomation.name,
+      contact_name: this.detailConfig.infomation.contact_name,
+      client_status_id: this.detailConfig.infomation.client_status_id,
+      client_id: this.detailConfig.infomation.id,
+      contact_id: this.detailConfig.infomation.contact_id
+    }
   },
   mounted() {},
   methods: {

--
Gitblit v1.8.0