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/client/index.vue |   43 ++++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/views/client/client/index.vue b/src/views/client/client/index.vue
index cdadd62..f4be8f2 100644
--- a/src/views/client/client/index.vue
+++ b/src/views/client/client/index.vue
@@ -2,13 +2,10 @@
   <div class="custom-manage">
     <div class="tab-view">
       <el-tabs v-model="activeName" @tab-click="tabsClick">
-        <el-tab-pane label="鍏ㄩ儴(鍚墍鏈夊叕娴�)" name="first" disabled></el-tab-pane>
-        <el-tab-pane label="鍏ㄩ儴(鍚叕娴�)" name="second" disabled></el-tab-pane>
-        <el-tab-pane label="鍏ㄩ儴(涓嶅惈鍏捣)" name="third" disabled></el-tab-pane>
-        <el-tab-pane label="鍏捣宸插垎閰�" name="fourth" disabled></el-tab-pane>
-        <el-tab-pane label="鍏湭鍒嗛厤" name="aaa" disabled></el-tab-pane>
+        <el-tab-pane label="鍏捣瀹㈡埛" name="first"></el-tab-pane>
+        <el-tab-pane label="鎴戠殑瀹㈡埛" name="second"></el-tab-pane>
       </el-tabs>
-      <div class="sel-gonghai">
+      <!-- <div class="sel-gonghai">
         <el-select v-model="gonghaiValue" placeholder="璇烽�夋嫨" class="query-class-sel" size="mini" disabled>
           <el-option v-for="item in gonghaiOptions" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
@@ -16,7 +13,7 @@
         <div class="query-class-btn">
           <i class="el-icon-setting"></i>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="top">
       <SearchCommonView
@@ -28,7 +25,6 @@
       />
       <div class="btn-pager">
         <PublicFunctionBtnView
-          :duplicate-check="true"
           :list-button="true"
           :map-button="true"
           :statistics="true"
@@ -145,11 +141,11 @@
           { label: "瀹㈡埛鍚嶇О", prop: "name", min: 100, isClientClick: true }, // 瀹㈡埛鍚嶇О
           { label: "閿�鍞礋璐d汉", prop: "member_name" }, // 閿�鍞礋璐d汉
           { label: "閲嶈绾у埆", prop: "client_level" }, // 閲嶈绾у埆
-          { label: "涓嬫鍥炶鏃ユ湡", prop: "next_visit_time", isTime: true, min: 90 }, // 涓嬫鍥炶鏃ユ湡
+          { label: "涓嬫鍥炶鏃ユ湡", prop: "next_visit_time", min: 90 }, // 涓嬫鍥炶鏃ユ湡
           { label: "璇︾粏鍦板潃", prop: "detail_address", min: 200 }, // 璇︾粏鍦板潃
           { label: "瀹㈡埛鐘舵��", prop: "client_status" }, // 瀹㈡埛鐘舵��
           { label: "鑱旂郴浜哄鍚�", prop: "contact_name", isContactClick: true }, // 鑱旂郴浜哄鍚�
-          { label: "鎵嬫満鍙风爜", prop: "contact_phone" } // 鎵嬫満鍙风爜
+          { label: "鑱旂郴浜烘墜鏈哄彿鐮�", prop: "contact_phone" } // 鎵嬫満鍙风爜
         ]
       }
       this.searchOptions = []
@@ -175,22 +171,33 @@
                 let contact_name = ""
                 let contact_phone = ""
                 let contact_id = 0
+                let contact_wechat = ""
+                let contact_email = ""
+                let position = ""
                 if (item.contacts.length !== 0) {
                   for (let i = 0; i < item.contacts.length; i++) {
                     if (item.contacts[i].is_first) {
                       contact_name = item.contacts[i].name
                       contact_phone = item.contacts[i].phone
                       contact_id = item.contacts[i].id
+                      contact_wechat = item.contacts[i].wechat
+                      contact_email = item.contacts[i].email
+                      position = item.contacts[i].position
                     }
                   }
                 }
+                console.log(contact_wechat, contact_email)
                 return {
                   ...item,
                   contact_name: contact_name,
                   contact_phone: contact_phone,
                   client_level: item.client_level.name,
                   client_status: item.client_status.name,
-                  contact_id: contact_id
+                  contact_id: contact_id,
+                  member_name: item.member.username,
+                  contact_wechat: contact_wechat,
+                  contact_email: contact_email,
+                  position: position
                 }
               })
               this.tableList.tableInfomation = list || []
@@ -228,25 +235,15 @@
     addBtnClick() {
       this.editConfig.visible = true
       this.editConfig.title = "鏂板缓"
-      this.editConfig.infomation = {}
+      this.editConfig.infomation = { city_id: 0 }
     },
     // 缂栬緫
     handleClick(row) {
       console.log(row)
       this.editConfig.visible = true
       this.editConfig.title = "缂栬緫"
-      let contactObj = {}
-      if (row.contacts.length > 0) {
-        row.contacts.forEach((ele) => {
-          if (ele.is_first) {
-            contactObj = { ...ele }
-          }
-        })
-      }
       this.editConfig.infomation = {
-        ...row,
-        contact_wechat: contactObj.length > 0 ? contactObj.wechat : "",
-        contact_email: contactObj.length > 0 ? contactObj.email : ""
+        ...row
       }
     },
     // 鍒犻櫎

--
Gitblit v1.8.0