From 49530253cb602ca94226ef74bd5240c43de4e5e1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 24 四月 2026 13:53:38 +0800
Subject: [PATCH] 天津宝东 1.新增客户只要客户名称,公司地址,公司电话,不需要法人 2.客户档案客户分类加个连锁店 3.客户档案客联系人联系电话也要,要加一个联系人岗位(手填) 4.客户档案客洽谈进度不要

---
 src/views/basicData/customerFile/index.vue |  299 +++++++++++++++++++++--------------------------------------
 1 files changed, 106 insertions(+), 193 deletions(-)

diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index ad1c5bb..28302c5 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -19,6 +19,8 @@
                      value="闆跺敭瀹㈡埛" />
           <el-option label="杩涢攢鍟嗗鎴�"
                      value="杩涢攢鍟嗗鎴�" />
+          <el-option label="杩為攣搴�"
+                     value="杩為攣搴�" />
         </el-select>
         <el-button type="primary"
                    @click="handleQuery"
@@ -66,11 +68,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="绾崇◣浜鸿瘑鍒彿锛�"
-                          prop="taxpayerIdentificationNumber">
-              <el-input v-model="form.taxpayerIdentificationNumber"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
+            <el-form-item label="瀹㈡埛鍒嗙被锛�"
+                          prop="customerType">
+              <el-select v-model="form.customerType"
+                         placeholder="璇烽�夋嫨"
+                         clearable>
+                <el-option label="闆跺敭瀹㈡埛"
+                           value="闆跺敭瀹㈡埛" />
+                <el-option label="杩涢攢鍟嗗鎴�"
+                           value="杩涢攢鍟嗗鎴�" />
+                <el-option label="杩為攣搴�"
+                           value="杩為攣搴�" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -92,51 +101,10 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="閾惰鍩烘湰鎴凤細"
-                          prop="basicBankAccount">
-              <el-input v-model="form.basicBankAccount"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="閾惰璐﹀彿锛�"
-                          prop="bankAccount">
-              <el-input v-model="form.bankAccount"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="寮�鎴疯鍙凤細"
-                          prop="bankCode">
-              <el-input v-model="form.bankCode"
-                        placeholder="璇疯緭鍏�"
-                        clearable />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="瀹㈡埛鍒嗙被锛�"
-                          prop="customerType">
-              <el-select v-model="form.customerType"
-                         placeholder="璇烽�夋嫨"
-                         clearable>
-                <el-option label="闆跺敭瀹㈡埛"
-                           value="闆跺敭瀹㈡埛" />
-                <el-option label="杩涢攢鍟嗗鎴�"
-                           value="杩涢攢鍟嗗鎴�" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row :gutter="30"
                 v-for="(contact, index) in formYYs.contactList"
                 :key="index">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="鑱旂郴浜猴細"
                           prop="contactPerson">
               <el-input v-model="contact.contactPerson"
@@ -144,12 +112,20 @@
                         clearable />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="鑱旂郴鐢佃瘽锛�"
                           prop="contactPhone">
+              <el-input v-model="contact.contactPhone"
+                        placeholder="璇疯緭鍏�"
+                        clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="鑱旂郴浜哄矖浣嶏細"
+                          prop="contactPosition">
               <div style="display: flex; align-items: center;width: 100%;">
-                <el-input v-model="contact.contactPhone"
-                          placeholder="璇疯緭鍏�"
+                <el-input v-model="contact.contactPosition"
+                          placeholder="璇疯緭鍏ヨ仈绯讳汉宀椾綅"
                           clearable />
                 <el-button @click="removeContact(index)"
                            type="danger"
@@ -165,34 +141,6 @@
         </el-row>
         <el-button @click="addNewContact"
                    style="margin-bottom: 10px;">+ 鏂板鑱旂郴浜�</el-button>
