From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
src/views/accounting/jmreport/index.vue | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 4 deletions(-)
diff --git a/src/views/accounting/jmreport/index.vue b/src/views/accounting/jmreport/index.vue
index 0d5f8ab..5837437 100644
--- a/src/views/accounting/jmreport/index.vue
+++ b/src/views/accounting/jmreport/index.vue
@@ -42,7 +42,7 @@
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' },
- cancelRunCreated: true
+ cancelRunCreated: false
},
table: {
total: 0,
@@ -53,9 +53,71 @@
column: [
{
minWidth: '100',
- width: '100px',
- prop: 'contractNo',
- label: '鍚堝悓缂栧彿',
+ prop: 'createTime',
+ label: '鐢熶骇鏃ユ湡',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'date',
+ },
+ {
+ minWidth: '100',
+ prop: 'workShop',
+ label: '杞﹂棿',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'partName',
+ label: '鐢熶骇闆朵欢',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'partNo',
+ label: '鐢熶骇闆朵欢鍙�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'staffName',
+ label: '鐢熶骇浜哄憳',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'workSum',
+ label: '鎶ュ伐鎬绘暟閲�',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'unit',
+ label: '鍗曚綅',
+ sort: true,
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ },
+ {
+ minWidth: '100',
+ prop: 'workTotal',
+ label: '鎶ュ伐鎬绘鏁�',
sort: true,
isTrue: true,
isSearch: true,
--
Gitblit v1.9.3