From 6e15ba36ab0a264b7c3a038edaf01abbdc71e54b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 02 九月 2025 11:29:23 +0800
Subject: [PATCH] 合并冲突掉的代码
---
src/views/procurementManagement/procurementInvoiceLedger/index.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/procurementManagement/procurementInvoiceLedger/index.vue b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
index 439837b..8ad8799 100644
--- a/src/views/procurementManagement/procurementInvoiceLedger/index.vue
+++ b/src/views/procurementManagement/procurementInvoiceLedger/index.vue
@@ -172,6 +172,11 @@
width: 240,
},
{
+ label: "浜у搧澶х被",
+ prop: "productCategory",
+ width: 150,
+ },
+ {
label: "瑙勬牸鍨嬪彿",
prop: "specificationModel",
width: 150,
@@ -190,12 +195,17 @@
},
},
{
- label: "寮�绁ㄦ棩鏈�",
+ label: "鏈鏉ョエ鏁�",
+ prop: "ticketsNum",
+ width: 110,
+ },
+ {
+ label: "鏉ョエ鏃ユ湡",
prop: "createdAt",
width: 110,
},
{
- label: "寮�绁ㄩ噾棰�",
+ label: "鏉ョエ閲戦(鍏�)",
prop: "ticketsAmount",
width: 200,
formatData: (cell) => {
--
Gitblit v1.9.3