-        <el-row :gutter="30">
-          <el-col :span="12">
-            <el-form-item label="缁存姢浜猴細"
-                          prop="maintainer">
-              <el-select v-model="form.maintainer"
-                         placeholder="璇烽�夋嫨"
-                         clearable
-                         disabled>
-                <el-option v-for="item in userList"
-                           :key="item.nickName"
-                           :label="item.nickName"
-                           :value="item.nickName" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="缁存姢鏃堕棿锛�"
-                          prop="maintenanceTime">
-              <el-date-picker style="width: 100%"
-                              v-model="form.maintenanceTime"
-                              value-format="YYYY-MM-DD"
-                              format="YYYY-MM-DD"
-                              type="date"
-                              placeholder="璇烽�夋嫨"
-                              clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -276,15 +224,15 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
+          <el-button type="primary" @click="submitReminderForm">纭</el-button>
           <el-button @click="closeReminderDialog">鍙栨秷</el-button>
-          <el-button type="primary"
-                     @click="submitReminderForm">鎻愪氦</el-button>
         </div>
       </template>
     </el-dialog>
     <!-- 娣诲姞/淇敼娲借皥杩涘害瀵硅瘽妗� -->
     <el-dialog :title="negotiationForm.editIndex !== undefined ? '淇敼杩涘害' : '娣诲姞杩涘害'"
                v-model="negotiationDialogVisible"
+               v-if="false"
                width="600px"
                @close="closeNegotiationDialog">
       <el-form :model="negotiationForm"
@@ -360,9 +308,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
+          <el-button type="primary" @click="submitNegotiationForm">纭</el-button>
           <el-button @click="closeNegotiationDialog">鍙栨秷</el-button>
-          <el-button type="primary"
-                     @click="submitNegotiationForm">鎻愪氦</el-button>
         </div>
       </template>
     </el-dialog>
@@ -494,7 +441,6 @@
             <template #default="{ row }">
               <el-button type="info"
                          link
-                         size="small"
                          @click="openAttachmentDialog(row)">
                 <el-icon>
                   <Paperclip />
@@ -510,13 +456,11 @@
             <template #default="{ row, $index }">
               <el-button type="primary"
                          link
-                         size="small"
                          @click="editNegotiationRecord(row, $index)">
                 淇敼
               </el-button>
               <el-button type="danger"
                          link
-                         size="small"
                          @click="deleteNegotiationRecord(row, $index)">
                 鍒犻櫎
               </el-button>
@@ -537,6 +481,7 @@
     <!-- 闄勪欢涓婁紶寮圭獥 -->
     <el-dialog title="闄勪欢绠$悊"
                v-model="attachmentDialogVisible"
+               v-if="false"
                width="600px"
                @close="closeAttachmentDialog">
       <div class="attachment-section">
@@ -587,13 +532,11 @@
               <template #default="{ row, $index }">
                 <el-button type="primary"
                            link
-                           size="small"
                            @click="downloadAttachment(row)">
                   涓嬭浇
                 </el-button>
                 <el-button type="danger"
                            link
-                           size="small"
                            @click="deleteAttachment(row, $index)">
                   鍒犻櫎
                 </el-button>
@@ -619,11 +562,13 @@
   import { onMounted, ref, reactive, getCurrentInstance, toRefs } from "vue";
   import { Search, Paperclip, Upload } from "@element-plus/icons-vue";
   import {
-    addCustomer,
-    delCustomer,
+    addCustomerPrivate,
+    delCustomerPrivate,
     getCustomer,
-    listCustomer,
-    updateCustomer,
+    getCustomerPrivatePoolById,
+    getCustomerPrivatePoolInfo,
+    listCustomerPrivatePool,
+    updateCustomerPrivatePool,
     addCustomerFollow,
     updateCustomerFollow,
     delCustomerFollow,
@@ -661,7 +606,7 @@
   const negotiationFormRef = ref();
   const negotiationForm = reactive({
     customerName: "",
-    customerId: "",
+		customerPrivatePoolId: "",
     followUpMethod: "",
     followUpLevel: "",
     followUpTime: "",
@@ -733,7 +678,7 @@
     },
     {
       label: "鍦板潃鍙婅仈绯绘柟寮�",
-      prop: "addressPhone",
+      prop: "companyAddress",
       width: 250,
     },
     {
@@ -746,14 +691,9 @@
       width: 150,
     },
     {
-      label: "璺熻繘杩涘害",
-      prop: "followUpLevel",
-      width: 120,
-    },
-    {
-      label: "璺熻繘鏃堕棿",
-      prop: "followUpTime",
-      width: 120,
+      label: "鑱旂郴浜哄矖浣�",
+      prop: "contactPosition",
+      width: 140,
     },
     {
       label: "閾惰鍩烘湰鎴�",
@@ -775,6 +715,24 @@
       prop: "maintainer",
     },
     {
+      label: "瀹㈡埛鏉ユ簮",
+      prop: "type",
+      dataType: "tag",
+      width: 100,
+      formatData: value => {
+        if (value === 1 || value === "1") {
+          return "鍏捣";
+        }
+        return "绉佹捣";
+      },
+      formatType: value => {
+        if (value === 1 || value === "1") {
+          return "warning";
+        }
+        return "success";
+      },
+    },
+    {
       label: "缁存姢鏃堕棿",
       prop: "maintenanceTime",
       width: 100,
@@ -784,7 +742,7 @@
       label: "鎿嶄綔",
       align: "center",
       fixed: "right",
-      width: 250,
+      width: 220,
       operation: [
         {
           name: "缂栬緫",
@@ -794,24 +752,10 @@
           },
         },
         {
-          name: "璇︽儏",
-          type: "text",
-          clickFun: row => {
-            openDetailDialog(row);
-          },
-        },
-        {
           name: "鍥炶鎻愰啋",
           type: "text",
           clickFun: row => {
             openReminderDialog(row);
-          },
-        },
-        {
-          name: "娣诲姞娲借皥杩涘害",
-          type: "text",
-          clickFun: row => {
-            openNegotiationDialog(row);
           },
         },
       ],
@@ -837,6 +781,7 @@
       {
         contactPerson: "",
         contactPhone: "",
+        contactPosition: "",
       },
     ],
   });
