From a2c33664f683aee11fdc62391c8d1e21cc74f5b2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 21 五月 2026 17:24:49 +0800
Subject: [PATCH] 天津宝东 1.修改展示字段
---
src/views/basicData/customerFile/index.vue | 343 ++++++++++++++++++++++----------------------------------
1 files changed, 136 insertions(+), 207 deletions(-)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index ad1c5bb..f997a51 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <div class="search_form">
+ <div class="search_form" style="margin-bottom: 20px;">
<div>
<span class="search_title">瀹㈡埛鍚嶇О锛�</span>
<el-input v-model="searchForm.customerName"
@@ -19,6 +19,8 @@
value="闆跺敭瀹㈡埛" />
<el-option label="杩涢攢鍟嗗鎴�"
value="杩涢攢鍟嗗鎴�" />
+ <el-option label="杩為攣搴�"
+ value="杩為攣搴�" />
</el-select>
<el-button type="primary"
@click="handleQuery"
@@ -27,6 +29,9 @@
<div>
<el-button type="primary"
@click="openForm('add')">鏂板瀹㈡埛</el-button>
+ <el-button type="primary"
+ plain
+ @click="back">娴佸叆鍏捣</el-button>
<el-button @click="handleOut">瀵煎嚭</el-button>
<el-button type="info"
plain
@@ -66,11 +71,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 +104,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 +115,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 +144,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">
@@ -211,7 +162,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"
@@ -276,15 +228,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 +312,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 +445,6 @@
<template #default="{ row }">
<el-button type="info"
link
- size="small"
@click="openAttachmentDialog(row)">
<el-icon>
<Paperclip />
@@ -510,13 +460,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 +485,7 @@
<!-- 闄勪欢涓婁紶寮圭獥 -->
<el-dialog title="闄勪欢绠＄悊"
v-model="attachmentDialogVisible"
+ v-if="false"
width="600px"
@close="closeAttachmentDialog">
<div class="attachment-section">
@@ -587,13 +536,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,17 +566,13 @@
import { onMounted, ref, reactive, getCurrentInstance, toRefs } from "vue";
import { Search, Paperclip, Upload } from "@element-plus/icons-vue";
import {
- addCustomer,
- delCustomer,
- getCustomer,
- listCustomer,
- updateCustomer,
addCustomerFollow,
updateCustomerFollow,
delCustomerFollow,
addReturnVisit,
getReturnVisit,
} from "@/api/basicData/customerFile.js";
+ import {listCustomer, getCustomer, addCustomer, updateCustomer, delCustomer, backCustomer} from "@/api/basicData/customer.js";
import { ElMessageBox } from "element-plus";
import { userListNoPage } from "@/api/system/user.js";
import useUserStore from "@/store/modules/user";
@@ -661,7 +604,7 @@
const negotiationFormRef = ref();
const negotiationForm = reactive({
customerName: "",
- customerId: "",
+ customerId: "",
followUpMethod: "",
followUpLevel: "",
followUpTime: "",
@@ -727,13 +670,8 @@
width: 220,
},
{
- label: "绾崇◣浜鸿瘑鍒爜",
- prop: "taxpayerIdentificationNumber",
- width: 220,
- },
- {
label: "鍦板潃鍙婅仈绯绘柟寮�",
- prop: "addressPhone",
+ prop: "companyAddress",
width: 250,
},
{
@@ -746,33 +684,31 @@
width: 150,
},
{
- label: "璺熻繘杩涘害",
- prop: "followUpLevel",
- width: 120,
- },
- {
- label: "璺熻繘鏃堕棿",
- prop: "followUpTime",
- width: 120,
- },
- {
- label: "閾惰鍩烘湰鎴�",
- prop: "basicBankAccount",
- width: 220,
- },
- {
- label: "閾惰璐﹀彿",
- prop: "bankAccount",
- width: 220,
- },
- {
- label: "寮�鎴疯鍙�",
- prop: "bankCode",
- width: 220,
+ label: "鑱旂郴浜哄矖浣�",
+ prop: "contactPosition",
+ width: 140,
},
{
label: "缁存姢浜�",
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: "缁存姢鏃堕棿",
@@ -784,7 +720,7 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 250,
+ width: 220,
operation: [
{
name: "缂栬緫",
@@ -794,24 +730,10 @@
},
},
{
- name: "璇︽儏",
- type: "text",
- clickFun: row => {
- openDetailDialog(row);
- },
- },
- {
name: "鍥炶鎻愰啋",
type: "text",
clickFun: row => {
openReminderDialog(row);
- },
- },
- {
- name: "娣诲姞娲借皥杩涘害",
- type: "text",
- clickFun: row => {
- openNegotiationDialog(row);
},
},
],
@@ -837,6 +759,7 @@
{
contactPerson: "",
contactPhone: "",
+ contactPosition: "",
},
],
});
@@ -844,37 +767,22 @@
searchForm: {
customerName: "",
customerType: "",
+ type: 0
},
form: {
customerName: "",
- taxpayerIdentificationNumber: "",
companyAddress: "",
companyPhone: "",
contactPerson: "",
contactPhone: "",
- maintainer: "",
- maintenanceTime: "",
- basicBankAccount: "",
- bankAccount: "",
- bankCode: "",
+ contactPosition: "",
customerType: "",
+ type: 0
},
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" }],
},
});
@@ -889,6 +797,9 @@
headers: { Authorization: "Bearer " + getToken() },
// 涓婁紶鐨勫湴鍧�
url: import.meta.env.VITE_APP_BASE_API + "/basic/customer/importData",
+ data: {
+ type: 0
+ },
// 鏂囦欢涓婁紶鍓嶇殑鍥炶皟
beforeUpload: file => {
console.log("鏂囦欢鍗冲皢涓婁紶", file);
@@ -938,6 +849,7 @@
formYYs.value.contactList.push({
contactPerson: "",
contactPhone: "",
+ contactPosition: "",
});
};
@@ -961,8 +873,8 @@
tableLoading.value = true;
listCustomer({ ...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;
});
};
// 琛ㄦ牸閫夋嫨鏁版嵁
@@ -987,13 +899,14 @@
const openForm = (type, row) => {
operationType.value = type;
form.value = {};
- form.value.maintainer = userStore.nickName;
formYYs.value.contactList = [
{
contactPerson: "",
contactPhone: "",
+ contactPosition: "",
},
];
+ form.value.type = 0;
form.value.maintenanceTime = getCurrentDate();
userListNoPage().then(res => {
userList.value = res.data;
@@ -1001,14 +914,21 @@
if (type === "edit") {
getCustomer(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;
@@ -1037,9 +957,14 @@
.map(item => item.contactPhone)
.join(",");
addCustomer(form.value).then(res => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- getList();
+ form.value.contactPosition = formYYs.value.contactList
+ .map(item => item.contactPosition || "")
+ .join(",");
+ addCustomerPrivate(form.value).then(res => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ getList();
+ });
});
};
// 鎻愪氦淇敼
@@ -1049,6 +974,9 @@
.join(",");
form.value.contactPhone = formYYs.value.contactList
.map(item => item.contactPhone)
+ .join(",");
+ form.value.contactPosition = formYYs.value.contactList
+ .map(item => item.contactPosition || "")
.join(",");
updateCustomer(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
@@ -1069,7 +997,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/basic/customer/export", {}, "瀹㈡埛妗ｆ.xlsx");
+ proxy.download("/basic/customer/export", {type: 0}, "瀹㈡埛妗ｆ.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
@@ -1079,12 +1007,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);
@@ -1100,7 +1027,7 @@
.then(() => {
tableLoading.value = true;
delCustomer(ids)
- .then(res => {
+ .then(() => {
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
getList();
})
@@ -1110,6 +1037,36 @@
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
+ });
+ };
+
+ const back = () => {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
+ return;
+ }
+ const ids = selectedRows.value.map(item => item.id);
+ ElMessageBox.confirm("閫変腑鐨勫鎴峰皢娴佸叆鍏捣锛屾槸鍚︾‘璁わ紵", "娴佸叆鍏捣鎻愮ず", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ tableLoading.value = true;
+ return Promise.all(ids.map(id => backCustomer(id)))
+ .then(() => {
+ proxy.$modal.msgSuccess("娴佸叆鍏捣鎴愬姛");
+ selectedRows.value = [];
+ getList();
+ })
+ .finally(() => {
+ tableLoading.value = false;
+ });
+ })
+ .catch(error => {
+ if (error === "cancel" || error === "close") {
+ proxy.$modal.msg("宸插彇娑�");
+ }
});
};
@@ -1153,7 +1110,7 @@
if (reminderForm.id) {
submitvalue.value = {
id: reminderForm.id,
- customerId: currentCustomerId.value,
+ customerId: currentCustomerId.value,
isEnabled: reminderForm.reminderSwitch ? 1 : 0,
content: reminderForm.reminderContent,
reminderTime: reminderForm.reminderTime,
@@ -1168,8 +1125,6 @@
remindUserId: userStore.id,
};
}
-
- console.log("鎻愪氦鍥炶鎻愰啋鏁版嵁:", submitvalue.value);
// 璋冪敤鎺ュ彛
addReturnVisit(submitvalue.value)
@@ -1198,14 +1153,6 @@
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,23 +1174,6 @@
if (isEdit) {
// 淇敼鎿嶄綔
- console.log("淇敼娲借皥杩涘害鏁版嵁:", negotiationForm);
- // 杩欓噷鍙互璋冪敤鏇存柊鎺ュ彛
- // 瀹為檯椤圭洰涓渶瑕佹牴鎹悗绔帴鍙ｈ繘琛岃皟鏁�
- // 绀轰緥锛歶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 => {
@@ -1278,7 +1208,6 @@
// 鎵撳紑璇︽儏寮圭獥
const openDetailDialog = row => {
- // 璋冪敤getCustomer鎺ュ彛鑾峰彇瀹㈡埛璇︽儏
getCustomer(row.id).then(res => {
// 濉厖瀹㈡埛鍩烘湰淇℃伅
Object.assign(detailForm, res.data);
@@ -1300,7 +1229,7 @@
// 灏嗗綋鍓嶈褰曟暟鎹～鍏呭埌琛ㄥ崟
Object.assign(negotiationForm, {
customerName: row.customerName,
- customerId: row.customerId,
+ customerId: row.customerId,
followUpMethod: row.followUpMethod,
followUpLevel: row.followUpLevel,
followUpTime: row.followUpTime,
@@ -1428,7 +1357,7 @@
const downloadAttachment = row => {
if (row.url) {
// proxy.download(row.url, {}, row.name);
- proxy.$download.name(row.url);
+ proxy.$download.byUrl(row.url, row.originalFilename);
} else {
proxy.$modal.msgError("涓嬭浇閾炬帴涓嶅瓨鍦�");
}
--
Gitblit v1.9.3