From da4d175e9115eb1ad6c9871da264d081bd25351e Mon Sep 17 00:00:00 2001
From: zy <zyqdgcs@163.com>
Date: Sun, 27 Apr 2025 17:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.local                                    |  2 +-
 src/views/crm/contact/ContactForm.vue         |  4 ++-
 src/views/crm/customer/CustomerForm.vue       |  2 +-
 .../customer/detail/CustomerDetailsInfo.vue   | 12 +++++--
 src/views/crm/customer/detail/index.vue       |  4 +--
 .../ReturnVisitRecordForm.vue                 | 35 +++++++++++++------
 .../detail/returnvisitrecord/index.vue        |  1 -
 src/views/crm/followup/FollowUpRecordForm.vue |  6 +++-
 .../components/FollowUpRecordContactForm.vue  |  6 ++--
 src/views/crm/product/ProductForm.vue         |  4 +--
 10 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/.env.local b/.env.local
index 49d3c9089..925808d83 100644
--- a/.env.local
+++ b/.env.local
@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://192.168.251.60:48080'
+VITE_BASE_URL='http://172.22.3.6:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/views/crm/contact/ContactForm.vue b/src/views/crm/contact/ContactForm.vue
index 81813e6a2..8b81a8a24 100644
--- a/src/views/crm/contact/ContactForm.vue
+++ b/src/views/crm/contact/ContactForm.vue
@@ -18,6 +18,7 @@
             <el-select
               v-model="formData.ownerUserId"
               :disabled="formType !== 'create'"
+              filterable
               class="w-1/1"
             >
               <el-option
@@ -36,6 +37,7 @@
             <el-select
               :disabled="formData.customerDefault"
               v-model="formData.customerId"
+              filterable
               placeholder="请选择客户"
               class="w-1/1"
             >
@@ -113,7 +115,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="直属上级" prop="parentId">
-            <el-select v-model="formData.parentId" placeholder="请选择直属上级" class="w-1/1">
+            <el-select v-model="formData.parentId" filterable placeholder="请选择直属上级" class="w-1/1">
               <el-option
                 v-for="item in contactList"
                 :key="item.id"
diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index 5495532a6..561082a76 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="50%">
     <el-form
       ref="formRef"
       v-loading="formLoading"
diff --git a/src/views/crm/customer/detail/CustomerDetailsInfo.vue b/src/views/crm/customer/detail/CustomerDetailsInfo.vue
index 755c2172b..fe240b9ba 100644
--- a/src/views/crm/customer/detail/CustomerDetailsInfo.vue
+++ b/src/views/crm/customer/detail/CustomerDetailsInfo.vue
@@ -12,8 +12,8 @@
           <el-descriptions-item label="客户来源">
             <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="customer.source" />
           </el-descriptions-item>
-          <el-descriptions-item label="合作类型">{{ customer.cooperationType }}</el-descriptions-item>
-          <el-descriptions-item label="合作地区">{{ customer.cooperationArea }}</el-descriptions-item>
+          <el-descriptions-item label="合作类型">{{ getName(getIntDictOptions(DICT_TYPE.CRM_COOPERATION_TYPE),customer.cooperationType) }}</el-descriptions-item>
+          <el-descriptions-item label="合作地区">{{ getName(getIntDictOptions(DICT_TYPE.CRM_COOPERATION_AREA),customer.cooperationArea) }}</el-descriptions-item>
           <el-descriptions-item label="客户级别">
             <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
           </el-descriptions-item>
@@ -66,7 +66,7 @@
 </template>
 <script lang="ts" setup>
 import * as CustomerApi from '@/api/crm/customer'
-import { DICT_TYPE } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'CrmCustomerDetailsInfo' })
@@ -75,5 +75,11 @@ const { customer } = defineProps<{
 }>()
 
 const activeNames = ref(['basicInfo', 'systemInfo']) // 展示的折叠面板
+const getName = (opt, val) => {
+  console.log('%csrc/views/crm/customer/detail/CustomerDetailsInfo.vue:79 opt, val', 'color: #007acc;', opt, val);
+  const arr = opt.filter(v => v.value == val)
+  console.log('%csrc/views/crm/customer/detail/CustomerDetailsInfo.vue:81 arr', 'color: #007acc;', arr);
+  return arr.length ? arr[0]['label'] : ''
+}
 </script>
 <style lang="scss" scoped></style>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 413355b9c..05c2d48b0 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -51,7 +51,7 @@
       <el-tab-pane label="联系人" lazy>
         <ContactList :biz-id="customer.id!" :biz-type="BizTypeEnum.CRM_CUSTOMER" />
       </el-tab-pane>
-      <!-- <el-tab-pane label="团队成员">
+      <el-tab-pane label="团队成员">
         <PermissionList
           ref="permissionListRef"
           :biz-id="customer.id!"
@@ -59,7 +59,7 @@
           :show-action="!permissionListRef?.isPool || false"
           @quit-team="close"
         />
-      </el-tab-pane> -->
+      </el-tab-pane>
       <el-tab-pane label="商机" lazy>
         <BusinessList :biz-id="customer.id!" :biz-type="BizTypeEnum.CRM_CUSTOMER" />
       </el-tab-pane>
