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 | 99 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 4 deletions(-)
diff --git a/src/views/accounting/jmreport/index.vue b/src/views/accounting/jmreport/index.vue
index 0d5f8ab..b2b0d10 100644
--- a/src/views/accounting/jmreport/index.vue
+++ b/src/views/accounting/jmreport/index.vue
@@ -18,6 +18,7 @@
import { mapGetters } from 'vuex'
import ttable from '@/views/common/ztt-table.vue'
import { pageList } from '@/api/accounting/personReport'
+import { remote } from '@/api/admin/dict'
export default {
components: {
ttable
@@ -42,7 +43,7 @@
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' },
- cancelRunCreated: true
+ cancelRunCreated: false
},
table: {
total: 0,
@@ -53,9 +54,77 @@
column: [
{
minWidth: '100',
- width: '100px',
- prop: 'contractNo',
- label: '鍚堝悓缂栧彿',
+ prop: 'createTime',
+ label: '鐢熶骇鏃ユ湡',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'date',
+ formatter: this.formatDutyDate,
+ },
+ {
+ minWidth: '100',
+ prop: 'workShop',
+ label: '杞﹂棿',
+ isTrue: true,
+ isSearch: true,searchInfoType:'select',
+ optList: () => {
+ return this.workShopList
+ }
+ },
+ {
+ minWidth: '100',
+ prop: 'partName',
+ label: '鐢熶骇闆朵欢',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'partNo',
+ label: '鐢熶骇闆朵欢鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'staffName',
+ label: '鐢熶骇浜哄憳',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'operation',
+ label: '宸ュ簭',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'workSum',
+ label: '鎶ュ伐鎬绘暟閲�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'unit',
+ label: '鍗曚綅',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'workTotal',
+ label: '鎶ュ伐鎬绘鏁�',
sort: true,
isTrue: true,
isSearch: true,
@@ -66,13 +135,35 @@
operator: null
},
prelang: "operation",
+ workShopList:[],
}
+ },
+ mounted(){
+ this.getWorkShopList()
},
methods:{
// table鑷甫浜嬩欢
handleSelectionChange(val) {
this.multipleSelection = val
},
+ getWorkShopList(){
+ remote('work_shop').then((response) => {
+ if (response.data.code === 0) {
+ this.workShopList = response.data.data
+ } else {
+ 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