From 9f3bc47b98cbc51df7cfcea94d4aa0c35f40cbc5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 13 十月 2026 14:09:06 +0800
Subject: [PATCH] feat: 添加数字格式化工具，支持去掉小数末尾多余的 0 和四舍五入功能
---
src/views/procurementManagement/paymentLedger/index.vue | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 02c0b58..b14fb2c 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -49,9 +49,9 @@
<el-table-column label="搴斾粯閲戦(鍏�)"
prop="payableAmount"
show-overflow-tooltip>
- <template #default="{ row, column }">
+ <template #default="{ row }">
<el-text type="danger">
- {{ formattedNumber(row, column, row.payableAmount) }}
+ {{ formatPayable(row.payableAmount) }}
</el-text>
</template>
</el-table-column>
@@ -79,7 +79,7 @@
@pagination="sonPaginationSearch">
<template #payableAmountSlot="{ row }">
<el-text type="danger">
- {{ parseFloat(row.payableAmount).toFixed(6) }}
+ {{ formatPayable(row.payableAmount) }}
</el-text>
</template>
<template #paymentActionSlot="{ row }">
@@ -100,7 +100,7 @@
</el-form-item>
<el-form-item label="浠樻閲戦锛�" prop="paymentAmount">
<el-input-number style="width:100%" v-model="paymentForm.paymentAmount" :min="0" :precision="6" :max="Math.max(0,Number(currentPaymentRow.payableAmount)||0)" placeholder="璇疯緭鍏ヤ粯娆鹃噾棰�" controls-position="right" />
- <div style="color:#e6a23c;font-size:12px;margin-top:4px">褰撳墠鍙粯娆句綑棰濓細{{ Math.max(0,Number(currentPaymentRow.payableAmount)||0).toFixed(6) }} 鍏�</div>
+ <div style="color:#e6a23c;font-size:12px;margin-top:4px">褰撳墠鍙粯娆句綑棰濓細{{ formatPayable(Math.max(0,Number(currentPaymentRow.payableAmount)||0)) }} 鍏�</div>
</el-form-item>
<el-form-item label="浠樻鏂瑰紡锛�" prop="paymentMethod">
<el-select v-model="paymentForm.paymentMethod" placeholder="璇烽�夋嫨浠樻鏂瑰紡" style="width:100%" clearable>
@@ -125,6 +125,7 @@
savePayment,
} from "@/api/procurementManagement/paymentLedger.js";
import Pagination from "../../../components/PIMTable/Pagination.vue";
+ import { trimZeros, roundHalfUp } from "@/utils/formatNumber.js";
const tableData = ref([]);
const tableLoading = ref(false);
@@ -169,7 +170,7 @@
prop: "contractAmount",
width: 200,
formatData: params => {
- return params ? parseFloat(params).toFixed(6) : 0;
+ return trimZeros(params, 6);
},
},
{
@@ -177,7 +178,7 @@
prop: "paymentAmount",
width: 200,
formatData: params => {
- return params ? parseFloat(params).toFixed(6) : 0;
+ return trimZeros(params, 6);
},
},
{
@@ -206,7 +207,7 @@
const currentPaymentRow = ref({});
const paymentFormRef = ref(null);
const paymentForm = reactive({ paymentDate:"", paymentAmount:undefined, paymentMethod:"", remark:"" });
- const validatePaymentAmount = (_,v,cb) => { if(!v) return cb(new Error("璇疯緭鍏ヤ粯娆鹃噾棰�")); const m=Math.max(0,Number(currentPaymentRow.value.payableAmount)||0); if(v>m) return cb(new Error(`浠樻閲戦涓嶈兘瓒呰繃鍙粯娆句綑棰� ${m.toFixed(6)} 鍏僠)); cb(); };
+ const validatePaymentAmount = (_,v,cb) => { if(!v) return cb(new Error("璇疯緭鍏ヤ粯娆鹃噾棰�")); const m=Math.max(0,Number(currentPaymentRow.value.payableAmount)||0); if(v>m) return cb(new Error(`浠樻閲戦涓嶈兘瓒呰繃鍙粯娆句綑棰� ${trimZeros(m, 6)} 鍏僠)); cb(); };
const paymentRules = { paymentDate:[{required:true,message:"璇烽�夋嫨浠樻鏃ユ湡",trigger:"change"}], paymentAmount:[{required:true,validator:validatePaymentAmount,trigger:"blur"}], paymentMethod:[{required:true,message:"璇烽�夋嫨浠樻鏂瑰紡",trigger:"change"}] };
const openPaymentDialog = r => { currentPaymentRow.value=r; paymentForm.paymentDate=""; paymentForm.paymentAmount=undefined; paymentForm.paymentMethod=""; paymentForm.remark=""; paymentDialogVisible.value=true; };
const closePaymentDialog = () => { paymentFormRef.value?.resetFields(); paymentDialogVisible.value=false; };
@@ -218,9 +219,10 @@
param,
["contractAmounts", "paymentAmount", "payableAmount"],
{
- contractAmounts: { decimalPlaces: 6 },
- paymentAmount: { decimalPlaces: 6 },
- payableAmount: { decimalPlaces: 6 },
+ contractAmounts: { decimalPlaces: 6, trimZeros: true },
+ paymentAmount: { decimalPlaces: 6, trimZeros: true },
+ // 搴斾粯閲戦閫愯鎸夊垎鍙栨暣鍚庡啀姹傚拰锛屼繚璇佸悎璁� = 鍒楀唴灞曠ず鍊间箣鍜�
+ payableAmount: { roundEach: 2, formatter: formatPayable },
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
}
@@ -228,26 +230,19 @@
};
// 瀛愯〃鍚堣鏂规硶
const summarizeMainTable1 = param => {
- let summarizeTable = proxy.summarizeTable(
+ return proxy.summarizeTable(
param,
- ["contractAmount", "invoiceAmount", "paymentAmount"],
+ ["contractAmount", "invoiceAmount", "paymentAmount", "payableAmount"],
{
- contractAmount: { decimalPlaces: 6 },
- invoiceAmount: { decimalPlaces: 6 },
- paymentAmount: { decimalPlaces: 6 },
+ contractAmount: { decimalPlaces: 6, trimZeros: true },
+ invoiceAmount: { decimalPlaces: 6, trimZeros: true },
+ paymentAmount: { decimalPlaces: 6, trimZeros: true },
+ // 搴斾粯閲戦閫愯鎸夊垎鍙栨暣鍚庡啀姹傚拰锛屼繚璇佸悎璁� = 鍒楀唴灞曠ず鍊间箣鍜�
+ payableAmount: { roundEach: 2, formatter: formatPayable },
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
}
);
- if (originalTableDataSon.value.length > 0) {
- summarizeTable[summarizeTable.length - 1] =
- originalTableDataSon.value[
- originalTableDataSon.value.length - 1
- ].payableAmount.toFixed(6);
- } else {
- summarizeTable[summarizeTable.length - 1] = 0.0;
- }
- return summarizeTable;
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
@@ -319,11 +314,17 @@
};
const formattedNumber = (row, column, cellValue) => {
if (column.property !== "supplierName") {
- return parseFloat(cellValue).toFixed(6);
+ return trimZeros(cellValue, 6);
} else {
return cellValue;
}
};
+ // 搴斾粯閲戦鏄噾棰濆瓧娈碉紝鏈�澶氫繚鐣� 2 浣嶅皬鏁帮紙鍥涜垗浜斿叆鍒板垎锛夈��
+ // 搴斾粯閲戦 = 鍙�(鍏ュ簱閲戦, 鍚堝悓閲戦)杈冨皬鑰� 鈭� 宸蹭粯娆� 鈭� 閫�璐ч噾棰濓紝鍏朵腑鍏ュ簱閲戦鐢� 6 浣嶅皬鏁扮殑鍚◣鍗曚环绱姞鑰屾潵锛�
+ // 浼氬甫鍑恒�屽帢銆嶅強浠ヤ笅鐨勫皬鏁帮紝椤甸潰涓婄粺涓�鎸夊垎灞曠ず銆�
+ const formatPayable = value => {
+ return trimZeros(roundHalfUp(value, 2), 2);
+ };
getList();
</script>
--
Gitblit v1.9.3