From 3471b5c5b2f915f29008ca38db0c6e4a3512fff1 Mon Sep 17 00:00:00 2001
From: min <bluesfish@yeah.net>
Date: Sun, 21 Jan 2024 17:54:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?CRM=EF=BC=9A=E7=BA=BF=E7=B4=A2=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=8E=BB=E6=8E=89=E5=AE=A2=E6=88=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/clue/ClueForm.vue | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index 1b2637c9..13fe74ef 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -10,17 +10,6 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
-      <!-- TODO 芋艿：后续客户的选择 -->
-      <el-form-item label="客户" prop="customerId">
-        <el-select v-model="formData.customerId" clearable placeholder="请选择客户">
-          <el-option
-            v-for="item in customerList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item label="下次联系时间" prop="contactNextTime">
         <el-date-picker
           v-model="formData.contactNextTime"
@@ -54,7 +43,6 @@
 </template>
 <script setup lang="ts">
 import * as ClueApi from '@/api/crm/clue'
-import * as CustomerApi from '@/api/crm/customer'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -63,11 +51,9 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const customerList = ref([]) // 客户列表
 const formData = ref({
   id: undefined,
   name: undefined,
-  customerId: undefined,
   contactNextTime: undefined,
   telephone: undefined,
   mobile: undefined,
@@ -77,8 +63,7 @@ const formData = ref({
   remark: undefined
 })
 const formRules = reactive({
-  name: [{ required: true, message: '线索名称不能为空', trigger: 'blur' }],
-  customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }]
+  name: [{ required: true, message: '线索名称不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -88,12 +73,6 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
-  const customerData = await CustomerApi.getCustomerPage({
-    pageNo: 1,
-    pageSize: 100,
-    pool: false
-  })
-  customerList.value = customerData.list
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -137,7 +116,6 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     name: undefined,
-    customerId: undefined,
     contactNextTime: undefined,
     telephone: undefined,
     mobile: undefined,

From e0bc3ea6dcf11e29ea8dcf500c39167263f003db Mon Sep 17 00:00:00 2001
From: min <bluesfish@yeah.net>
Date: Sun, 21 Jan 2024 18:58:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?CRM=EF=BC=9A=E7=BA=BF=E7=B4=A2=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E5=A2=9E=E5=8A=A0=E8=B4=9F=E8=B4=A3=E4=BA=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/clue/ClueForm.vue | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index 13fe74ef..efb36045 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -27,9 +27,15 @@
       <el-form-item label="地址" prop="address">
         <el-input v-model="formData.address" placeholder="请输入地址" />
       </el-form-item>
-      <!-- TODO wanwan 负责人选择 -->
-      <el-form-item label="负责人" prop="ownerUserId">
-        <el-input v-model="formData.ownerUserId" placeholder="请输入负责人" />
+      <el-form-item v-if="formType === 'create'" label="负责人" prop="userIds" span="24">
+        <el-select v-model="formData.ownerUserId">
+          <el-option
+              v-for="item in userOptions"
+              :key="item.id"
+              :label="item.nickname"
+              :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
@@ -43,14 +49,17 @@
 </template>
 <script setup lang="ts">
 import * as ClueApi from '@/api/crm/clue'
+import {CACHE_KEY, useCache} from "@/hooks/web/useCache";
+import * as UserApi from "@/api/system/user";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formLoading = ref(false) // 表单加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
 const formData = ref({
   id: undefined,
   name: undefined,
@@ -63,7 +72,8 @@ const formData = ref({
   remark: undefined
 })
 const formRules = reactive({
-  name: [{ required: true, message: '线索名称不能为空', trigger: 'blur' }]
+  name: [{ required: true, message: '线索名称不能为空', trigger: 'blur' }],
+  ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -82,6 +92,14 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 获得用户列表
+  userOptions.value = await UserApi.getSimpleUserList()
+  // 新建时负责人默认为登录人
+  if (formType.value === 'create') {
+    const { wsCache } = useCache()
+    const user = wsCache.get(CACHE_KEY.USER).user
+    formData.value.ownerUserId = user.id
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