crm联系人review修改

(cherry picked from commit ed22e02b5b)

src/views/crm/contact/ContactForm.vue

@@ -1,12 +1,6 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" :width="820">
-    <el-form
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="110px" v-loading="formLoading">
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-      v-loading="formLoading"
-    >
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="姓名" prop="name">
@@ -15,60 +9,32 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="负责人" prop="ownerUserId">
-            <el-select
+            <el-select v-model="formData.ownerUserId" placeholder="请选择负责人" value-key="id" lable-key="nickname">
-              v-model="formData.ownerUserId"
+              <el-option v-for="item in userList" :key="item.id" :label="item.nickname" :value="item.id" />
-              placeholder="请选择负责人"
-              value-key="id"
-              lable-key="nickname"
-            >
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.nickname"
-                :value="item.id"
-              />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="客户名称" prop="customerName">
+          <el-form-item label="客户" prop="customerName">
-            <el-select
+            <el-select v-model="formData.customerId" placeholder="请选择客户" value-key="id" lable-key="name">
-              v-model="formData.customerId"
+              <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.id" />
-              placeholder="请选择客户"
-              value-key="id"
-              lable-key="name"
-            >
-              <el-option
-                v-for="item in customerList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12"
+        <el-col :span="12"><el-form-item label="性别" prop="sex">
-          ><el-form-item label="性别" prop="sex">
             <el-select v-model="formData.sex" placeholder="请选择">
               <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)" :key="dict.value"
-                :key="dict.value"
+                :label="dict.label" :value="dict.value" />
-                :label="dict.label"
+            </el-select>
-                :value="dict.value"
+          </el-form-item></el-col>
-              />
-            </el-select> </el-form-item
-        ></el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="手机号" prop="mobile">
-            <el-input
+            <el-input input-style="width:190px;" v-model="formData.mobile" placeholder="请输入手机号" />
-              input-style="width:190px;"
-              v-model="formData.mobile"
-              placeholder="请输入手机号"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -80,11 +46,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="邮箱" prop="email">
-            <el-input
+            <el-input input-style="width:190px;" v-model="formData.email" placeholder="请输入邮箱" />
-              input-style="width:190px;"
-              v-model="formData.email"
-              placeholder="请输入邮箱"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -96,21 +58,11 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="微信" prop="wechat">
-            <el-input
+            <el-input input-style="width:190px;" v-model="formData.wechat" placeholder="请输入微信" />
-              input-style="width:190px;"
-              v-model="formData.wechat"
-              placeholder="请输入微信"
-            />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12"> <el-form-item label="下次联系时间" prop="nextTime">
-          <el-form-item label="下次联系时间" prop="nextTime">
+            <el-date-picker v-model="formData.nextTime" type="date" value-format="x" placeholder="选择下次联系时间" />
-            <el-date-picker
-              v-model="formData.nextTime"
-              type="date"
-              value-format="x"
-              placeholder="选择下次联系时间"
-            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -118,50 +70,35 @@
         <el-col :span="12">
           <el-form-item label="所在地" prop="areaId">
             <el-tree-select
-              v-model="formData.areaId"
+v-model="formData.areaId" :data="areaList" :props="defaultProps"
-              :data="areaList"
+              :render-after-expand="true" />
-              :props="defaultProps"
-              :render-after-expand="true"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="地址" prop="address">
-            <el-input
+            <el-input input-style="width:190px;" v-model="formData.address" placeholder="请输入地址" />
-              input-style="width:190px;"
-              v-model="formData.address"
-              placeholder="请输入地址"
-            />
           </el-form-item>
-        </el-col> </el-row
+        </el-col>
-      ><el-row>
+      </el-row><el-row>
         <el-col :span="12">
           <el-form-item label="直属上级" prop="parentId">
             <el-select v-model="formData.parentId" placeholder="请选择">
               <el-option
-                v-for="item in allContactList"
+v-for="item in allContactList" :key="item.id" :label="item.name" :value="item.id"
-                :key="item.id"
+                :disabled="item.id == formData.id" />
-                :label="item.name"
-                :value="item.id"
-                :disabled="item.id == formData.id"
-              />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12"> <el-form-item label="职位" prop="post">
-          <el-form-item label="职位" prop="post">
             <el-input input-style="width:190px;" v-model="formData.post" placeholder="请输入职位" />
           </el-form-item>
