From 3cd0964299bf9e83c6b2d10d8d37ddbeecf2a6e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 12 八月 2026 10:54:18 +0800
Subject: [PATCH] Merge branch 'dev_天津_意博凯信' of http://114.132.189.42:9002/r/product-inventory-management into dev_天津_意博凯信
---
src/api/salesManagement/indicatorStats.js | 9 +
src/api/procurementManagement/paymentLedger.js | 9 +
src/views/salesManagement/receiptPaymentLedger/index.vue | 149 ++++++++++++++++++++++++
src/views/procurementManagement/paymentLedger/index.vue | 151 +++++++++++++++++++++++++
4 files changed, 317 insertions(+), 1 deletions(-)
diff --git a/src/api/procurementManagement/paymentLedger.js b/src/api/procurementManagement/paymentLedger.js
index 537ba9f..00575db 100644
--- a/src/api/procurementManagement/paymentLedger.js
+++ b/src/api/procurementManagement/paymentLedger.js
@@ -27,3 +27,12 @@
params,
});
}
+
+/** 鏂板浠樻 */
+export function savePayment(data) {
+ return request({
+ url: "/purchase/report/savePayment",
+ method: "post",
+ data,
+ });
+}
diff --git a/src/api/salesManagement/indicatorStats.js b/src/api/salesManagement/indicatorStats.js
index c29eac3..930cb99 100644
--- a/src/api/salesManagement/indicatorStats.js
+++ b/src/api/salesManagement/indicatorStats.js
@@ -36,3 +36,12 @@
params: query,
});
}
+
+// 鏂板鍥炴
+export function saveReceiptPayment(data) {
+ return request({
+ url: "/metricStatistics/saveReceiptPayment",
+ method: "post",
+ data: data,
+ });
+}
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 99b4b39..7d20406 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -82,10 +82,86 @@
{{ parseFloat(row.payableAmount).toFixed(2) }}
</el-text>
</template>
+ <template #paymentActionSlot="{ row }">
+ <el-button link type="primary" @click="openPaymentDialog(row)">
+ 鏂板浠樻
+ </el-button>
+ </template>
</PIMTable>
</div>
</el-col>
</el-row>
+
+ <!-- 鏂板浠樻寮规 -->
+ <el-dialog
+ v-model="paymentDialogVisible"
+ title="鏂板浠樻"
+ width="35%"
+ @close="closePaymentDialog"
+ >
+ <el-form
+ :model="paymentForm"
+ label-width="100px"
+ :rules="paymentRules"
+ ref="paymentFormRef"
+ >
+ <el-form-item label="閲囪喘鍚堝悓鍙凤細"> {{ currentPaymentRow.purchaseContractNumber || '--' }} </el-form-item>
+ <el-form-item label="浠樻鏃ユ湡锛�" prop="paymentDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="paymentForm.paymentDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨浠樻鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+ <el-form-item label="浠樻閲戦锛�" prop="paymentAmount">
+ <el-input-number
+ style="width: 100%"
+ v-model="paymentForm.paymentAmount"
+ :precision="2"
+ :min="0.01"
+ :max="Math.max(0, (Number(currentPaymentRow.payableAmount) || 0) - (Number(currentPaymentRow.paymentAmount) || 0))"
+ placeholder="璇疯緭鍏ヤ粯娆鹃噾棰�"
+ controls-position="right"
+ />
+ <div style="color: #e6a23c; font-size: 12px; margin-top: 4px">
+ 褰撳墠鍙粯娆句綑棰濓細{{ (Number(currentPaymentRow.payableAmount) || 0) - (Number(currentPaymentRow.paymentAmount) || 0) > 0 ? ((Number(currentPaymentRow.payableAmount) || 0) - (Number(currentPaymentRow.paymentAmount) || 0)).toFixed(2) : '0.00' }} 鍏�
+ </div>
+ </el-form-item>
+ <el-form-item label="浠樻鏂瑰紡锛�" prop="paymentMethod">
+ <el-select
+ v-model="paymentForm.paymentMethod"
+ placeholder="璇烽�夋嫨浠樻鏂瑰紡"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="閾惰杞处" value="閾惰杞处" />
+ <el-option label="鐜伴噾" value="鐜伴噾" />
+ <el-option label="鏀エ" value="鏀エ" />
+ <el-option label="寰俊/鏀粯瀹�" value="寰俊/鏀粯瀹�" />
+ <el-option label="鍏朵粬" value="鍏朵粬" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="澶囨敞锛�" prop="remark">
+ <el-input
+ v-model="paymentForm.remark"
+ type="textarea"
+ :rows="3"
+ placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�"
+ clearable
+ />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitPaymentForm">纭</el-button>
+ <el-button @click="closePaymentDialog">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
@@ -95,6 +171,7 @@
import {
paymentLedgerList,
paymentRecordList,
+ savePayment,
} from "@/api/procurementManagement/paymentLedger.js";
import Pagination from "../../../components/PIMTable/Pagination.vue";
@@ -159,6 +236,14 @@
prop: "payableAmount",
slot: "payableAmountSlot",
},
+ {
+ label: "鎿嶄綔",
+ dataType: "slot",
+ slot: "paymentActionSlot",
+ width: 100,
+ fixed: "right",
+ align: "center",
+ },
]);
const tableDataSon = ref([]);
const originalTableDataSon = ref([]);
@@ -166,6 +251,72 @@
const isShowSummarySon = ref(true);
const { proxy } = getCurrentInstance();
+ // 鏂板浠樻寮规
+ const paymentDialogVisible = ref(false);
+ const currentPaymentRow = ref({});
+ const paymentFormRef = ref(null);
+ const paymentForm = reactive({
+ paymentDate: "",
+ paymentAmount: undefined,
+ paymentMethod: "",
+ remark: "",
+ });
+ const validatePaymentAmount = (_, value, callback) => {
+ if (!value) {
+ return callback(new Error("璇疯緭鍏ヤ粯娆鹃噾棰�"));
+ }
+ const remaining =
+ (Number(currentPaymentRow.value.payableAmount) || 0) -
+ (Number(currentPaymentRow.value.paymentAmount) || 0);
+ if (value > remaining) {
+ return callback(new Error(`浠樻閲戦涓嶈兘瓒呰繃鍙粯娆句綑棰� ${remaining.toFixed(2)} 鍏僠));
+ }
+ callback();
+ };
+ const paymentRules = {
+ paymentDate: [
+ { required: true, message: "璇烽�夋嫨浠樻鏃ユ湡", trigger: "change" },
+ ],
+ paymentAmount: [
+ { required: true, validator: validatePaymentAmount, trigger: "blur" },
+ ],
+ paymentMethod: [
+ { required: true, message: "璇烽�夋嫨浠樻鏂瑰紡", trigger: "change" },
+ ],
+ };
+ const openPaymentDialog = row => {
+ currentPaymentRow.value = row;
+ paymentForm.paymentDate = "";
+ paymentForm.paymentAmount = undefined;
+ paymentForm.paymentMethod = "";
+ paymentForm.remark = "";
+ paymentDialogVisible.value = true;
+ };
+ const closePaymentDialog = () => {
+ paymentFormRef.value?.resetFields();
+ paymentDialogVisible.value = false;
+ };
+ const submitPaymentForm = () => {
+ paymentFormRef.value?.validate(valid => {
+ if (valid) {
+ const payload = {
+ supplierId: currentSupplierId.value,
+ purchaseContractNumber: currentPaymentRow.value.purchaseContractNumber,
+ paymentDate: paymentForm.paymentDate,
+ paymentAmount: paymentForm.paymentAmount,
+ paymentMethod: paymentForm.paymentMethod,
+ remark: paymentForm.remark,
+ };
+ savePayment(payload).then(res => {
+ proxy.$modal.msgSuccess("鏂板浠樻鎴愬姛");
+ closePaymentDialog();
+ getPaymenRecordtList(currentSupplierId.value);
+ getList();
+ });
+ }
+ });
+ };
+
// 涓昏〃鍚堣鏂规硶
const summarizeMainTable = param => {
return proxy.summarizeTable(
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index f5a9d8f..c759985 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -106,6 +106,16 @@
</el-text>
</template>
</el-table-column>
+ <el-table-column label="鎿嶄綔"
+ fixed="right"
+ align="center"
+ width="100">
+ <template #default="{ row }">
+ <el-button link type="primary" @click="openReceiptDialog(row)">
+ 鏂板鍥炴
+ </el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination v-show="recordTotal > 0"
:total="recordTotal"
@@ -116,6 +126,77 @@
</div>
</el-col>
</el-row>
+
+ <!-- 鏂板鍥炴寮规 -->
+ <el-dialog
+ v-model="receiptDialogVisible"
+ title="鏂板鍥炴"
+ width="35%"
+ @close="closeReceiptDialog"
+ >
+ <el-form
+ :model="receiptForm"
+ label-width="100px"
+ :rules="receiptRules"
+ ref="receiptFormRef"
+ >
+ <el-form-item label="閿�鍞悎鍚屽彿锛�"> {{ currentRow.salesContractNo || '--' }} </el-form-item>
+ <el-form-item label="鍥炴鏃ユ湡锛�" prop="paymentDate">
+ <el-date-picker
+ style="width: 100%"
+ v-model="receiptForm.paymentDate"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨鍥炴鏃ユ湡"
+ clearable
+ />
+ </el-form-item>
+ <el-form-item label="鍥炴閲戦锛�" prop="paymentAmount">
+ <el-input-number
+ style="width: 100%"
+ v-model="receiptForm.paymentAmount"
+ :precision="2"
+ :min="0.01"
+ :max="Math.max(0, (Number(currentRow.receiptableAmount) || 0) - (Number(currentRow.receiptPaymentAmount) || 0))"
+ placeholder="璇疯緭鍏ュ洖娆鹃噾棰�"
+ controls-position="right"
+ />
+ <div style="color: #e6a23c; font-size: 12px; margin-top: 4px">
+ 褰撳墠鍙洖娆句綑棰濓細{{ formattedNumber(null, null, (Number(currentRow.receiptableAmount) || 0) - (Number(currentRow.receiptPaymentAmount) || 0)) }} 鍏�
+ </div>
+ </el-form-item>
+ <el-form-item label="鍥炴鏂瑰紡锛�" prop="paymentMethod">
+ <el-select
+ v-model="receiptForm.paymentMethod"
+ placeholder="璇烽�夋嫨鍥炴鏂瑰紡"
+ style="width: 100%"
+ clearable
+ >
+ <el-option label="閾惰杞处" value="閾惰杞处" />
+ <el-option label="鐜伴噾" value="鐜伴噾" />
+ <el-option label="鏀エ" value="鏀エ" />
+ <el-option label="寰俊/鏀粯瀹�" value="寰俊/鏀粯瀹�" />
+ <el-option label="鍏朵粬" value="鍏朵粬" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="澶囨敞锛�" prop="remark">
+ <el-input
+ v-model="receiptForm.remark"
+ type="textarea"
+ :rows="3"
+ placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�"
+ clearable
+ />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitReceiptForm">纭</el-button>
+ <el-button @click="closeReceiptDialog">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
@@ -124,6 +205,7 @@
import {
customewTransactions,
customewTransactionsDetails,
+ saveReceiptPayment,
} from "@/api/salesManagement/indicatorStats.js";
import Pagination from "../../../components/PIMTable/Pagination.vue";
const { proxy } = getCurrentInstance();
@@ -149,7 +231,72 @@
const customerId = ref("");
const { searchForm } = toRefs(data);
const originReceiptRecord = ref([]);
- // 鏌ヨ鍒楄〃
+
+ // 鏂板鍥炴寮规
+ const receiptDialogVisible = ref(false);
+ const currentRow = ref({});
+ const receiptFormRef = ref(null);
+ const receiptForm = reactive({
+ paymentDate: "",
+ paymentAmount: undefined,
+ paymentMethod: "",
+ remark: "",
+ });
+ const validatePaymentAmount = (_, value, callback) => {
+ if (!value) {
+ return callback(new Error("璇疯緭鍏ュ洖娆鹃噾棰�"));
+ }
+ const remaining =
+ (Number(currentRow.value.receiptableAmount) || 0) -
+ (Number(currentRow.value.receiptPaymentAmount) || 0);
+ if (value > remaining) {
+ return callback(new Error(`鍥炴閲戦涓嶈兘瓒呰繃鍙洖娆句綑棰� ${remaining.toFixed(2)} 鍏僠));
+ }
+ callback();
+ };
+ const receiptRules = {
+ paymentDate: [
+ { required: true, message: "璇烽�夋嫨鍥炴鏃ユ湡", trigger: "change" },
+ ],
+ paymentAmount: [
+ { required: true, validator: validatePaymentAmount, trigger: "blur" },
+ ],
+ paymentMethod: [
+ { required: true, message: "璇烽�夋嫨鍥炴鏂瑰紡", trigger: "change" },
+ ],
+ };
+ const openReceiptDialog = row => {
+ currentRow.value = row;
+ receiptForm.paymentDate = "";
+ receiptForm.paymentAmount = undefined;
+ receiptForm.paymentMethod = "";
+ receiptForm.remark = "";
+ receiptDialogVisible.value = true;
+ };
+ const closeReceiptDialog = () => {
+ receiptFormRef.value?.resetFields();
+ receiptDialogVisible.value = false;
+ };
+ const submitReceiptForm = () => {
+ receiptFormRef.value?.validate(valid => {
+ if (valid) {
+ const payload = {
+ customerId: customerId.value,
+ salesContractNo: currentRow.value.salesContractNo,
+ paymentDate: receiptForm.paymentDate,
+ paymentAmount: receiptForm.paymentAmount,
+ paymentMethod: receiptForm.paymentMethod,
+ remark: receiptForm.remark,
+ };
+ saveReceiptPayment(payload).then(res => {
+ proxy.$modal.msgSuccess("鏂板鍥炴鎴愬姛");
+ closeReceiptDialog();
+ receiptPaymentList(customerId.value);
+ getList();
+ });
+ }
+ });
+ };
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
page.current = 1;
--
Gitblit v1.9.3