diff --git a/src/views/crm/customer/detail/returnvisitrecord/ReturnVisitRecordForm.vue b/src/views/crm/customer/detail/returnvisitrecord/ReturnVisitRecordForm.vue
index aa060e55b..d3103677c 100644
--- a/src/views/crm/customer/detail/returnvisitrecord/ReturnVisitRecordForm.vue
+++ b/src/views/crm/customer/detail/returnvisitrecord/ReturnVisitRecordForm.vue
@@ -4,7 +4,7 @@
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="110px"
       v-loading="formLoading"
     >
       <el-row>
@@ -69,7 +69,7 @@
                   <Icon class="mr-5px" icon="ep:plus" />
                   添加联系人
                 </el-button>
-                <FollowUpRecordContactForm :contacts="formData.contacts" />
+                <FollowUpRecordContactForm @success="del" :contacts="formData.contacts" />
               </el-form-item>
         </el-col>
       </el-row>
@@ -111,7 +111,9 @@ const formData = ref({
   nextTime: undefined,
   picUrls: undefined,
   fileUrls: undefined,
-  contactIds: undefined
+  contactIds: undefined,
+  contacts: []
+
 })
 const formRef = ref() // 表单 Ref
 const formRules = reactive({
@@ -126,6 +128,18 @@ const contactTableSelectRef = ref<InstanceType<typeof ContactListModal>>()
 const handleOpenContact = () => {
   contactTableSelectRef.value?.open()
 }
+const handleAddContact = (contactId: [], newContacts: ContactApi.ContactVO[]) => {
+  newContacts.forEach((contact) => {
+    if (!formData.value.contacts.some((item) => item.id === contact.id)) {
+      formData.value.contacts.push(contact)
+    }
+  })
+}
+
+const del = (index: number) => {
+  formData.value.contacts.splice(index, 1)
+
+}
 /** 打开弹窗 */
 const open = async (bizType: number, bizId: number) => {
   dialogVisible.value = true
@@ -145,14 +159,12 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as ReturnVisitRecordVO
-    if (formType.value === 'create') {
-      await ReturnVisitRecordApi.createReturnVisitRecord(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ReturnVisitRecordApi.updateReturnVisitRecord(data)
-      message.success(t('common.updateSuccess'))
-    }
+    const data = {
+      ...formData.value,
+      contactIds: formData.value.contacts.map((item) => item.id),
+    } as unknown as ReturnVisitRecordVO
+    await ReturnVisitRecordApi.createReturnVisitRecord(data)
+    message.success(t('common.createSuccess'))
     dialogVisible.value = false
     // 发送操作成功的事件
     emit('success')
@@ -172,6 +184,7 @@ const resetForm = () => {
     nextTime: undefined,
     picUrls: undefined,
     fileUrls: undefined,
+    contacts: []　,
     contactIds: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/crm/customer/detail/returnvisitrecord/index.vue b/src/views/crm/customer/detail/returnvisitrecord/index.vue
index fdc67db4d..1a0b41e43 100644
--- a/src/views/crm/customer/detail/returnvisitrecord/index.vue
+++ b/src/views/crm/customer/detail/returnvisitrecord/index.vue
@@ -50,7 +50,6 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['crm:return-visit-record:delete']"
           >
             删除
           </el-button>
diff --git a/src/views/crm/followup/FollowUpRecordForm.vue b/src/views/crm/followup/FollowUpRecordForm.vue
index eb626f01c..cf0976592 100644
--- a/src/views/crm/followup/FollowUpRecordForm.vue
+++ b/src/views/crm/followup/FollowUpRecordForm.vue
@@ -52,7 +52,7 @@
               <Icon class="mr-5px" icon="ep:plus" />
               添加联系人
             </el-button>
-            <FollowUpRecordContactForm :contacts="formData.contacts" />
+            <FollowUpRecordContactForm @success="del" :contacts="formData.contacts" />
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.bizType == BizTypeEnum.CRM_CUSTOMER">
@@ -162,6 +162,10 @@ const handleAddContact = (contactId: [], newContacts: ContactApi.ContactVO[]) =>
   })
 }
 
+const del = (index: number) => {
+  formData.value.contacts.splice(index, 1)
+
+}
 /** 关联商机 */
 const businessTableSelectRef = ref<InstanceType<typeof BusinessListModal>>()
 const handleOpenBusiness = () => {
diff --git a/src/views/crm/followup/components/FollowUpRecordContactForm.vue b/src/views/crm/followup/components/FollowUpRecordContactForm.vue
index b3b5d3a29..cdae80f7d 100644
--- a/src/views/crm/followup/components/FollowUpRecordContactForm.vue
+++ b/src/views/crm/followup/components/FollowUpRecordContactForm.vue
@@ -17,7 +17,7 @@
     </el-table-column>
     <el-table-column align="center" fixed="right" label="操作" width="130">
       <template #default="scope">
-        <el-button link type="danger" @click="handleDelete(scope.row.id)"> 移除</el-button>
+        <el-button link type="danger" @click="handleDelete(scope.$index)"> 移除</el-button>
       </template>
     </el-table-column>
   </el-table>
@@ -40,8 +40,10 @@ watch(
   { immediate: true }
 )
 
+  const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 /** 删除按钮操作 */
 const handleDelete = (index: number) => {
-  formData.value.splice(index, 1)
+  emit('success', index)
+
 }
 </script>
diff --git a/src/views/crm/product/ProductForm.vue b/src/views/crm/product/ProductForm.vue
index 98a7fa112..636ebf39b 100644
--- a/src/views/crm/product/ProductForm.vue
+++ b/src/views/crm/product/ProductForm.vue
@@ -1,10 +1,10 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="50%">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="110px"
       v-loading="formLoading"
     >
       <el-row>