From fcd321a4c2e60b29cc8218a7e5889b11e0ac094f Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 20 Jan 2024 16:06:07 +0800
Subject: [PATCH] update

---
 src/views/custom_follow/detail.vue | 24 ++++++++++++++++--------
 src/views/custom_follow/edit.vue   |  7 ++++---
 src/views/custom_follow/index.vue  |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/views/custom_follow/detail.vue b/src/views/custom_follow/detail.vue
index 65c47e7..43653d0 100644
--- a/src/views/custom_follow/detail.vue
+++ b/src/views/custom_follow/detail.vue
@@ -4,22 +4,30 @@
         <popup ref="popupRef" title="客户跟进记录详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
 
             <el-descriptions :column="2" border>
-                <el-descriptions-item label="主题" label-align="left" align="left" label-class-name="my-label">{{ formData.name }}</el-descriptions-item>
-                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{ formData.custom_name }}</el-descriptions-item>
-                <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{ formData.contacts }}</el-descriptions-item>
+                <el-descriptions-item label="主题" label-align="left" align="left" label-class-name="my-label">{{
+                    formData.name }}</el-descriptions-item>
+                <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.custom_name }}</el-descriptions-item>
+                <el-descriptions-item label="联系人" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.custom_master_name }}</el-descriptions-item>
                 <el-descriptions-item label="日期" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.date }}
                 </el-descriptions-item>
-                <el-descriptions-item label="类型" label-align="left" align="left" label-class-name="my-label"> <dict-value :options="dictData.follow_type" :value="formData.types" /></el-descriptions-item>
-                <el-descriptions-item label="执行人" label-align="left" align="left" label-class-name="my-label"> {{ formData.executor }}</el-descriptions-item>
-                <el-descriptions-item label="行动描述" label-align="left" align="left" label-class-name="my-label"> {{ formData.description }}</el-descriptions-item>
+                <el-descriptions-item label="类型" label-align="left" align="left" label-class-name="my-label"> <dict-value
+                        :options="dictData.follow_type" :value="formData.types" /></el-descriptions-item>
+                <el-descriptions-item label="执行人" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.executor }}</el-descriptions-item>
+                <el-descriptions-item label="行动描述" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.description }}</el-descriptions-item>
 
-                <el-descriptions-item label="下次回访日期" label-align="left" align="left" label-class-name="my-label"> {{ formData.next_follow_date }}</el-descriptions-item>
+                <el-descriptions-item label="下次回访日期" label-align="left" align="left" label-class-name="my-label"> {{
+                    formData.next_follow_date }}</el-descriptions-item>
 
                 <el-descriptions-item label="附件" label-align="left" align="left" label-class-name="my-label">
                     <div v-if="formData.annex && formData.annex.length > 0">
                         <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
-                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item" target="_blank">文件{{ index + 1 }}查看</el-link>
+                            <el-link style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item"
+                                target="_blank">文件{{ index + 1 }}查看</el-link>
 
                         </div>
                     </div>
diff --git a/src/views/custom_follow/edit.vue b/src/views/custom_follow/edit.vue
index 62669ae..99248ea 100644
--- a/src/views/custom_follow/edit.vue
+++ b/src/views/custom_follow/edit.vue
@@ -8,8 +8,8 @@
                 <el-form-item label="客户名称" prop="custom_name">
                     <el-input v-model="formData.custom_name" @click="showDialog = true" clearable placeholder="请选择客户" />
                 </el-form-item>
-                <el-form-item label="联系人" prop="contacts">
-                    <el-input v-model="formData.contacts" clearable placeholder="请输入联系人" />
+                <el-form-item label="联系人" prop="custom_master_name">
+                    <el-input v-model="formData.custom_master_name" clearable placeholder="请输入联系人" />
                 </el-form-item>
                 <el-form-item label="日期" prop="date">
                     <el-date-picker class="flex-1 !flex" v-model="formData.date" clearable value-format="YYYY-MM-DD"
@@ -93,7 +93,7 @@ const formData = reactive({
     name: '',
     custom_id: '',
     custom_name: '',
-    contacts: '',
+    custom_master_name: '',
     date: '',
     types: '',
     executor: '',
@@ -139,6 +139,7 @@ const getDetail = async (row: Record<string, any>) => {
 const customEvent = (e: any) => {
     formData.custom_id = e.id;
     formData.custom_name = e.name;
+    formData.custom_master_name = e.master_name;
     showDialog.value = false;
 };
 
diff --git a/src/views/custom_follow/index.vue b/src/views/custom_follow/index.vue
index cd06907..5d9184e 100644
--- a/src/views/custom_follow/index.vue
+++ b/src/views/custom_follow/index.vue
@@ -47,7 +47,7 @@
                     <el-table-column label="序号" type="index" width="55" />
                     <el-table-column label="跟进主题" prop="name" show-overflow-tooltip />
                     <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
-                    <el-table-column label="联系人" prop="contacts" show-overflow-tooltip />
+                    <el-table-column label="联系人" prop="custom_master_name" show-overflow-tooltip />
                     <el-table-column label="日期" prop="date" show-overflow-tooltip />
 
                     <el-table-column label="类型" prop="types">