-        </el-col> </el-row
+        </el-col>
-      ><el-row>
+      </el-row><el-row>
-        <el-col :span="12"
+        <el-col :span="12"><el-form-item label="是否关键决策人" prop="master" style="width: 400px">
-          ><el-form-item label="是否关键决策人" prop="master" style="width: 400px">
             <el-radio-group v-model="formData.master">
               <el-radio
-                v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)" :key="dict.value"
-                :key="dict.value"
+                :label="dict.value">
-                :label="dict.value"
-              >
                 {{ dict.label }}
               </el-radio>
             </el-radio-group>
@@ -169,8 +106,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="24"
+        <el-col :span="24"><el-form-item label="备注" prop="remark">
-          ><el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" placeholder="请输入备注" />
           </el-form-item>
         </el-col>
@@ -187,6 +123,7 @@ import * as ContactApi from '@/api/crm/contact'
 import { DICT_TYPE, getIntDictOptions, getBoolDictOptions } from '@/utils/dict'
 import * as UserApi from '@/api/system/user'
 import * as CustomerApi from '@/api/crm/customer'
+import { ElTable } from 'element-plus'
 import * as AreaApi from '@/api/system/area'
 import { defaultProps } from '@/utils/tree'
 
@@ -226,7 +163,6 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 const ownerUserList = ref<any[]>([])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
-// TODO 芋艿：统一的客户选择面板
 const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
 const allContactList = ref([]) // 所有联系人列表
 /** 打开弹窗 */

src/views/crm/contact/detail/ContactDetails.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zyna
+ * @Date: 2023-11-26 10:39:46
+ * @LastEditTime: 2023-11-27 23:43:25
+ * @FilePath: \yudao-ui-admin-vue3\src\views\crm\contact\detail\ContactDetails.vue
+ * @Description: 
+-->
 <template>
   <el-collapse v-model="activeNames">
     <el-collapse-item name="basicInfo">
@@ -8,7 +15,7 @@
         <el-descriptions-item label="姓名">
           {{ contact.name }}
         </el-descriptions-item>
-        <el-descriptions-item label="客户名称">
+        <el-descriptions-item label="客户">
           {{ contact.customerName }}
         </el-descriptions-item>
         <el-descriptions-item label="手机">

src/views/crm/contact/detail/index.vue

@@ -46,7 +46,7 @@
   </div>
   <ContentWrap class="mt-10px">
     <el-descriptions :column="5" direction="vertical">
-      <el-descriptions-item label="客户名称">
+      <el-descriptions-item label="客户">
         {{ contact.customerName }}
       </el-descriptions-item>
       <el-descriptions-item label="职务">

src/views/crm/contact/index.vue

@@ -1,91 +1,54 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <!-- TODO zyna：筛选项，按照需求简化下 -->
+    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-    <el-form
+      <el-form-item label="客户" prop="customerId">
-      class="-mb-15px"
+        <el-select
-      :model="queryParams"
+v-model="queryParams.customerId" placeholder="请选择客户" value-key="id" lable-key="name"
-      ref="queryFormRef"
+          @keyup.enter="handleQuery" clearable>
-      :inline="true"
+          <el-option v-for="item in customerList" :key="item.id" :label="item.name" :value="item.id" />
-      label-width="68px"
+        </el-select>
-    >
-      <el-form-item label="客户编号" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item label="姓名" prop="name">
-        <el-input
+        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" class="!w-240px" />
-          v-model="queryParams.name"
-          placeholder="请输入姓名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item label="手机号" prop="mobile">
         <el-input
-          v-model="queryParams.mobile"
+v-model="queryParams.mobile" placeholder="请输入手机号" clearable @keyup.enter="handleQuery"
-          placeholder="请输入手机号"
+          class="!w-240px" />
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item label="座机" prop="telephone">
         <el-input
-          v-model="queryParams.telephone"
+v-model="queryParams.telephone" placeholder="请输入电话" clearable @keyup.enter="handleQuery"
-          placeholder="请输入电话"
+          class="!w-240px" />
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
 
       <el-form-item label="QQ" prop="qq">
-        <el-input
+        <el-input v-model="queryParams.qq" placeholder="请输入QQ" clearable @keyup.enter="handleQuery" class="!w-240px" />
-          v-model="queryParams.qq"
-          placeholder="请输入QQ"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item label="微信" prop="wechat">
         <el-input
