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