From 4ee043bf011b020858eefa66fc4269f092a142f2 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 七月 2025 10:10:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/basicData/customerFile/index.vue | 62 ++++++++++++++++++++++++------
src/views/basicData/product/ImportExcel/index.vue | 1
src/views/inventoryManagement/dispatchLog/index.vue | 4 +-
3 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index 89330c6..f0c1186 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -92,26 +92,25 @@
</el-form-item>
</el-col>
</el-row>
- <el-row :gutter="30">
+ <el-row :gutter="30" v-for="(contact, index) in formYYs.contactList" :key="index">
<el-col :span="12">
<el-form-item label="鑱旂郴浜猴細" prop="contactPerson">
- <el-input
- v-model="form.contactPerson"
- placeholder="璇疯緭鍏�"
- clearable
- />
+ <el-input v-model="contact.contactPerson" placeholder="璇疯緭鍏�" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鑱旂郴鐢佃瘽锛�" prop="contactPhone">
- <el-input
- v-model="form.contactPhone"
- placeholder="璇疯緭鍏�"
- clearable
- />
+ <div style="display: flex; align-items: center;width: 100%;">
+ <el-input v-model="contact.contactPhone" placeholder="璇疯緭鍏�" clearable />
+ <el-button @click="removeContact(index)" type="danger" circle style="margin-left: 5px;">
+ <el-icon><Close /></el-icon>
+ </el-button>
+ </div>
</el-form-item>
</el-col>
</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="basicBankAccount">
@@ -318,6 +317,14 @@
// 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
const operationType = ref("");
const dialogFormVisible = ref(false);
+const formYYs = ref({ // 鍏朵粬瀛楁...
+ contactList: [
+ {
+ contactPerson: "",
+ contactPhone: ""
+ }
+ ]
+});
const data = reactive({
searchForm: {
customerName: "",
@@ -342,8 +349,8 @@
],
companyAddress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
companyPhone: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- contactPerson: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- contactPhone: [{ 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" },
@@ -366,7 +373,18 @@
url: import.meta.env.VITE_APP_BASE_API + "/basic/customer/importData",
});
const { searchForm, form, rules } = toRefs(data);
+const addNewContact = () => {
+ formYYs.value.contactList.push({
+ contactPerson: "",
+ contactPhone: ""
+ });
+};
+const removeContact = (index) => {
+ if (formYYs.value.contactList.length > 1) {
+ formYYs.value.contactList.splice(index, 1);
+ }
+};
// 鏌ヨ鍒楄〃
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -404,6 +422,12 @@
operationType.value = type;
form.value = {};
form.value.maintainer = userStore.nickName;
+ formYYs.value.contactList = [
+ {
+ contactPerson: "",
+ contactPhone: ""
+ }
+ ];
form.value.maintenanceTime = getCurrentDate();
userListNoPage().then((res) => {
userList.value = res.data;
@@ -411,6 +435,13 @@
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]
+ }
+ });
+
});
}
dialogFormVisible.value = true;
@@ -429,6 +460,11 @@
};
// 鎻愪氦鏂板
const submitAdd = () => {
+ if(formYYs.value.contactList.length < 1){
+ return proxy.$modal.msgWarning("璇疯嚦灏戞坊鍔犱竴涓仈绯讳汉");
+ }
+ form.value.contactPerson = formYYs.value.contactList.map(item => item.contactPerson).join(",");
+ form.value.contactPhone = formYYs.value.contactList.map(item => item.contactPhone).join(",");
addCustomer(form.value).then((res) => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
diff --git a/src/views/basicData/product/ImportExcel/index.vue b/src/views/basicData/product/ImportExcel/index.vue
index f1d6213..c25d254 100644
--- a/src/views/basicData/product/ImportExcel/index.vue
+++ b/src/views/basicData/product/ImportExcel/index.vue
@@ -9,6 +9,7 @@
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:disabled="upload.isUploading"
+ :showTip="false"
@success="handleFileSuccess"
/>
<template #footer>
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 115112f..e523430 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -39,13 +39,13 @@
<el-table-column
label="鍑哄簱鏃ユ湡"
prop="createTime"
- width="160"
+ min-width="250"
show-overflow-tooltip
/>
<el-table-column
label="渚涘簲鍟嗗悕绉�"
prop="supplierName"
- width="160"
+ width="250"
show-overflow-tooltip
/>
<el-table-column
--
Gitblit v1.9.3