-          v-model="queryParams.wechat"
+v-model="queryParams.wechat" placeholder="请输入微信" clearable @keyup.enter="handleQuery"
-          placeholder="请输入微信"
+          class="!w-240px" />
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
       </el-form-item>
       <el-form-item label="电子邮箱" prop="email">
         <el-input
-          v-model="queryParams.email"
+v-model="queryParams.email" placeholder="请输入电子邮箱" clearable @keyup.enter="handleQuery"
-          placeholder="请输入电子邮箱"
+          class="!w-240px" />
-          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="handleQuery">
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <Icon icon="ep:search" class="mr-5px" /> 搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" /> 重置
+        </el-button>
         <el-button type="primary" @click="openForm('create')" v-hasPermi="['crm:contact:create']">
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
         <el-button
-          type="success"
+type="success" plain @click="handleExport" :loading="exportLoading"
-          plain
+          v-hasPermi="['crm:contact:export']">
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['crm:contact:export']"
-        >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
       </el-form-item>
@@ -102,7 +65,7 @@
           }}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="客户名称" fixed="left" align="center" prop="customerName" />
+      <el-table-column label="客户" fixed="left" align="center" prop="customerName" />
       <el-table-column label="性别" align="center" prop="sex">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.SYSTEM_USER_SEX" :value="scope.row.sex" />
@@ -114,48 +77,24 @@
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.master" />
         </template>
       </el-table-column>
-      <el-table-column label="直属上级" align="center" prop="parentName"/>
+      <el-table-column label="直属上级" align="center" prop="parentName" />
       <el-table-column label="手机号" align="center" prop="mobile" />
       <el-table-column label="座机" align="center" prop="telephone" />
       <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="address" />
-      <el-table-column
+      <el-table-column label="下次联系时间" align="center" prop="nextTime" width="180px" :formatter="dateFormatter" />
-        label="下次联系时间"
-        align="center"
-        prop="nextTime"
-        width="180px"
-        :formatter="dateFormatter"
-      />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
+      <el-table-column label="最后跟进时间" align="center" prop="lastTime" :formatter="dateFormatter" width="180px" />
-        label="最后跟进时间"
-        align="center"
-        prop="lastTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <el-table-column label="负责人" align="center" prop="ownerUserId">
         <template #default="scope">
-          {{ scope.row.ownerUserName}}
+          {{ scope.row.ownerUserName }}
         </template>
       </el-table-column>
       <!-- <el-table-column label="所属部门" align="center" prop="ownerUserId" /> -->
-      <el-table-column
+      <el-table-column label="更新时间" align="center" prop="updateTime" :formatter="dateFormatter" width="180px" />
-        label="更新时间"
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
-        align="center"
-        prop="updateTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <!-- <el-table-column
         label="创建人"
         align="center"
@@ -169,20 +108,10 @@
       </el-table-column> -->
       <el-table-column label="操作" align="center" fixed="right" width="200">
         <template #default="scope">
-          <el-button
+          <el-button plain type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['crm:contact:update']">
-            plain
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['crm:contact:update']"
-          >
             编辑
           </el-button>
-          <el-button
+          <el-button plain type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['crm:contact:delete']">
-            plain
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['crm:contact:delete']"
-          >
             删除
           </el-button>
         </template>
@@ -190,11 +119,8 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
+:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
-      v-model:page="queryParams.pageNo"
+      @pagination="getList" />
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -207,7 +133,6 @@ import download from '@/utils/download'
 import * as ContactApi from '@/api/crm/contact'
 import ContactForm from './ContactForm.vue'
 import { DICT_TYPE } from '@/utils/dict'
-import * as UserApi from '@/api/system/user'
 import * as CustomerApi from '@/api/crm/customer'
 
 defineOptions({ name: 'CrmContact' })
@@ -218,6 +143,7 @@ const { t } = useI18n() // 国际化
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据
+const customerList = ref<CustomerApi.CustomerVO[]>([]) // 客户列表
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -282,7 +208,7 @@ const handleDelete = async (id: number) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
-  } catch {}
+  } catch { }
 }
 
 /** 导出按钮操作 */
@@ -310,5 +236,6 @@ const openDetail = (id: number) => {
 /** 初始化 **/
 onMounted(async () => {
   await getList()
+  customerList.value = await CustomerApi.queryAllList()
 })
 </script>