@@ -847,34 +792,17 @@
     },
     form: {
       customerName: "",
-      taxpayerIdentificationNumber: "",
       companyAddress: "",
       companyPhone: "",
       contactPerson: "",
       contactPhone: "",
-      maintainer: "",
-      maintenanceTime: "",
-      basicBankAccount: "",
-      bankAccount: "",
-      bankCode: "",
+      contactPosition: "",
       customerType: "",
     },
     rules: {
       customerName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      taxpayerIdentificationNumber: [
-        { required: true, message: "璇疯緭鍏�", trigger: "blur" },
-      ],
       companyAddress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
       companyPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      // contactPerson: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      // contactPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      maintainer: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }],
-      maintenanceTime: [
-        { required: false, message: "璇烽�夋嫨", trigger: "change" },
-      ],
-      basicBankAccount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      bankAccount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
-      bankCode: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
       customerType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
     },
   });
@@ -888,7 +816,7 @@
     // 璁剧疆涓婁紶鐨勮姹傚ご閮�
     headers: { Authorization: "Bearer " + getToken() },
     // 涓婁紶鐨勫湴鍧�
-    url: import.meta.env.VITE_APP_BASE_API + "/basic/customer/importData",
+    url: import.meta.env.VITE_APP_BASE_API + "/customerPrivate/importData",
     // 鏂囦欢涓婁紶鍓嶇殑鍥炶皟
     beforeUpload: file => {
       console.log("鏂囦欢鍗冲皢涓婁紶", file);
@@ -938,6 +866,7 @@
     formYYs.value.contactList.push({
       contactPerson: "",
       contactPhone: "",
+      contactPosition: "",
     });
   };
 
