From bcc665fab6efc7c73d6034272a29ab3f15fe1cf8 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 29 四月 2026 13:57:30 +0800
Subject: [PATCH] 修改报价客户显示

---
 src/views/basicData/customerFile/index.vue |   50 +++++++++++++++++++++++++-------------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index d0f829c..e61f77c 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -211,7 +211,8 @@
                  :limit="1"
                  accept=".xlsx, .xls"
                  :headers="upload.headers"
-                 :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                 :action="upload.url"
+                 :data="upload.data"
                  :disabled="upload.isUploading"
                  :before-upload="upload.beforeUpload"
                  :on-progress="upload.onProgress"
@@ -612,19 +613,13 @@
   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" }],
@@ -901,7 +898,10 @@
     // 璁剧疆涓婁紶鐨勮姹傚ご閮�
     headers: { Authorization: "Bearer " + getToken() },
     // 涓婁紶鐨勫湴鍧�
-    url: import.meta.env.VITE_APP_BASE_API + "/customerPrivate/importData",
+    url: import.meta.env.VITE_APP_BASE_API + "/basic/customer/importData",
+    data: {
+      type: 0
+    },
     // 鏂囦欢涓婁紶鍓嶇殑鍥炶皟
     beforeUpload: file => {
       console.log("鏂囦欢鍗冲皢涓婁紶", file);
@@ -972,7 +972,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;
@@ -994,7 +994,7 @@
   }
   /** 涓嬭浇妯℃澘 */
   function importTemplate() {
-    proxy.download("/customerPrivate/downloadTemplate", {}, "瀹㈡埛瀵煎叆妯℃澘.xlsx");
+    proxy.download("/basic/customer/downloadTemplate", {}, "瀹㈡埛瀵煎叆妯℃澘.xlsx");
   }
   // 鎵撳紑寮规
   const openForm = (type, row) => {
@@ -1007,12 +1007,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 +1050,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 +1064,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();
@@ -1082,7 +1083,7 @@
       type: "warning",
     })
       .then(() => {
-        proxy.download("/customerPrivate/export", {}, "瀹㈡埛妗f.xlsx");
+        proxy.download("/basic/customer/export", {type: 0}, "瀹㈡埛妗f.xlsx");
       })
       .catch(() => {
         proxy.$modal.msg("宸插彇娑�");
@@ -1111,7 +1112,7 @@
     })
       .then(() => {
         tableLoading.value = true;
-        delCustomerPrivate(ids)
+        delCustomer(ids)
           .then(() => {
             proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
             getList();
@@ -1165,8 +1166,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 +1174,7 @@
           };
         } else {
           submitvalue.value = {
-						customerPrivatePoolId: currentCustomerId.value,
+            customerId: currentCustomerId.value,
             isEnabled: reminderForm.reminderSwitch ? 1 : 0,
             content: reminderForm.reminderContent,
             reminderTime: reminderForm.reminderTime,
@@ -1203,7 +1203,7 @@
   // 鎵撳紑娲借皥杩涘害寮圭獥
   const openNegotiationDialog = row => {
     negotiationForm.customerName = row.customerName;
-    negotiationForm.customerPrivatePoolId = row.id;
+    negotiationForm.customerId = row.id;
     negotiationForm.followUpMethod = "";
     negotiationForm.followUpLevel = "";
     negotiationForm.followUpTime = "";
@@ -1232,7 +1232,7 @@
           // 淇敼鎿嶄綔
           updateCustomerFollow(negotiationForm).then(res => {
             // 鏇存柊鏈湴鏁版嵁
-            getCustomer(negotiationForm.customerPrivatePoolId).then(res => {
+            getCustomer(negotiationForm.customerId).then(res => {
               // 鏇存柊鏈湴鏁版嵁
               negotiationRecords.value = res.data.followUpList || [];
             });
@@ -1264,7 +1264,7 @@
 
   // 鎵撳紑璇︽儏寮圭獥
   const openDetailDialog = row => {
-    getCustomerPrivatePoolInfo(row.id).then(res => {
+    getCustomer(row.id).then(res => {
       // 濉厖瀹㈡埛鍩烘湰淇℃伅
       Object.assign(detailForm, res.data);
 
@@ -1285,7 +1285,7 @@
     // 灏嗗綋鍓嶈褰曟暟鎹~鍏呭埌琛ㄥ崟
     Object.assign(negotiationForm, {
       customerName: row.customerName,
-			customerPrivatePoolId: row.customerPrivatePoolId,
+			customerId: row.customerId,
       followUpMethod: row.followUpMethod,
       followUpLevel: row.followUpLevel,
       followUpTime: row.followUpTime,
@@ -1313,7 +1313,7 @@
         // });
         delCustomerFollow(row.id).then(() => {
           // 鍒犻櫎鎴愬姛鍚庢洿鏂版湰鍦版暟鎹�
-          getCustomer(row.customerPrivatePoolId).then(res => {
+          getCustomer(row.customerId).then(res => {
             // 鏇存柊鏈湴鏁版嵁
             negotiationRecords.value = res.data.followUpList || [];
           });

--
Gitblit v1.9.3