From 4b3024e8fa2ce27a2e0b408778d4e62cc570b8b4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 10 七月 2025 17:00:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/procurementManagement/paymentEntry/index.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/views/procurementManagement/paymentEntry/index.vue b/src/views/procurementManagement/paymentEntry/index.vue
index 38a305e..5113234 100644
--- a/src/views/procurementManagement/paymentEntry/index.vue
+++ b/src/views/procurementManagement/paymentEntry/index.vue
@@ -62,13 +62,14 @@
</div>
<div class="table_list">
<PIMTable
+ rowKey="id"
:column="tableColumn"
:tableData="tableData"
:page="page"
:isSelection="true"
:isShowSummary="isShowSummarySon"
:summaryMethod="summarizeMainTable1"
- :handleSelectionChange="handleSelectionChange"
+ @selection-change="handleSelectionChange"
:tableLoading="tableLoading"
@pagination="pagination"
:total="total"
@@ -135,8 +136,6 @@
<el-col :span="12">
<el-form-item label="鍙戠エ閲戦(鍏�)锛�" prop="invoiceAmount">
<el-input
- type="number"
- :step="0.01"
v-model="form.invoiceAmount"
placeholder="鑷姩濉厖"
clearable
@@ -146,9 +145,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鏈浠樻閲戦锛�" prop="currentPaymentAmount">
- <el-input
- type="number"
- :step="0.01"
+ <el-input-number :step="0.01" :min="0" style="width: 100%"
v-model="form.currentPaymentAmount"
placeholder="璇疯緭鍏�"
clearable
@@ -184,7 +181,6 @@
<el-col :span="12">
<el-form-item label="浠樻鏃ユ湡锛�" prop="paymentDate">
<el-date-picker
- disabled
style="width: 100%"
v-model="form.paymentDate"
value-format="YYYY-MM-DD"
@@ -245,30 +241,32 @@
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
+ width:240
},
{
label: "鍙戠エ鍙�",
prop: "invoiceNumber",
+ width:200
},
{
label: "鍙戠エ閲戦(鍏�)",
prop: "invoiceAmount",
formatData: (params) => {
- return parseFloat(params).toFixed(2);
+ return params ? parseFloat(params).toFixed(2) : 0;
},
},
{
label: "宸蹭粯娆鹃噾棰�(鍏�)",
prop: "paymentAmountTotal",
formatData: (params) => {
- return parseFloat(params).toFixed(2);
+ return params ? parseFloat(params).toFixed(2) : 0;
},
},
{
label: "寰呬粯娆鹃噾棰�(鍏�)",
prop: "unPaymentAmountTotal",
formatData: (params) => {
- return parseFloat(params).toFixed(2);
+ return params ? parseFloat(params).toFixed(2) : 0;
},
},
]);
--
Gitblit v1.9.3