From 845b15a472449bc8f2632ea80f339da15c3b6356 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 08 四月 2026 10:54:27 +0800
Subject: [PATCH] fix: 不在销售台账处出库。在发货台账处导入excel，匹配客户进行出库。销售台账处的产品列表需要展示已发货/未发货数量。
---
src/views/basicData/customerFile/index.vue | 60 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/src/views/basicData/customerFile/index.vue b/src/views/basicData/customerFile/index.vue
index ad1c5bb..25ccc14 100644
--- a/src/views/basicData/customerFile/index.vue
+++ b/src/views/basicData/customerFile/index.vue
@@ -15,10 +15,10 @@
style="width: 240px"
clearable
@change="handleQuery">
- <el-option label="闆跺敭瀹㈡埛"
- value="闆跺敭瀹㈡埛" />
- <el-option label="杩涢攢鍟嗗鎴�"
- value="杩涢攢鍟嗗鎴�" />
+ <el-option label="瀵瑰叕"
+ value="1" />
+ <el-option label="瀵圭"
+ value="2" />
</el-select>
<el-button type="primary"
@click="handleQuery"
@@ -125,10 +125,10 @@
<el-select v-model="form.customerType"
placeholder="璇烽�夋嫨"
clearable>
- <el-option label="闆跺敭瀹㈡埛"
- value="闆跺敭瀹㈡埛" />
- <el-option label="杩涢攢鍟嗗鎴�"
- value="杩涢攢鍟嗗鎴�" />
+ <el-option label="瀵瑰叕"
+ :value="1" />
+ <el-option label="瀵圭"
+ :value="2" />
</el-select>
</el-form-item>
</el-col>
@@ -276,9 +276,9 @@
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button @click="closeReminderDialog">鍙栨秷</el-button>
<el-button type="primary"
- @click="submitReminderForm">鎻愪氦</el-button>
+ @click="submitReminderForm">纭</el-button>
+ <el-button @click="closeReminderDialog">鍙栨秷</el-button>
</div>
</template>
</el-dialog>
@@ -360,9 +360,9 @@
</el-form>
<template #footer>
<div class="dialog-footer">
- <el-button @click="closeNegotiationDialog">鍙栨秷</el-button>
<el-button type="primary"
- @click="submitNegotiationForm">鎻愪氦</el-button>
+ @click="submitNegotiationForm">纭</el-button>
+ <el-button @click="closeNegotiationDialog">鍙栨秷</el-button>
</div>
</template>
</el-dialog>
@@ -385,7 +385,7 @@
<el-col :span="12">
<div class="info-item">
<span class="info-label">瀹㈡埛鍒嗙被锛�</span>
- <span class="info-value">{{ detailForm.customerType }}</span>
+ <span class="info-value">{{ detailForm.customerType==1?"瀵瑰叕":"瀵圭" }}</span>
</div>
</el-col>
</el-row>
@@ -494,7 +494,6 @@
<template #default="{ row }">
<el-button type="info"
link
- size="small"
@click="openAttachmentDialog(row)">
<el-icon>
<Paperclip />
@@ -510,13 +509,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>
@@ -587,13 +584,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>
@@ -720,6 +715,9 @@
label: "瀹㈡埛鍒嗙被",
prop: "customerType",
width: 120,
+ formatData: params => {
+ return params == 1 ? "瀵瑰叕" : "瀵圭";
+ },
},
{
label: "瀹㈡埛鍚嶇О",
@@ -784,7 +782,7 @@
label: "鎿嶄綔",
align: "center",
fixed: "right",
- width: 250,
+ width: 290,
operation: [
{
name: "缂栬緫",
@@ -794,10 +792,10 @@
},
},
{
- name: "璇︽儏",
+ name: "娣诲姞娲借皥杩涘害",
type: "text",
clickFun: row => {
- openDetailDialog(row);
+ openNegotiationDialog(row);
},
},
{
@@ -808,10 +806,10 @@
},
},
{
- name: "娣诲姞娲借皥杩涘害",
+ name: "璇︽儏",
type: "text",
clickFun: row => {
- openNegotiationDialog(row);
+ openDetailDialog(row);
},
},
],
@@ -861,20 +859,20 @@
},
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" }],
+ // 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" }],
+ // basicBankAccount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ // bankAccount: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ // bankCode: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
customerType: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
--
Gitblit v1.9.3