From 3f4362c22608464d251936b9bc4feabe3286aa5e Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 31 七月 2024 15:07:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b3-work-time-management/work-time-config.vue | 101 +++++++++++++++++++++++++-------------------------
1 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-config.vue b/src/components/do/b3-work-time-management/work-time-config.vue
index e0f1c59..c02fe8a 100644
--- a/src/components/do/b3-work-time-management/work-time-config.vue
+++ b/src/components/do/b3-work-time-management/work-time-config.vue
@@ -48,56 +48,57 @@
data () {
return{
componentData: {
- entity: {
- number: null,
- department: null,
- laboratory: null,
- orderBy: {
- field: 'id',
- order: 'desc'
- }
- },
- isIndex: true,
- showSelect: false,
- select: true,
- do: [{
- id: 'delete',
- font: '鍒犻櫎',
- type: 'text',
- method: 'doDiy'
- }, {
- id: 'update',
- font: '缂栬緫',
- type: 'text',
- method: 'doDiy',
- field: ['department']
- }],
- tagField: {
- laboratory: {
- select: []
- },
- unit: {
- select: []
- },
- // department: {
- // select: []
- // },
- },
- linkEvent: {
- },
- selectField: {
- laboratory: {
- select: []
- },
- unit: {
- select: []
- },
- // department: {
- // select: []
- // },
- },
- requiredAdd: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour'],
- requiredUp: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour']
+ entity: {
+ number: null,
+ department: null,
+ laboratory: null,
+ orderBy: {
+ field: 'id',
+ order: 'desc'
+ }
+ },
+ isIndex: true,
+ showSelect: false,
+ select: true,
+ do: [{
+ id: 'delete',
+ font: '鍒犻櫎',
+ type: 'text',
+ method: 'doDiy'
+ }, {
+ id: 'update',
+ font: '缂栬緫',
+ type: 'text',
+ method: 'doDiy',
+ field: ['department']
+ }],
+ tagField: {
+ laboratory: {
+ select: []
+ },
+ unit: {
+ select: []
+ },
+ // department: {
+ // select: []
+ // },
+ },
+ linkEvent: {
+ },
+ selectField: {
+ laboratory: {
+ select: []
+ },
+ unit: {
+ select: []
+ },
+ // department: {
+ // select: []
+ // },
+ },
+ needSort: ['auxiliaryProject'],
+ requiredAdd: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour'],
+ requiredUp: ['number','auxiliaryProject','laboratory','unit','approvedWorkingHour']
},
entityCopy: {},
upIndex: 0,
--
Gitblit v1.9.3