From 43dc5fff4c3e7f485b509d1707fea2092ca0cfeb Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 20 Jan 2024 10:54:09 +0800
Subject: [PATCH 1/4] update

---
 src/views/custom/detail.vue          |  2 +-
 src/views/custom/index.vue           | 15 +++++++--------
 src/views/custom_contacts/detail.vue | 20 +++++---------------
 src/views/custom_follow/index.vue    | 14 +++++++++-----
 4 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/src/views/custom/detail.vue b/src/views/custom/detail.vue
index 1e89f5c..db3663e 100644
--- a/src/views/custom/detail.vue
+++ b/src/views/custom/detail.vue
@@ -15,7 +15,7 @@
                             <!-- <el-descriptions-item label="上级公司" label-align="left" align="left" label-class-name="my-label">
                                 {{ formData.company_name }}</el-descriptions-item> -->
                             <el-descriptions-item label="客户地址" label-align="left" align="left" label-class-name="my-label">
-                                {{ formData.address }}
+                                {{ formData.province_name + formData.city_name + formData.area_name + formData.address }}
                             </el-descriptions-item>
                             <el-descriptions-item label="电话" label-align="left" align="left" label-class-name="my-label"> {{
                                 formData.phone
diff --git a/src/views/custom/index.vue b/src/views/custom/index.vue
index ace6269..34e9c43 100644
--- a/src/views/custom/index.vue
+++ b/src/views/custom/index.vue
@@ -53,17 +53,16 @@
                         </template>
                     </el-table-column>
 
-                    <el-table-column label="省" prop="province_name" show-overflow-tooltip />
-                    <el-table-column label="职务" prop="master_position" show-overflow-tooltip />
-                    <el-table-column label="手机" prop="master_phone" show-overflow-tooltip />
-                    <el-table-column label="电话" prop="master_telephone" show-overflow-tooltip />
+                    <el-table-column label="所在省" prop="province_name" show-overflow-tooltip />
+                    <el-table-column label="负责人姓名" prop="master_name" show-overflow-tooltip />
+                    <el-table-column label="负责人职务" prop="master_position" show-overflow-tooltip />
+                    <el-table-column label="负责人手机" prop="master_phone" show-overflow-tooltip />
+                    <el-table-column label="负责人电话" prop="master_telephone" show-overflow-tooltip />
 
-                    <el-table-column label="负责人" prop="master_name" show-overflow-tooltip />
-                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="跟进记录" prop="follow_total" show-overflow-tooltip />
                     <el-table-column label="最后跟进" prop="last_follow_date" show-overflow-tooltip />
                     <el-table-column label="下次回访日期" prop="next_follow_date" show-overflow-tooltip />
-                    <el-table-column label="跟进" prop="follow_total" show-overflow-tooltip />
-                    <el-table-column label="备注" prop="master_notes" show-overflow-tooltip />
+                    <el-table-column label="创建时间" prop="create_time" show-overflow-tooltip />
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['custom.custom/edit']" type="primary" link @click="handleEdit(row)">
diff --git a/src/views/custom_contacts/detail.vue b/src/views/custom_contacts/detail.vue
index 90fa226..1fd82e0 100644
--- a/src/views/custom_contacts/detail.vue
+++ b/src/views/custom_contacts/detail.vue
@@ -7,16 +7,16 @@
             <el-descriptions :column="1" border>
                 <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"> {{
+                <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"> {{
+                <el-descriptions-item label="联系人职位" label-align="left" align="left" label-class-name="my-label"> {{
                     formData.position }}</el-descriptions-item>
-                <el-descriptions-item label="手机" label-align="left" align="left" label-class-name="my-label">
+                <el-descriptions-item label="联系人手机" label-align="left" align="left" label-class-name="my-label">
                     {{ formData.phone }}
                 </el-descriptions-item>
-                <el-descriptions-item label="电话" label-align="left" align="left" label-class-name="my-label"> {{
+                <el-descriptions-item label="联系人电话" label-align="left" align="left" label-class-name="my-label"> {{
                     formData.telephone }}</el-descriptions-item>
-                <el-descriptions-item label="邮箱" label-align="left" align="left" label-class-name="my-label"> {{
+                <el-descriptions-item label="联系人邮箱" label-align="left" align="left" label-class-name="my-label"> {{
                     formData.email }}</el-descriptions-item>
                 <el-descriptions-item label="备注" label-align="left" align="left" label-class-name="my-label"> {{
                     formData.notes }}</el-descriptions-item>
@@ -32,16 +32,6 @@
                         暂无文件
                     </div>
                 </el-descriptions-item>
-                <el-descriptions-item label="添加人" label-align="left" align="left"
-                    label-class-name="my-label"></el-descriptions-item>
-
-                <el-descriptions-item label="创建日期" label-align="left" align="left"
-                    label-class-name="my-label"></el-descriptions-item>
-                <el-descriptions-item label="更新人" label-align="left" align="left"
-                    label-class-name="my-label"></el-descriptions-item>
-                <el-descriptions-item label="更新日期" label-align="left" align="left"
-                    label-class-name="my-label"></el-descriptions-item>
-
             </el-descriptions>
 
         </popup>
diff --git a/src/views/custom_follow/index.vue b/src/views/custom_follow/index.vue
index 9c030a4..0a981e4 100644
--- a/src/views/custom_follow/index.vue
+++ b/src/views/custom_follow/index.vue
@@ -10,7 +10,8 @@
                 <el-form-item label="类型" prop="types">
                     <el-select class="w-[280px]" v-model="queryParams.types" clearable placeholder="请选择类型">
                         <el-option label="全部" value=""></el-option>
-                        <el-option v-for="(item, index) in dictData.types" :key="index" :label="item.name" :value="item.value" />
+                        <el-option v-for="(item, index) in dictData.types" :key="index" :label="item.name"
+                            :value="item.value" />
                     </el-select>
                 </el-form-item>
 
@@ -27,14 +28,15 @@
                 </template>
                 新增
             </el-button>
-            <el-button v-perms="['custom_follow.custom_follow/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+            <el-button v-perms="['custom_follow.custom_follow/delete']" :disabled="!selectData.length"
+                @click="handleDelete(selectData)">
                 删除
             </el-button>
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-                    <el-table-column label="客户名称" prop="custom_id" 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="date" show-overflow-tooltip />
 
@@ -63,10 +65,12 @@
                     <!-- <el-table-column label="状态" prop="status" show-overflow-tooltip /> -->
                     <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['custom_follow.custom_follow/edit']" type="primary" link @click="handleEdit(row)">
+                            <el-button v-perms="['custom_follow.custom_follow/edit']" type="primary" link
+                                @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button v-perms="['custom_follow.custom_follow/delete']" type="danger" link @click="handleDelete(row.id)">
+                            <el-button v-perms="['custom_follow.custom_follow/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                             <el-button v-perms="['custom_follow.custom_follow/detail']" link @click="handledetail(row)">

From 3442d120e743f05bf1e931c5521e572a460d970b Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 20 Jan 2024 11:47:05 +0800
Subject: [PATCH 2/4] update ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 453c5bd..ccfb172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ components.d.ts
 *.sw?
 
 .env.development
+.env.development

From 4e8ebafb879d6dda2d79cae8be2acbe130ed567f Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 20 Jan 2024 11:52:22 +0800
Subject: [PATCH 3/4] update ignore

---
 .env.development | 4 ----
 .gitignore       | 1 -
 2 files changed, 5 deletions(-)
 delete mode 100644 .env.development

diff --git a/.env.development b/.env.development
deleted file mode 100644
index c8af8a1..0000000
--- a/.env.development
+++ /dev/null
@@ -1,4 +0,0 @@
-NODE_ENV = 'development'
-
-VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/'
-
diff --git a/.gitignore b/.gitignore
index ccfb172..453c5bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,3 @@ components.d.ts
 *.sw?
 
 .env.development
-.env.development

From 620d806fd2eef6c31043f785b934cc107d17929c Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 20 Jan 2024 11:56:00 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20.env.development?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .env.development

diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..5064008
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,3 @@
+NODE_ENV = 'development'
+
+VITE_APP_BASE_URL = 'https://ceshi-engineering.lihaink.cn/'
\ No newline at end of file