From fdd379f63de1bf49100134d3383c985b3841b707 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 20 Feb 2024 21:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20CRM=EF=BC=9A=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E7=9A=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 094b1925d683809553fa6606c2949e34901e5c98)
---
 src/views/crm/contact/OwerSelect.vue  | 72 ---------------------------
 src/views/crm/contact/index.vue       | 34 ++++++++-----
 src/views/crm/customer/pool/index.vue | 36 +++++---------
 3 files changed, 33 insertions(+), 109 deletions(-)
 delete mode 100644 src/views/crm/contact/OwerSelect.vue

diff --git a/src/views/crm/contact/OwerSelect.vue b/src/views/crm/contact/OwerSelect.vue
deleted file mode 100644
index 5ed0fe50..00000000
--- a/src/views/crm/contact/OwerSelect.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
-    <el-transfer
-      v-model="value"
-      :data="data"
-      :titles="transferTitles"
-      :props="transferDataProp"
-      :right-default-checked="[1]"
-    />
-    <el-row justify="end">
-      <el-col :span="4">
-        <el-button type="primary" @click="confirmOwerSelect">确认</el-button>
-      </el-col>
-      <el-col :span="4">
-        <el-button type="primary" @click="confirmOwerSelect">取消</el-button>
-      </el-col>
-    </el-row>
-  </Dialog>
-</template>
-<script setup lang="ts">
-// TODO 芋艿：统一选择框。
-import * as UserApi from '@/api/system/user'
-import { parseBigInt } from 'jsencrypt/lib/lib/jsbn/jsbn'
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('选择') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('')
-const transferTitles = ref(['待选择', '已选择'])
-const transferDataProp = ref({
-  key: 'id',
-  label: 'nickname'
-})
-const emit = defineEmits(['confirmOwerSelect'])
-const data = ref<UserApi.UserVO[]>([])
-const value = ref<any[]>([])
-const rightDefaultChecked = ref<any[]>([])
-/** 打开弹窗 */
-const open = async (type: string, ownerUserList: any[]) => {
-  dialogVisible.value = true
-  formType.value = type
-  // 修改时，设置数据
-  if (ownerUserList) {
-    formLoading.value = true
-    try {
-      ownerUserList.forEach((item) => {
-        value.value.push(item.id)
-      })
-    } finally {
-      formLoading.value = false
-    }
-  }
-  rightDefaultChecked.value = []
-  data.value = await UserApi.getSimpleUserList()
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-const confirmOwerSelect = () => {
-  const returnData = ref<any[]>([])
-  data.value.forEach((item) => {
-    if (value.value.indexOf(item.id) > -1) {
-      returnData.value.push(item)
-    }
-  })
-  emit('confirmOwerSelect', returnData)
-  dialogVisible.value = false
-  value.value = []
-}
-</script>
-<style>
-.el-row {
-  margin-top: 20px;
-}
-</style>
diff --git a/src/views/crm/contact/index.vue b/src/views/crm/contact/index.vue
index ab5dc52b..b4f9150a 100644
--- a/src/views/crm/contact/index.vue
+++ b/src/views/crm/contact/index.vue
@@ -110,7 +110,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" fixed="left" label="姓名" prop="name" width="140">
+      <el-table-column align="center" fixed="left" label="联系人姓名" prop="name" width="160">
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
@@ -129,10 +129,23 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="手机" prop="mobile" width="120" />
-      <el-table-column align="center" label="电话" prop="telephone" width="120" />
-      <el-table-column align="center" label="邮箱" prop="email" width="120" />
+      <el-table-column align="center" label="电话" prop="telephone" width="130" />
+      <el-table-column align="center" label="邮箱" prop="email" width="180" />
       <el-table-column align="center" label="职位" prop="post" width="120" />
       <el-table-column align="center" label="地址" prop="detailAddress" width="120" />
+      <el-table-column align="center" label="关键决策人" prop="master" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="直属上级" prop="parentName" width="160">
+        <template #default="scope">
+          <el-link :underline="false" type="primary" @click="openDetail(scope.row.parentId)">
+            {{ scope.row.parentName }}
+          </el-link>
+        </template>
+      </el-table-column>
+      <el-table-column label="地址" align="center" prop="detailAddress" width="180" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -140,13 +153,12 @@
         prop="contactNextTime"
         width="180px"
       />
-      <el-table-column align="center" label="备注" prop="remark" />
-      <el-table-column align="center" label="关键决策人" prop="master" width="100">
+      <el-table-column align="center" label="性别" prop="sex">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
+          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="直属上级" prop="parentName" width="140" />
+      <el-table-column align="center" label="备注" prop="remark" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -154,13 +166,8 @@
         prop="contactLastTime"
         width="180px"
       />
-      <el-table-column align="center" label="性别" prop="sex">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
-        </template>
-      </el-table-column>
       <el-table-column align="center" label="负责人" prop="ownerUserName" width="120" />
-      <el-table-column align="center" label="创建人" prop="creatorName" width="120" />
+      <el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -175,6 +182,7 @@
         prop="createTime"
         width="180px"
       />
+      <el-table-column align="center" label="创建人" prop="creatorName" width="120" />
       <el-table-column align="center" fixed="right" label="操作" width="200">
         <template #default="scope">
           <el-button
diff --git a/src/views/crm/customer/pool/index.vue b/src/views/crm/customer/pool/index.vue
index 2e4f3d16..0b79ab45 100644
--- a/src/views/crm/customer/pool/index.vue
+++ b/src/views/crm/customer/pool/index.vue
@@ -97,32 +97,31 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" label="编号" prop="id" />
-      <el-table-column align="center" label="客户名称" prop="name" width="160">
+      <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160">
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
           </el-link>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="手机" prop="mobile" width="120" />
-      <el-table-column align="center" label="电话" prop="telephone" width="120" />
       <el-table-column align="center" label="客户来源" prop="source" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="所属行业" prop="industryId" width="120">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="客户级别" prop="level" width="120">
+      <el-table-column label="手机" align="center" prop="mobile" width="120" />
+      <el-table-column label="电话" align="center" prop="telephone" width="130" />
+      <el-table-column label="邮箱" align="center" prop="email" width="180" />
+      <el-table-column align="center" label="客户级别" prop="level" width="135">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="网址" prop="website" width="200" />
+      <el-table-column align="center" label="客户行业" prop="industryId" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
+        </template>
+      </el-table-column>
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -136,9 +135,6 @@
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.dealStatus" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="距离进入公海" prop="poolDay">
-        <template #default="scope"> {{ scope.row.poolDay }}天</template>
-      </el-table-column>
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -146,10 +142,11 @@
         prop="contactLastTime"
         width="180px"
       />
+      <el-table-column align="center" label="最后跟进记录" prop="contactLastContent" width="200" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
-        label="创建时间"
+        label="更新时间"
         prop="updateTime"
         width="180px"
       />
@@ -160,16 +157,7 @@
         prop="createTime"
         width="180px"
       />
-      <el-table-column align="center" label="负责人" prop="ownerUserName" width="100px" />
-      <el-table-column align="center" label="所属部门" prop="ownerUserDeptName" width="100px" />
       <el-table-column align="center" label="创建人" prop="creatorName" width="100px" />
-      <el-table-column align="center" fixed="right" label="操作" min-width="150">
-        <template #default="scope">
-          <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
-            详情
-          </el-link>
-        </template>
-      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination