From ed9ae42ba8f74873d3b3bae2f6eee4a318706000 Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sat, 28 Oct 2023 19:50:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4cdab6fb3efe97c26023fba411c0b8af1b67b64d)
---
 src/api/crm/customer/index.ts           |  6 +-
 src/views/crm/customer/CustomerForm.vue | 83 +++++++------------------
 src/views/crm/customer/index.vue        | 28 ++-------
 3 files changed, 30 insertions(+), 87 deletions(-)

diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index 16ccb355..b9d67a75 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -8,14 +8,16 @@ export interface CustomerVO {
   mobile: string
   telephone: string
   website: string
+  qq: string
+  wechat: string
+  email: string
+  description: string
   remark: string
   ownerUserId: number
   roUserIds: string
   rwUserIds: string
   areaId: number
   detailAddress: string
-  longitude: string
-  latitude: string
   contactLastTime: Date
   contactNextTime: Date
 }
diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index 4c04617e..323e9a62 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -11,28 +11,6 @@
       <el-form-item label="客户名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入客户名称" />
       </el-form-item>
-      <el-form-item label="跟进状态" prop="followUpStatus">
-        <el-radio-group v-model="formData.followUpStatus">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="锁定状态" prop="lockStatus">
-        <el-radio-group v-model="formData.lockStatus">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       <el-form-item label="手机" prop="mobile">
         <el-input v-model="formData.mobile" placeholder="请输入手机" />
       </el-form-item>
@@ -42,38 +20,27 @@
       <el-form-item label="网址" prop="website">
         <el-input v-model="formData.website" placeholder="请输入网址" />
       </el-form-item>
+      <el-form-item label="QQ" prop="qq">
+        <el-input v-model="formData.qq" placeholder="请输入QQ" />
+      </el-form-item>
+      <el-form-item label="微信" prop="wechat">
+        <el-input v-model="formData.wechat" placeholder="请输入微信" />
+      </el-form-item>
+      <el-form-item label="邮箱" prop="email">
+        <el-input v-model="formData.email" placeholder="请输入邮箱" />
+      </el-form-item>
+      <el-form-item label="客户描述" prop="description">
+        <el-input v-model="formData.description" placeholder="请输入客户描述" />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
-      <el-form-item label="负责人的用户编号" prop="ownerUserId">
-        <el-input v-model="formData.ownerUserId" placeholder="请输入负责人的用户编号" />
-      </el-form-item>
-      <el-form-item label="只读权限的用户编号数组" prop="roUserIds">
-        <el-input v-model="formData.roUserIds" placeholder="请输入只读权限的用户编号数组" />
-      </el-form-item>
-      <el-form-item label="读写权限的用户编号数组" prop="rwUserIds">
-        <el-input v-model="formData.rwUserIds" placeholder="请输入读写权限的用户编号数组" />
-      </el-form-item>
       <el-form-item label="地区编号" prop="areaId">
         <el-input v-model="formData.areaId" placeholder="请输入地区编号" />
       </el-form-item>
       <el-form-item label="详细地址" prop="detailAddress">
         <el-input v-model="formData.detailAddress" placeholder="请输入详细地址" />
       </el-form-item>
-      <el-form-item label="地理位置经度" prop="longitude">
-        <el-input v-model="formData.longitude" placeholder="请输入地理位置经度" />
-      </el-form-item>
-      <el-form-item label="地理位置维度" prop="latitude">
-        <el-input v-model="formData.latitude" placeholder="请输入地理位置维度" />
-      </el-form-item>
-      <el-form-item label="最后跟进时间" prop="contactLastTime">
-        <el-date-picker
-          v-model="formData.contactLastTime"
-          type="date"
-          value-format="x"
-          placeholder="选择最后跟进时间"
-        />
-      </el-form-item>
       <el-form-item label="下次联系时间" prop="contactNextTime">
         <el-date-picker
           v-model="formData.contactNextTime"
@@ -103,26 +70,20 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   name: undefined,
-  followUpStatus: undefined,
-  lockStatus: undefined,
   mobile: undefined,
   telephone: undefined,
   website: undefined,
+  qq: undefined,
+  wechat: undefined,
+  email: undefined,
+  description: undefined,
   remark: undefined,
-  ownerUserId: undefined,
-  roUserIds: undefined,
-  rwUserIds: undefined,
   areaId: undefined,
   detailAddress: undefined,
-  longitude: undefined,
-  latitude: undefined,
-  contactLastTime: undefined,
   contactNextTime: undefined
 })
 const formRules = reactive({
-  name: [{ require: true, message: '跟进状态不能为空', trigger: 'blur' }],
-  followUpStatus: [{ required: true, message: '跟进状态不能为空', trigger: 'blur' }],
-  lockStatus: [{ required: true, message: '锁定状态不能为空', trigger: 'blur' }]
+  name: [{ require: true, message: '客户名称不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -180,15 +141,13 @@ const resetForm = () => {
     mobile: undefined,
     telephone: undefined,
     website: undefined,
+    qq: undefined,
+    wechat: undefined,
+    email: undefined,
+    description: undefined,
     remark: undefined,
-    ownerUserId: undefined,
-    roUserIds: undefined,
-    rwUserIds: undefined,
     areaId: undefined,
     detailAddress: undefined,
-    longitude: undefined,
-    latitude: undefined,
-    contactLastTime: undefined,
     contactNextTime: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 7db9bb03..d7c21464 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -27,24 +27,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="电话" prop="telephone">
-        <el-input
-          v-model="queryParams.telephone"
-          placeholder="请输入电话"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="网址" prop="website">
-        <el-input
-          v-model="queryParams.website"
-          placeholder="请输入网址"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -88,12 +70,14 @@
       <el-table-column label="手机" align="center" prop="mobile" />
       <el-table-column label="电话" align="center" prop="telephone" />
       <el-table-column label="网址" align="center" prop="website" />
+      <el-table-column label="QQ" align="center" prop="qq" />
+      <el-table-column label="微信" align="center" prop="wechat" />
+      <el-table-column label="邮箱" align="center" prop="email" />
+      <el-table-column label="客户描述" align="center" prop="description" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="负责人的用户编号" align="center" prop="ownerUserId" />
       <el-table-column label="地区编号" align="center" prop="areaId" />
       <el-table-column label="详细地址" align="center" prop="detailAddress" />
-      <el-table-column label="地理位置经度" align="center" prop="longitude" />
-      <el-table-column label="地理位置维度" align="center" prop="latitude" />
       <el-table-column
         label="最后跟进时间"
         align="center"
@@ -168,9 +152,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: null,
-  mobile: null,
-  telephone: null,
-  website: null
+  mobile: null
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中