From 4cce348b6353d853df170cd7a82c80aa698abb2f Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 24 五月 2026 18:32:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁_帮太优选' into dev_pro_河南鹤壁_帮太优选
---
src/views/salesManagement/receiptPaymentLedger/index.vue | 24 ++++++++++++------------
src/views/equipmentManagement/inspectionManagement/index.vue | 2 +-
src/views/equipmentManagement/inspectionManagement/components/uploadFiles.vue | 2 +-
src/views/procurementManagement/paymentLedger/index.vue | 32 ++++++++++++--------------------
4 files changed, 26 insertions(+), 34 deletions(-)
diff --git a/src/views/equipmentManagement/inspectionManagement/components/uploadFiles.vue b/src/views/equipmentManagement/inspectionManagement/components/uploadFiles.vue
index 9abd042..481ea85 100644
--- a/src/views/equipmentManagement/inspectionManagement/components/uploadFiles.vue
+++ b/src/views/equipmentManagement/inspectionManagement/components/uploadFiles.vue
@@ -230,7 +230,7 @@
const formatDateTime = date => {
if (!date) return "-";
- return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
+ return dayjs(date).format("YYYY-MM-DD");
};
const hasException = ref(null);
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index 088618e..c6c21d9 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -197,7 +197,7 @@
formatData: cell => {
if (!cell) return "-";
try {
- return dayjs(cell).format("YYYY-MM-DD HH:mm:ss");
+ return dayjs(cell).format("YYYY-MM-DD");
} catch {
return cell;
}
diff --git a/src/views/procurementManagement/paymentLedger/index.vue b/src/views/procurementManagement/paymentLedger/index.vue
index 99b4b39..ae2c30b 100644
--- a/src/views/procurementManagement/paymentLedger/index.vue
+++ b/src/views/procurementManagement/paymentLedger/index.vue
@@ -42,16 +42,16 @@
prop="contractAmounts"
show-overflow-tooltip
:formatter="formattedNumber" />
- <el-table-column label="浠樻閲戦(鍏�)"
- prop="paymentAmount"
+ <el-table-column label="宸插叆搴撻噾棰�(鍏�)"
+ prop="shippedAmount"
show-overflow-tooltip
:formatter="formattedNumber" />
- <el-table-column label="搴斾粯閲戦(鍏�)"
- prop="payableAmount"
+ <el-table-column label="鏈叆搴撻噾棰�(鍏�)"
+ prop="unshippedAmount"
show-overflow-tooltip>
<template #default="{ row, column }">
<el-text type="danger">
- {{ formattedNumber(row, column, row.payableAmount) }}
+ {{ formattedNumber(row, column, row.unshippedAmount) }}
</el-text>
</template>
</el-table-column>
@@ -79,7 +79,7 @@
@pagination="sonPaginationSearch">
<template #payableAmountSlot="{ row }">
<el-text type="danger">
- {{ parseFloat(row.payableAmount).toFixed(2) }}
+ {{ parseFloat(row.unshippedAmount).toFixed(2) }}
</el-text>
</template>
</PIMTable>
@@ -145,18 +145,18 @@
},
},
{
- label: "浠樻閲戦(鍏�)",
- prop: "paymentAmount",
+ label: "宸插叆搴撻噾棰�(鍏�)",
+ prop: "shippedAmount",
width: 200,
formatData: params => {
return params ? parseFloat(params).toFixed(2) : 0;
},
},
{
- label: "搴斾粯閲戦(鍏�)",
+ label: "鏈叆搴撻噾棰�(鍏�)",
dataType: "slot",
width: 200,
- prop: "payableAmount",
+ prop: "unshippedAmount",
slot: "payableAmountSlot",
},
]);
@@ -170,7 +170,7 @@
const summarizeMainTable = param => {
return proxy.summarizeTable(
param,
- ["contractAmounts", "paymentAmount", "payableAmount"],
+ ["contractAmounts", "shippedAmount", "unshippedAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
@@ -181,20 +181,12 @@
const summarizeMainTable1 = param => {
let summarizeTable = proxy.summarizeTable(
param,
- ["contractAmount", "invoiceAmount", "paymentAmount"],
+ ["contractAmount", "shippedAmount", "unshippedAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
}
);
- if (originalTableDataSon.value.length > 0) {
- summarizeTable[summarizeTable.length - 1] =
- originalTableDataSon.value[
- originalTableDataSon.value.length - 1
- ].payableAmount.toFixed(2);
- } else {
- summarizeTable[summarizeTable.length - 1] = 0.0;
- }
return summarizeTable;
};
/** 鎼滅储鎸夐挳鎿嶄綔 */
diff --git a/src/views/salesManagement/receiptPaymentLedger/index.vue b/src/views/salesManagement/receiptPaymentLedger/index.vue
index f5a9d8f..8852a32 100644
--- a/src/views/salesManagement/receiptPaymentLedger/index.vue
+++ b/src/views/salesManagement/receiptPaymentLedger/index.vue
@@ -41,18 +41,18 @@
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="鍥炴閲戦(鍏�)"
- prop="receiptPaymentAmount"
+ <el-table-column label="宸插嚭搴撻噾棰�(鍏�)"
+ prop="shippedAmount"
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="搴旀敹閲戦(鍏�)"
- prop="receiptableAmount"
+ <el-table-column label="鏈嚭搴撻噾棰�(鍏�)"
+ prop="unshippedAmount"
show-overflow-tooltip
width="200">
<template #default="{ row, column }">
<el-text type="danger">
- {{ formattedNumber(row, column, row.receiptableAmount) }}
+ {{ formattedNumber(row, column, row.unshippedAmount) }}
</el-text>
</template>
</el-table-column>
@@ -91,18 +91,18 @@
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="鍥炴閲戦(鍏�)"
- prop="receiptPaymentAmount"
+ <el-table-column label="宸插嚭搴撻噾棰�(鍏�)"
+ prop="shippedAmount"
show-overflow-tooltip
:formatter="formattedNumber"
width="200" />
- <el-table-column label="搴旀敹閲戦(鍏�)"
- prop="receiptableAmount"
+ <el-table-column label="鏈嚭搴撻噾棰�(鍏�)"
+ prop="unshippedAmount"
show-overflow-tooltip
width="200">
<template #default="{ row, column }">
<el-text type="danger">
- {{ formattedNumber(row, column, row.receiptableAmount) }}
+ {{ formattedNumber(row, column, row.unshippedAmount) }}
</el-text>
</template>
</el-table-column>
@@ -180,7 +180,7 @@
const summarizeMainTable = param => {
return proxy.summarizeTable(
param,
- ["invoiceTotal", "receiptPaymentAmount", "unReceiptPaymentAmount"],
+ ["contractAmounts", "shippedAmount", "unshippedAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
@@ -191,7 +191,7 @@
const summarizeMainTable1 = param => {
var summarizeTable = proxy.summarizeTable(
param,
- ["contractAmount", "receiptPaymentAmount", "receiptableAmount"],
+ ["contractAmount", "shippedAmount", "unshippedAmount"],
{
ticketsNum: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
futureTickets: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
--
Gitblit v1.9.3