From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/accounting/jmreport/index.vue | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/views/accounting/jmreport/index.vue b/src/views/accounting/jmreport/index.vue
index bcc7044..b2b0d10 100644
--- a/src/views/accounting/jmreport/index.vue
+++ b/src/views/accounting/jmreport/index.vue
@@ -60,6 +60,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'date',
+ formatter: this.formatDutyDate,
},
{
minWidth: '100',
@@ -91,6 +92,14 @@
minWidth: '100',
prop: 'staffName',
label: '鐢熶骇浜哄憳',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'operation',
+ label: '宸ュ簭',
isTrue: true,
isSearch: true,
searchInfoType: 'text',
@@ -145,7 +154,16 @@
this.workShopList = []
}
})
- }
+ },
+ formatDutyDate(row, column, cellValue) {
+ if (cellValue) {
+ const dutyDateList = /\d{4}-\d{1,2}-\d{1,2}/g.exec(cellValue)
+ if (dutyDateList && dutyDateList.length > 0) {
+ return dutyDateList[0]
+ }
+ }
+ return ''
+ },
}
}
</script>
--
Gitblit v1.9.3