From 4243f25a01f4e79b3f83218dfcbe94d9befee43d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 20 十月 2025 09:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 3ac73e5..8ad8799 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -47,13 +47,13 @@
:tableLoading="loading"
:tableData="dataList"
:isSelection="true"
- height="calc(100vh - 15em)"
+ height="calc(100vh - 19.5em)"
:isShowSummary="true"
:summaryMethod="summarizeMainTable"
:page="{
current: pagination.currentPage,
size: pagination.pageSize,
- total: 0,
+ total: pagination.total,
}"
@selection-change="handleSelectionChange"
@pagination="changePage"
@@ -81,7 +81,7 @@
<el-button
type="primary"
text
- @click="openEdit(row.id)"
+ @click="openEdit(row)"
:disabled="row.issUerId !== userStore.id"
>
缂栬緫
@@ -162,14 +162,19 @@
width: 150,
},
{
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
+ label: "椤圭洰鍚嶇О",
+ prop: "projectName",
width: 240,
},
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
width: 240,
+ },
+ {
+ label: "浜у搧澶х被",
+ prop: "productCategory",
+ width: 150,
},
{
label: "瑙勬牸鍨嬪彿",
@@ -190,12 +195,17 @@
},
},
{
- label: "寮�绁ㄦ棩鏈�",
+ label: "鏈鏉ョエ鏁�",
+ prop: "ticketsNum",
+ width: 110,
+ },
+ {
+ label: "鏉ョエ鏃ユ湡",
prop: "createdAt",
width: 110,
},
{
- label: "寮�绁ㄩ噾棰�",
+ label: "鏉ョエ閲戦(鍏�)",
prop: "ticketsAmount",
width: 200,
formatData: (cell) => {
@@ -289,8 +299,9 @@
});
};
-const changePage = ({ page }) => {
+const changePage = ({ page, limit }) => {
pagination.currentPage = page;
+ pagination.pageSize = limit;
onCurrentChange(page);
};
@@ -310,8 +321,8 @@
modalRef.value.handleImport(id);
};
-const openEdit = (id) => {
- editmodalRef.value.open(id);
+const openEdit = (row) => {
+ editmodalRef.value.open(row);
};
// 涓婁紶鎴愬姛鍚庡仛浠�涔�
--
Gitblit v1.9.3