From fb1276b796c5212c18141fe2c732fb07d71fa31e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 28 四月 2026 18:00:41 +0800
Subject: [PATCH] 重构客户档案

---
 src/views/basicData/customerFile/index.vue        |   37 ++++-----
 src/api/basicData/customerFile.js                 |   48 ------------
 src/views/basicData/customerFileOpenSea/index.vue |   39 +++++----
 src/api/basicData/customer.js                     |   67 ++++++++++++++++
 4 files changed, 106 insertions(+), 85 deletions(-)

diff --git a/src/api/basicData/customer.js b/src/api/basicData/customer.js
new file mode 100644
index 0000000..601e974
--- /dev/null
+++ b/src/api/basicData/customer.js
@@ -0,0 +1,67 @@
+import request from '@/utils/request'
+
+export function listCustomer(query) {
+    return request({
+        url: '/basic/customer/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 鍒嗛厤瀹㈡埛
+export function assignCustomer(data) {
+    return request({
+        url: '/basic/customer/assignCustomer',
+        method: 'post',
+        data
+    })
+}
+
+// 鍥炴敹瀹㈡埛
+export function recycleCustomer(data) {
+    return request({
+        url: '/basic/customer/recycleCustomer',
+        method: 'post',
+        data
+    })
+}
+
+export function getCustomer(id) {
+    return request({
+        url: '/basic/customer/' + id,
+        method: 'get'
+    })
+}
+
+export function addCustomer(data) {
+    return request({
+        url: '/basic/customer/addCustomer',
+        method: 'post',
+        data: data
+    })
+}
+
+export function updateCustomer(data) {
+    return request({
+        url: '/basic/customer/updateCustomer',
+        method: 'post',
+        data: data
+    })
+}
+
+export function exportCustomer(query) {
+    return request({
+        url: '/basic/customer/export',
+        method: 'get',
+        params: query,
+        responseType: 'blob'
+    })
+}
+
+export function delCustomer(ids) {
+    return request({
+        url: '/basic/customer/delCustomer',
+        method: 'delete',
+        data: ids
+    })
+}
diff --git a/src/api/basicData/customerFile.js b/src/api/basicData/customerFile.js
index 7b6d7c6..d7ed46d 100644
--- a/src/api/basicData/customerFile.js
+++ b/src/api/basicData/customerFile.js
@@ -1,13 +1,5 @@
 import request from '@/utils/request'
 
-export function listCustomer(query) {
-    return request({
-        url: '/basic/customer/list',
-        method: 'get',
-        params: query
-    })
-}
-
 // 瀹㈡埛妗f绉佹捣鏌ヨ
 export function listCustomerPrivatePool(query) {
     return request({
@@ -56,13 +48,6 @@
     })
 }
 
-export function getCustomer(id) {
-    return request({
-        url: '/basic/customer/' + id,
-        method: 'get'
-    })
-}
-
 export function getCustomerPrivatePoolById(id) {
     return request({
         url: '/customerPrivatePool/getbyId/' + id,
@@ -77,44 +62,11 @@
     })
 }
 
-export function addCustomer(data) {
-    return request({
-        url: '/basic/customer/addCustomer',
-        method: 'post',
-        data: data
-    })
-}
-
-export function updateCustomer(data) {
-    return request({
-        url: '/basic/customer/updateCustomer',
-        method: 'post',
-        data: data
-    })
-}
-
 export function updateCustomerPrivatePool(data) {
     return request({
         url: '/customerPrivatePool/update',
         method: 'put',
         data: data
-    })
-}
-
-export function exportCustomer(query) {
-    return request({
-        url: '/basic/customer/export',
-        method: 'get',
-        params: query,
-        responseType: 'blob'
-    })
-}
-
-export function delCustomer(ids) {
-    return request({
-        url: '/basic/customer/delCustomer',
-        method: 'delete',
-        data: ids
     })
 }
 
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index d0f829c..95c932c 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -612,19 +612,14 @@
   import { onMounted, ref, reactive, getCurrentInstance, toRefs } from "vue";
   import { Search, Paperclip, Upload } from "@element-plus/icons-vue";
   import {
-    addCustomerPrivate,
     delCustomerPrivate,
-    getCustomer,
-    getCustomerPrivatePoolById,
-    getCustomerPrivatePoolInfo,
-    listCustomerPrivatePool,
-    updateCustomerPrivatePool,
     addCustomerFollow,
     updateCustomerFollow,
     delCustomerFollow,
     addReturnVisit,
     getReturnVisit,
   } from "@/api/basicData/customerFile.js";
+  import {listCustomer, getCustomer, addCustomer, updateCustomer, delCustomer} from "@/api/basicData/customer.js";
   import { ElMessageBox } from "element-plus";
   import { userListNoPage } from "@/api/system/user.js";
   import useUserStore from "@/store/modules/user";
@@ -656,7 +651,7 @@
   const negotiationFormRef = ref();
   const negotiationForm = reactive({
     customerName: "",
-		customerPrivatePoolId: "",
+		customerId: "",
     followUpMethod: "",
     followUpLevel: "",
     followUpTime: "",
@@ -857,6 +852,7 @@
     searchForm: {
       customerName: "",
       customerType: "",
+      type: 0
     },
     form: {
       customerName: "",
@@ -871,6 +867,7 @@
       bankAccount: "",
       bankCode: "",
       customerType: "",
+      type: 0
     },
     rules: {
       customerName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -972,7 +969,7 @@
   };
   const getList = () => {
     tableLoading.value = true;
-    listCustomerPrivatePool({ ...searchForm.value, ...page }).then(res => {
+    listCustomer({ ...searchForm.value, ...page }).then(res => {
       tableLoading.value = false;
       tableData.value = res.data.records;
       page.total = res.data.total;
@@ -1007,12 +1004,13 @@
         contactPhone: "",
       },
     ];
+    form.value.type = 0;
     form.value.maintenanceTime = getCurrentDate();
     userListNoPage().then(res => {
       userList.value = res.data;
     });
     if (type === "edit") {
-      getCustomerPrivatePoolById(row.id).then(res => {
+      getCustomer(row.id).then(res => {
         form.value = { ...res.data };
         formYYs.value.contactList = res.data.contactPerson
           .split(",")
@@ -1049,7 +1047,7 @@
     form.value.contactPhone = formYYs.value.contactList
       .map(item => item.contactPhone)
       .join(",");
-    addCustomerPrivate(form.value).then(res => {
+    addCustomer(form.value).then(res => {
       proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
       closeDia();
       getList();
@@ -1063,7 +1061,7 @@
     form.value.contactPhone = formYYs.value.contactList
       .map(item => item.contactPhone)
       .join(",");
-    updateCustomerPrivatePool(form.value).then(res => {
+    updateCustomer(form.value).then(res => {
       proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
       closeDia();
       getList();
@@ -1111,7 +1109,7 @@
     })
       .then(() => {
         tableLoading.value = true;
-        delCustomerPrivate(ids)
+        delCustomer(ids)
           .then(() => {
             proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
             getList();
@@ -1165,8 +1163,7 @@
         if (reminderForm.id) {
           submitvalue.value = {
             id: reminderForm.id,
-						customerPrivatePoolId: reminderForm.id,
-						customerPrivatePoolId: currentCustomerId.value,
+						customerId: currentCustomerId.value,
             isEnabled: reminderForm.reminderSwitch ? 1 : 0,
             content: reminderForm.reminderContent,
             reminderTime: reminderForm.reminderTime,
@@ -1174,7 +1171,7 @@
           };
         } else {
           submitvalue.value = {
-						customerPrivatePoolId: currentCustomerId.value,
+            customerId: currentCustomerId.value,
             isEnabled: reminderForm.reminderSwitch ? 1 : 0,
             content: reminderForm.reminderContent,
             reminderTime: reminderForm.reminderTime,
@@ -1203,7 +1200,7 @@
   // 鎵撳紑娲借皥杩涘害寮圭獥
   const openNegotiationDialog = row => {
     negotiationForm.customerName = row.customerName;
-    negotiationForm.customerPrivatePoolId = row.id;
+    negotiationForm.customerId = row.id;
     negotiationForm.followUpMethod = "";
     negotiationForm.followUpLevel = "";
     negotiationForm.followUpTime = "";
@@ -1232,7 +1229,7 @@
           // 淇敼鎿嶄綔
           updateCustomerFollow(negotiationForm).then(res => {
             // 鏇存柊鏈湴鏁版嵁
-            getCustomer(negotiationForm.customerPrivatePoolId).then(res => {
+            getCustomer(negotiationForm.customerId).then(res => {
               // 鏇存柊鏈湴鏁版嵁
               negotiationRecords.value = res.data.followUpList || [];
             });
@@ -1264,7 +1261,7 @@
 
   // 鎵撳紑璇︽儏寮圭獥
   const openDetailDialog = row => {
-    getCustomerPrivatePoolInfo(row.id).then(res => {
+    getCustomer(row.id).then(res => {
       // 濉厖瀹㈡埛鍩烘湰淇℃伅
       Object.assign(detailForm, res.data);
 
@@ -1285,7 +1282,7 @@
     // 灏嗗綋鍓嶈褰曟暟鎹~鍏呭埌琛ㄥ崟
     Object.assign(negotiationForm, {
       customerName: row.customerName,
-			customerPrivatePoolId: row.customerPrivatePoolId,
+			customerId: row.customerId,
       followUpMethod: row.followUpMethod,
       followUpLevel: row.followUpLevel,
       followUpTime: row.followUpTime,
@@ -1313,7 +1310,7 @@
         // });
         delCustomerFollow(row.id).then(() => {
           // 鍒犻櫎鎴愬姛鍚庢洿鏂版湰鍦版暟鎹�
-          getCustomer(row.customerPrivatePoolId).then(res => {
+          getCustomer(row.customerId).then(res => {
             // 鏇存柊鏈湴鏁版嵁
             negotiationRecords.value = res.data.followUpList || [];
           });
diff --git a/src/views/basicData/customerFileOpenSea/index.vue b/src/views/basicData/customerFileOpenSea/index.vue
index 71cc051..8dc4618 100644
--- a/src/views/basicData/customerFileOpenSea/index.vue
+++ b/src/views/basicData/customerFileOpenSea/index.vue
@@ -681,20 +681,23 @@
   import { onMounted, ref, reactive, getCurrentInstance, toRefs } from "vue";
   import { Search, Paperclip, Upload } from "@element-plus/icons-vue";
   import {
-    addCustomer,
-    addCustomerPrivatePool,
-    delCustomerPrivatePool,
-    delCustomer,
-    getCustomer,
     shareCustomer,
-    listCustomer,
-    updateCustomer,
     addCustomerFollow,
     updateCustomerFollow,
     delCustomerFollow,
     addReturnVisit,
     getReturnVisit,
   } from "@/api/basicData/customerFile.js";
+  import {
+    listCustomer,
+    addCustomer,
+    delCustomer,
+    updateCustomer,
+    getCustomer,
+    assignCustomer,
+    recycleCustomer
+  } from "@/api/basicData/customer.js";
+
   import { ElMessageBox } from "element-plus";
   import { userListNoPage } from "@/api/system/user.js";
   import useUserStore from "@/store/modules/user";
@@ -915,7 +918,7 @@
           type: "text",
           showHide: row => row.usageStatus == 1,
           clickFun: row => {
-            recycleCustomer(row);
+            recycle(row);
           },
         },
 				{
@@ -970,6 +973,7 @@
     searchForm: {
       customerName: "",
       customerType: "",
+      type: 1
     },
     form: {
       customerName: "",
@@ -984,6 +988,7 @@
       bankAccount: "",
       bankCode: "",
       customerType: "",
+      type: 1
     },
     rules: {
       customerName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
@@ -1122,6 +1127,7 @@
       },
     ];
     form.value.maintenanceTime = getCurrentDate();
+    form.value.type = 1;
     userListNoPage().then(res => {
       userList.value = res.data;
     });
@@ -1231,9 +1237,9 @@
       if (!valid) {
         return;
       }
-      addCustomerPrivatePool({
-        customerId: assignForm.id,
-        boundId: assignForm.boundId,
+      assignCustomer({
+        id: assignForm.id,
+        usageUser: assignForm.boundId,
       }).then(() => {
         proxy.$modal.msgSuccess("鍒嗛厤鎴愬姛");
         closeAssignDialog();
@@ -1256,18 +1262,17 @@
       });
     });
   };
-  const recycleCustomer = row => {
+  const recycle = row => {
     ElMessageBox.confirm("纭鍥炴敹瀹㈡埛鈥�" + row.customerName + "鈥濆悧锛�", "鍥炴敹鎻愮ず", {
       confirmButtonText: "纭",
       cancelButtonText: "鍙栨秷",
       type: "warning",
     })
       .then(() => {
-        return delCustomerPrivatePool(row.id);
-      })
-      .then(() => {
-        proxy.$modal.msgSuccess("鍥炴敹鎴愬姛");
-        getList();
+        return recycleCustomer({id: row.id}).then(() => {
+          proxy.$modal.msgSuccess("鍥炴敹鎴愬姛");
+          getList();
+        })
       })
       .catch(error => {
         if (error === "cancel" || error === "close") {

--
Gitblit v1.9.3