From 46ed69e3b72658140a40127f4bae16bef9a02d56 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 21 八月 2023 11:23:34 +0800
Subject: [PATCH] bug修复

---
 src/views/client/contacts/DetailContacts.vue |   57 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/views/client/contacts/DetailContacts.vue b/src/views/client/contacts/DetailContacts.vue
index 38a94bb..b375e17 100644
--- a/src/views/client/contacts/DetailContacts.vue
+++ b/src/views/client/contacts/DetailContacts.vue
@@ -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>
@@ -90,7 +90,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>
@@ -106,10 +106,10 @@
                 </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" />
@@ -150,11 +150,22 @@
       isAddressExpand: true, // 鍦板潃淇℃伅
       addressInfoList: [],
       isRemarkExpand: true, // 澶囨敞淇℃伅
-      isAnnexExpand: true // 闄勪欢淇℃伅
+      isAnnexExpand: true, // 闄勪欢淇℃伅
+      addConfig: {}
     }
   },
   created() {
     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
+    }
   },
   mounted() {},
   methods: {
@@ -176,11 +187,11 @@
           leftStr: "鑱屽姟",
           leftValue: item.position,
           rightStr: "閿�鍞礋璐d汉",
-          rightValue: item.member_id
+          rightValue: item.member.username
         },
         {
           leftStr: "棣栬鑱旂郴浜�",
-          leftValue: item.is_first,
+          leftValue: item.is_first ? "鏄�" : "鍚�",
           rightStr: "寰俊鍙�",
           rightValue: item.wechat
         },
@@ -191,34 +202,28 @@
           rightValue: item.email
         },
         {
-          leftStr: "绛惧埌",
-          leftValue: "",
-          rightStr: "涓嬫鍥炶鏃ユ湡",
+          leftStr: "涓嬫鍥炶鏃ユ湡",
+          leftValue: item.Client.next_visit_time,
+          rightStr: "鏈�鏂拌仈绯绘棩鏈�",
           rightValue: ""
         },
         {
-          leftStr: "鏈�鏂拌仈绯绘棩鏈�",
+          leftStr: "鏈仈绯诲ぉ鏁�",
           leftValue: "",
-          rightStr: "鏈仈绯诲ぉ鏁�",
+          rightStr: "",
           rightValue: ""
         }
       ]
       this.addressInfoList = [
         {
           leftStr: "鍥藉",
-          leftValue: item.Country.name,
+          leftValue: "涓浗",
           rightStr: "鐪佷唤",
           rightValue: item.Province.name
         },
         {
           leftStr: "鍩庡競",
           leftValue: item.City.name,
-          rightStr: "鍖哄煙",
-          rightValue: item.Region.name
-        },
-        {
-          leftStr: "閭紪",
-          leftValue: "",
           rightStr: "",
           rightValue: ""
         }

--
Gitblit v1.8.0