From 9f396e3cc7f18fb626931d01190ecac6235e4790 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 24 三月 2026 09:32:49 +0800
Subject: [PATCH] 新疆海川开心 1.回款登记、付款登记要能批量操作
---
src/views/salesManagement/receiptPayment/index.vue | 248 ++++++++++++--------------
src/views/procurementManagement/paymentEntry/index.vue | 278 +++++++++++++-----------------
2 files changed, 234 insertions(+), 292 deletions(-)
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index eae3cae..5b0682b 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -144,9 +144,67 @@
v-model="dialogFormVisible"
draggable
:title="operationType === 'add' ? '鏂板浠樻鐧昏' : '缂栬緫浠樻鐧昏'"
- width="60%"
+ width="90%"
@close="closeDia"
>
+ <el-alert
+ v-if="selectedRows.length > 1"
+ :title="`宸查�夋嫨 ${selectedRows.length} 鏉″悎鍚岋紙渚涘簲鍟嗭細${selectedRows[0]?.supplierName}锛塦"
+ type="info"
+ :closable="false"
+ style="margin-bottom: 15px;"
+ />
+ <el-table
+ :data="form.paymentList"
+ border
+ style="margin-top: 20px;"
+ >
+ <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="200" />
+ <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="200" />
+ <el-table-column label="鍙戠エ鍙�" prop="invoiceNumber" width="180" />
+ <el-table-column label="鍙戠エ閲戦(鍏�)" prop="invoiceAmount" width="150" />
+ <el-table-column label="寰呬粯娆鹃噾棰�(鍏�)" prop="unPaymentAmountTotal" width="150" />
+ <el-table-column label="鏈浠樻閲戦(鍏�)" width="180">
+ <template #default="scope">
+ <el-input-number
+ :step="0.01"
+ :min="0"
+ :max="scope.row.unPaymentAmountTotal"
+ style="width: 100%"
+ :precision="3"
+ v-model="scope.row.currentPaymentAmount"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="浠樻鏂瑰紡" width="150">
+ <template #default="scope">
+ <el-select
+ v-model="scope.row.paymentMethod"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option label="鐢垫眹" value="鐢垫眹" />
+ <el-option label="鎵垮厬" value="鎵垮厬" />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="浠樻鏃ユ湡" width="180">
+ <template #default="scope">
+ <el-date-picker
+ style="width: 100%"
+ v-model="scope.row.paymentDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨"
+ clearable
+ />
+ </template>
+ </el-table-column>
+ </el-table>
<el-form
:model="form"
label-width="140px"
@@ -156,111 +214,9 @@
>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="閲囪喘鍚堝悓鍙凤細" prop="purchaseContractNumber">
+ <el-form-item label="鐧昏浜猴細" prop="registrant">
<el-input
- v-model="form.purchaseContractNumber"
- placeholder="鑷姩濉厖"
- clearable
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
- <el-input
- v-model="form.salesContractNo"
- placeholder="鑷姩濉厖"
- clearable
- disabled
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
- <el-input
- v-model="form.supplierName"
- placeholder="鑷姩濉厖"
- clearable
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍙戠エ鍙凤細" prop="invoiceNumber">
- <el-input
- v-model="form.invoiceNumber"
- placeholder="鑷姩濉厖"
- clearable
- disabled
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceAmount">
- <el-input
- v-model="form.invoiceAmount"
- placeholder="鑷姩濉厖"
- clearable
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏈浠樻閲戦锛�" prop="currentPaymentAmount">
- <el-input-number :step="0.01" :min="0" style="width: 100%"
- :precision="3"
- v-model="form.currentPaymentAmount"
- placeholder="璇疯緭鍏�"
- clearable
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="浠樻鏂瑰紡锛�" prop="paymentMethod">
- <el-select
- v-model="form.paymentMethod"
- placeholder="璇烽�夋嫨"
- clearable
- >
- <el-option label="鐢垫眹" value="鐢垫眹" />
- <el-option label="鎵垮厬" value="鎵垮厬" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浠樻鏃ユ湡锛�" prop="paymentDate">
- <el-date-picker
- style="width: 100%"
- v-model="form.paymentDate"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- type="date"
- placeholder="璇烽�夋嫨"
- clearable
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鐧昏浜猴細" prop="registrant">
- <el-input
- v-model="form.registrant"
- placeholder="璇疯緭鍏�"
- clearable
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐧昏鏃ユ湡锛�" prop="registrationtDate">
- <el-input
- v-model="form.registrationtDate"
+ v-model="form.registrant"
placeholder="璇疯緭鍏�"
clearable
/>
@@ -382,34 +338,14 @@
const data = reactive({
searchForm: {
supplierNameOrContractNo: "",
- status: false,
+ status: true,
},
form: {
- purchaseContractNumber: "",
- purchaseLedgerId: "",
- salesContractNo: "",
- supplierName: "",
- invoiceNumber: "",
- invoiceAmount: "",
- taxRate: "",
- currentPaymentAmount: "",
- paymentMethod: "",
registrant: "",
- registrantId: "",
- paymentDate: "",
- registrationtDate: "",
+ paymentList: [],
},
rules: {
- purchaseLedgerId: [
- { required: true, message: "璇烽�夋嫨", trigger: "change" },
- ],
- currentPaymentAmount: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
- ],
- paymentMethod: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- invoiceNumber: [
- { required: true, message: "璇烽�夋嫨閲囪喘鍚堝悓鍙�", trigger: "change" },
- ],
+ registrant: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
const { form, rules } = toRefs(data);
@@ -515,51 +451,73 @@
};
// 鎵撳紑寮规
const openForm = (type, row) => {
- if (selectedRows.value.length !== 1) {
- proxy.$message.error("璇烽�夋嫨涓�鏉″彂绁ㄦ暟鎹�");
+ if (selectedRows.value.length < 1) {
+ proxy.$message.error("璇疯嚦灏戦�夋嫨涓�鏉″彂绁ㄦ暟鎹�");
return;
}
- if (selectedRows.value[0].unPaymentAmountTotal == 0) {
- proxy.$message.warning("鏃犻渶鍐嶄粯娆�");
- return;
- }
+ const firstRow = selectedRows.value[0];
+ const isSameSupplier = selectedRows.value.every(row => row.supplierName === firstRow.supplierName);
+ if (!isSameSupplier) {
+ proxy.$message.error("璇烽�夋嫨鐩稿悓渚涘簲鍟嗗悕绉扮殑鍚堝悓");
+ return;
+ }
+ const hasZeroAmount = selectedRows.value.some(row => row.unPaymentAmountTotal == 0);
+ if (hasZeroAmount) {
+ proxy.$message.warning("鎵�閫夋暟鎹腑瀛樺湪鏃犻渶鍐嶄粯娆剧殑璁板綍");
+ return;
+ }
operationType.value = type;
form.value = {};
- form.value = { ...selectedRows.value[0] };
- form.value.ticketRegistrationId = selectedRows.value[0].id;
- form.value.id = null;
- // 鏌ヨ閲囪喘鍚堝悓鍙�
- form.value.registrationtDate = getCurrentDate();
- form.value.paymentDate = getCurrentDate();
form.value.registrant = userStore.name;
+ form.value.paymentList = selectedRows.value.map(row => ({
+ ticketRegistrationId: row.id,
+ purchaseLedgerId: row.purchaseLedgerId,
+ purchaseContractNumber: row.purchaseContractNumber,
+ supplierName: row.supplierName,
+ invoiceNumber: row.invoiceNumber,
+ invoiceAmount: row.invoiceAmount,
+ unPaymentAmountTotal: row.unPaymentAmountTotal,
+ currentPaymentAmount: row.unPaymentAmountTotal,
+ paymentMethod: "",
+ paymentDate: new Date().toISOString().split('T')[0],
+ }));
dialogFormVisible.value = true;
};
// 鎻愪氦琛ㄥ崟
const submitForm = () => {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
- if (operationType.value === "edit") {
- submitEdit();
- } else {
- submitAdd();
+ const submitList = form.value.paymentList.map(item => ({
+ purchaseLedgerId: item.purchaseLedgerId,
+ ticketRegistrationId: item.ticketRegistrationId,
+ purchaseContractNumber: item.purchaseContractNumber,
+ supplierName: item.supplierName,
+ invoiceNumber: item.invoiceNumber,
+ invoiceAmount: item.invoiceAmount,
+ unPaymentAmountTotal: item.unPaymentAmountTotal,
+ currentPaymentAmount: item.currentPaymentAmount,
+ paymentMethod: item.paymentMethod,
+ paymentDate: item.paymentDate,
+ registrant: form.value.registrant,
+ }));
+
+ const invalidItems = submitList.filter(item =>
+ !item.currentPaymentAmount ||
+ !item.paymentMethod ||
+ !item.paymentDate
+ );
+
+ if (invalidItems.length > 0) {
+ proxy.$message.error("璇峰畬鍠勬瘡鏉″悎鍚岀殑浠樻淇℃伅");
+ return;
}
+
+ paymentRegistrationAdd(submitList).then((res) => {
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ closeDia();
+ getList();
+ });
}
- });
-};
-// 鎻愪氦鏂板
-const submitAdd = () => {
- paymentRegistrationAdd(form.value).then((res) => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- getList();
- });
-};
-// 鎻愪氦淇敼
-const submitEdit = () => {
- paymentRegistrationEdit(form.value).then((res) => {
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- closeDia();
- getList();
});
};
// 鍏抽棴寮规
diff --git a/src/views/salesManagement/receiptPayment/index.vue b/src/views/salesManagement/receiptPayment/index.vue
index 3aae1c0..80441b0 100644
--- a/src/views/salesManagement/receiptPayment/index.vue
+++ b/src/views/salesManagement/receiptPayment/index.vue
@@ -202,9 +202,71 @@
v-model="dialogFormVisible"
draggable
title="鏂板鍥炴椤甸潰"
- width="70%"
+ width="90%"
@close="closeDia"
>
+ <el-alert
+ v-if="selectedRows.length > 1"
+ :title="`宸查�夋嫨 ${selectedRows.length} 鏉″悎鍚岋紙瀹㈡埛锛�${selectedRows[0]?.customerName}锛塦"
+ type="info"
+ :closable="false"
+ style="margin-bottom: 15px;"
+ />
+ <el-table
+ :data="form.paymentList"
+ border
+ style="margin-top: 20px;"
+ >
+ <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="200" />
+ <el-table-column label="瀹㈡埛鍚嶇О" prop="customerName" width="200" />
+ <el-table-column label="鍙戠エ鍙�" prop="invoiceNo" width="180" />
+ <el-table-column label="鍙戠エ閲戦(鍏�)" prop="invoiceTotal" width="150" />
+ <el-table-column label="寰呭洖娆鹃噾棰�(鍏�)" prop="noReceiptAmount" width="150" />
+ <el-table-column label="鏈鍥炴閲戦(鍏�)">
+ <template #default="scope">
+ <el-input-number
+ :step="0.01"
+ :min="0"
+ :max="scope.row.noReceiptAmount"
+ style="width: 100%"
+ :precision="2"
+ v-model="scope.row.receiptPaymentAmount"
+ placeholder="璇疯緭鍏�"
+ clearable
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="鍥炴鏂瑰紡" width="150">
+ <template #default="scope">
+ <el-select
+ v-model="scope.row.receiptPaymentType"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in receipt_payment_type"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍥炴鏃ユ湡" width="180">
+ <template #default="scope">
+ <el-date-picker
+ style="width: 100%"
+ v-model="scope.row.receiptPaymentDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨"
+ clearable
+ />
+ </template>
+ </el-table-column>
+ </el-table>
<el-form
:model="form"
label-width="140px"
@@ -214,110 +276,14 @@
>
<el-row :gutter="30">
<el-col :span="12">
- <el-form-item label="閿�鍞悎鍚屽彿锛�" prop="salesContractNo">
+ <el-form-item label="鐧昏浜猴細" prop="registrant">
<el-input
- v-model="form.salesContractNo"
- placeholder="鑷姩濉厖"
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О锛�" prop="customerName">
- <el-input
- v-model="form.customerName"
- placeholder="鑷姩濉厖"
- disabled
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍙戠エ鍙凤細" prop="invoiceNo">
- <el-input
- v-model="form.invoiceNo"
- placeholder="鑷姩濉厖"
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceTotal">
- <el-input
- type="number"
- v-model="form.invoiceTotal"
- placeholder="鑷姩濉厖"
- :step="0.01"
- disabled
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="绋庣巼锛�" prop="taxRate">
- <el-input
- type="number"
- v-model="form.taxRate"
- placeholder="鑷姩濉厖"
- :step="0.01"
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏈鍥炴閲戦锛�" prop="receiptPaymentAmount">
- <el-input-number :step="0.01" :min="0" style="width: 100%"
- :precision="2"
- v-model="form.receiptPaymentAmount"
+ v-model="form.registrant"
placeholder="璇疯緭鍏�"
clearable
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鍥炴褰㈠紡锛�" prop="receiptPaymentType">
- <el-select
- v-model="form.receiptPaymentType"
- placeholder="璇烽�夋嫨"
- clearable
- >
- <el-option
- v-for="item in receipt_payment_type"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍥炴鏃ユ湡锛�" prop="receiptPaymentDate">
- <el-date-picker
- style="width: 100%"
- v-model="form.receiptPaymentDate"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- type="date"
- placeholder="璇烽�夋嫨"
- clearable
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <el-form-item label="鐧昏浜猴細" prop="registrant">
- <el-input
- v-model="form.registrant"
- placeholder="璇疯緭鍏�"
- clearable
- />
- </el-form-item>
- </el-col>
</el-row>
</el-form>
<template #footer>
@@ -367,32 +333,11 @@
projectName: "",
},
form: {
- salesContractNo: "",
- customerName: "",
- invoiceNo: "",
- invoiceTotal: "",
- taxRate: "",
- receiptPaymentAmount: "",
- receiptPaymentType: "",
registrant: "",
- receiptPaymentDate: "",
+ paymentList: [],
},
rules: {
- salesContractNo: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- customerName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- invoiceNo: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- invoiceTotal: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- taxRate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- receiptPaymentAmount: [
- { required: true, message: "璇烽�夋嫨", trigger: "change" },
- ],
- receiptPaymentType: [
- { required: true, message: "璇烽�夋嫨", trigger: "change" },
- ],
registrant: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- receiptPaymentDate: [
- { required: true, message: "璇烽�夋嫨", trigger: "change" },
- ],
},
});
const { form, rules } = toRefs(data);
@@ -489,27 +434,66 @@
// 鎵撳紑寮规
const openForm = () => {
form.value = {};
- if (selectedRows.value.length !== 1) {
- proxy.$modal.msgError("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (selectedRows.value.length < 1) {
+ proxy.$modal.msgError("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�");
return;
}
- if (selectedRows.value[0].noReceiptAmount == 0) {
- proxy.$modal.msgWarning("鏃犻渶鍐嶅洖娆�");
+ const firstRow = selectedRows.value[0];
+ const isSameCustomer = selectedRows.value.every(row => row.customerName === firstRow.customerName);
+ if (!isSameCustomer) {
+ proxy.$modal.msgError("璇烽�夋嫨鐩稿悓瀹㈡埛鍚嶇О鐨勫悎鍚�");
return;
}
- invoiceInfo({ id: selectedRows.value[0].id }).then((res) => {
- form.value = { ...res.data };
- form.value.invoiceLedgerId = form.value.id;
- form.value.id = "";
- form.value.registrant = userStore.nickName;
- });
+ const hasZeroAmount = selectedRows.value.some(row => row.noReceiptAmount == 0);
+ if (hasZeroAmount) {
+ proxy.$modal.msgWarning("鎵�閫夋暟鎹腑瀛樺湪鏃犻渶鍐嶅洖娆剧殑璁板綍");
+ return;
+ }
+ form.value.registrant = userStore.nickName;
+ form.value.paymentList = selectedRows.value.map(row => ({
+ invoiceLedgerId: row.id,
+ salesContractNo: row.salesContractNo,
+ customerName: row.customerName,
+ invoiceNo: row.invoiceNo,
+ invoiceTotal: row.invoiceTotal,
+ noReceiptAmount: row.noReceiptAmount,
+ taxRate: row.taxRate,
+ receiptPaymentAmount: row.noReceiptAmount,
+ receiptPaymentType: "",
+ receiptPaymentDate: new Date().toISOString().split('T')[0],
+ }));
dialogFormVisible.value = true;
};
// 鎻愪氦琛ㄥ崟
const submitForm = () => {
proxy.$refs["formRef"].validate((valid) => {
if (valid) {
- receiptPaymentSaveOrUpdate(form.value).then((res) => {
+ const submitList = form.value.paymentList.map(item => ({
+ invoiceLedgerId: item.invoiceLedgerId,
+ invoiceNo: item.invoiceNo,
+ invoiceTotal: item.invoiceTotal,
+ noReceiptAmount: item.noReceiptAmount,
+ customerName: item.customerName,
+ salesContractNo: item.salesContractNo,
+ taxRate: item.taxRate,
+ receiptPaymentAmount: item.receiptPaymentAmount,
+ receiptPaymentType: item.receiptPaymentType,
+ receiptPaymentDate: item.receiptPaymentDate,
+ registrant: form.value.registrant,
+ }));
+
+ const invalidItems = submitList.filter(item =>
+ !item.receiptPaymentAmount ||
+ !item.receiptPaymentType ||
+ !item.receiptPaymentDate
+ );
+
+ if (invalidItems.length > 0) {
+ proxy.$modal.msgError("璇峰畬鍠勬瘡鏉″悎鍚岀殑鍥炴淇℃伅");
+ return;
+ }
+
+ receiptPaymentSaveOrUpdate(submitList).then((res) => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
getList();
--
Gitblit v1.9.3