@@ -959,10 +888,10 @@
   };
   const getList = () => {
     tableLoading.value = true;
-    listCustomer({ ...searchForm.value, ...page }).then(res => {
+    listCustomerPrivatePool({ ...searchForm.value, ...page }).then(res => {
       tableLoading.value = false;
-      tableData.value = res.records;
-      page.total = res.total;
+      tableData.value = res.data.records;
+      page.total = res.data.total;
     });
   };
   // 琛ㄦ牸閫夋嫨鏁版嵁
@@ -981,34 +910,40 @@
   }
   /** 涓嬭浇妯℃澘 */
   function importTemplate() {
-    proxy.download("/basic/customer/downloadTemplate", {}, "瀹㈡埛瀵煎叆妯℃澘.xlsx");
+    proxy.download("/customerPrivate/downloadTemplate", {}, "瀹㈡埛瀵煎叆妯℃澘.xlsx");
   }
   // 鎵撳紑寮规
   const openForm = (type, row) => {
     operationType.value = type;
     form.value = {};
-    form.value.maintainer = userStore.nickName;
     formYYs.value.contactList = [
       {
         contactPerson: "",
         contactPhone: "",
+        contactPosition: "",
       },
     ];
-    form.value.maintenanceTime = getCurrentDate();
     userListNoPage().then(res => {
       userList.value = res.data;
     });
     if (type === "edit") {
-      getCustomer(row.id).then(res => {
+      getCustomerPrivatePoolById(row.id).then(res => {
         form.value = { ...res.data };
-        formYYs.value.contactList = res.data.contactPerson
-          .split(",")
-          .map((item, index) => {
-            return {
-              contactPerson: item,
-              contactPhone: res.data.contactPhone.split(",")[index],
-            };
-          });
+        const persons = String(res.data.contactPerson || "").split(",");
+        const phones = String(res.data.contactPhone || "").split(",");
+        const positions = String(res.data.contactPosition || "").split(",");
+        formYYs.value.contactList = persons
+          .filter(item => item !== "")
+          .map((item, index) => ({
+            contactPerson: item,
+            contactPhone: phones[index] || "",
+            contactPosition: positions[index] || "",
+          }));
+        if (formYYs.value.contactList.length === 0) {
+          formYYs.value.contactList = [
+            { contactPerson: "", contactPhone: "", contactPosition: "" },
+          ];
+        }
       });
     }
     dialogFormVisible.value = true;
@@ -1036,7 +971,10 @@
     form.value.contactPhone = formYYs.value.contactList
       .map(item => item.contactPhone)
       .join(",");
-    addCustomer(form.value).then(res => {
+    form.value.contactPosition = formYYs.value.contactList
+      .map(item => item.contactPosition || "")
+      .join(",");
+    addCustomerPrivate(form.value).then(res => {
       proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
       closeDia();
       getList();
@@ -1050,7 +988,10 @@
     form.value.contactPhone = formYYs.value.contactList
       .map(item => item.contactPhone)
       .join(",");
-    updateCustomer(form.value).then(res => {
+    form.value.contactPosition = formYYs.value.contactList
+      .map(item => item.contactPosition || "")
+      .join(",");
+    updateCustomerPrivatePool(form.value).then(res => {
       proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
       closeDia();
       getList();
@@ -1069,7 +1010,7 @@
       type: "warning",
     })
       .then(() => {
-        proxy.download("/basic/customer/export", {}, "瀹㈡埛妗f.xlsx");
+        proxy.download("/customerPrivate/export", {}, "瀹㈡埛妗f.xlsx");
       })
       .catch(() => {
         proxy.$modal.msg("宸插彇娑�");
@@ -1079,12 +1020,11 @@
   const handleDelete = () => {
     let ids = [];
     if (selectedRows.value.length > 0) {
-      // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
       const unauthorizedData = selectedRows.value.filter(
-        item => item.maintainer !== userStore.nickName
+        item => item.type === 1 || item.type === "1"
       );
       if (unauthorizedData.length > 0) {
-        proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
+        proxy.$modal.msgWarning("鍏捣鍒嗛厤鐨勫鎴蜂笉鑳藉垹闄�");
         return;
       }
       ids = selectedRows.value.map(item => item.id);
@@ -1099,8 +1039,8 @@
     })
       .then(() => {
         tableLoading.value = true;
-        delCustomer(ids)
-          .then(res => {
+        delCustomerPrivate(ids)
+          .then(() => {
             proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
             getList();
           })
@@ -1153,7 +1093,8 @@
         if (reminderForm.id) {
           submitvalue.value = {
             id: reminderForm.id,
-            customerId: currentCustomerId.value,
+						customerPrivatePoolId: reminderForm.id,
+						customerPrivatePoolId: currentCustomerId.value,
             isEnabled: reminderForm.reminderSwitch ? 1 : 0,
             content: reminderForm.reminderContent,
             reminderTime: reminderForm.reminderTime,
@@ -1161,15 +1102,13 @@
           };
         } else {
           submitvalue.value = {
-            customerId: currentCustomerId.value,
+						customerPrivatePoolId: currentCustomerId.value,
             isEnabled: reminderForm.reminderSwitch ? 1 : 0,
             content: reminderForm.reminderContent,
             reminderTime: reminderForm.reminderTime,
             remindUserId: userStore.id,
           };
         }
-
-        console.log("鎻愪氦鍥炶鎻愰啋鏁版嵁:", submitvalue.value);
 
         // 璋冪敤鎺ュ彛
         addReturnVisit(submitvalue.value)
@@ -1192,20 +1131,12 @@
   // 鎵撳紑娲借皥杩涘害寮圭獥
   const openNegotiationDialog = row => {
     negotiationForm.customerName = row.customerName;
-    negotiationForm.customerId = row.id;
+    negotiationForm.customerPrivatePoolId = row.id;
     negotiationForm.followUpMethod = "";
     negotiationForm.followUpLevel = "";
     negotiationForm.followUpTime = "";
     negotiationForm.followerUserName = userStore.nickName; // 榛樿褰撳墠鐧诲綍浜�
     negotiationForm.content = "";
-    // {
-    // 	"customerId": 152,
-    // 	"followUpMethod": "鐢佃瘽娌熼��",
-    // 	"followUpLevel": "娌℃湁鎰忓悜",
-    // 	"followUpTime": "2026-03-04T15:30:00",
-    // 	"followerUserName": "绠$悊鍛樿处鍙�",
-    // 	"content": "111"
-    // }
     negotiationDialogVisible.value = true;
   };
 
@@ -1227,26 +1158,9 @@
 
         if (isEdit) {
           // 淇敼鎿嶄綔
-          console.log("淇敼娲借皥杩涘害鏁版嵁:", negotiationForm);
-          // 杩欓噷鍙互璋冪敤鏇存柊鎺ュ彛
-          // 瀹為檯椤圭洰涓渶瑕佹牴鎹悗绔帴鍙h繘琛岃皟鏁�
-          // 绀轰緥锛歶pdateCustomerFollow(negotiationForm).then(res => {
-          //   // 鏇存柊鏈湴鏁版嵁
-          //   const index = negotiationForm.editIndex;
-          //   negotiationRecords.value[index] = {
-          //     followUpTime: negotiationForm.followUpTime,
-          //     followUpMethod: negotiationForm.followUpMethod,
-          //     followUpLevel: negotiationForm.followUpLevel,
-          //     followerUserName: negotiationForm.followerUserName,
-          //     content: negotiationForm.content,
-          //     id: negotiationForm.id,
-          //   };
-          //   proxy.$modal.msgSuccess("淇敼鎴愬姛");
-          //   closeNegotiationDialog();
-          // });
           updateCustomerFollow(negotiationForm).then(res => {
             // 鏇存柊鏈湴鏁版嵁
-            getCustomer(negotiationForm.customerId).then(res => {
+            getCustomer(negotiationForm.customerPrivatePoolId).then(res => {
               // 鏇存柊鏈湴鏁版嵁
               negotiationRecords.value = res.data.followUpList || [];
             });
@@ -1278,8 +1192,7 @@
 
   // 鎵撳紑璇︽儏寮圭獥
   const openDetailDialog = row => {
-    // 璋冪敤getCustomer鎺ュ彛鑾峰彇瀹㈡埛璇︽儏
-    getCustomer(row.id).then(res => {
+    getCustomerPrivatePoolInfo(row.id).then(res => {
       // 濉厖瀹㈡埛鍩烘湰淇℃伅
       Object.assign(detailForm, res.data);
 
@@ -1300,7 +1213,7 @@
     // 灏嗗綋鍓嶈褰曟暟鎹~鍏呭埌琛ㄥ崟
     Object.assign(negotiationForm, {
       customerName: row.customerName,
-      customerId: row.customerId,
+			customerPrivatePoolId: row.customerPrivatePoolId,
       followUpMethod: row.followUpMethod,
       followUpLevel: row.followUpLevel,
       followUpTime: row.followUpTime,
@@ -1328,7 +1241,7 @@
         // });
         delCustomerFollow(row.id).then(() => {
           // 鍒犻櫎鎴愬姛鍚庢洿鏂版湰鍦版暟鎹�
-          getCustomer(row.customerId).then(res => {
+          getCustomer(row.customerPrivatePoolId).then(res => {
             // 鏇存柊鏈湴鏁版嵁
             negotiationRecords.value = res.data.followUpList || [];
           });

--
Gitblit v1.9.3