From c9071ee03a4664db1ca2887aec8323b9c0f72726 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 19 七月 2024 10:45:56 +0800
Subject: [PATCH] 日工时管理批量审核，批准接口传参修改
---
src/components/do/b3-work-time-management/work-time-management.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index 34c91dc..0bb665c 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -161,7 +161,7 @@
</el-select>
</el-form-item>
<el-form-item label="濮撳悕:">
- <el-input v-model="formData0.nameUser" size="small" disabled></el-input>
+ <el-input v-model="formData0.name" size="small" disabled></el-input>
</el-form-item>
<el-form-item label="鐝:">
<el-select v-model="formData0.shift" placeholder="璇烽�夋嫨" size="small" :disabled="title=='鎵瑰噯'">
@@ -362,13 +362,13 @@
entityCopy1: {},
upIndex1:100,
weekList:[
- {label: '鍛ㄤ竴', value: '1',type:'primary'},
- {label: '鍛ㄤ簩', value: '2',type:'primary'},
- {label: '鍛ㄤ笁', value: '3',type:'primary'},
- {label: '鍛ㄥ洓', value: '4',type:'primary'},
- {label: '鍛ㄤ簲', value: '5',type:'primary'},
- {label: '鍛ㄥ叚', value: '6',type:'primary'},
- {label: '鍛ㄦ棩', value: '7',type:'primary'}
+ {label: '鍛ㄤ竴', value: '鍛ㄤ竴',type:'primary'},
+ {label: '鍛ㄤ簩', value: '鍛ㄤ簩',type:'primary'},
+ {label: '鍛ㄤ笁', value: '鍛ㄤ笁',type:'primary'},
+ {label: '鍛ㄥ洓', value: '鍛ㄥ洓',type:'primary'},
+ {label: '鍛ㄤ簲', value: '鍛ㄤ簲',type:'primary'},
+ {label: '鍛ㄥ叚', value: '鍛ㄥ叚',type:'primary'},
+ {label: '鍛ㄦ棩', value: '鍛ㄦ棩',type:'primary'}
],
currentTable:'ValueTable0',
addVisible:false,
@@ -399,7 +399,8 @@
reviewerNonproductiveTime:'',
auxiliaryProject:'',
reviewerRemark:'',
- nameUser: ''
+ nameUser: '',
+ name: ''
},
checkVisible:false,
checkLoadN:false,
@@ -507,6 +508,7 @@
this.entity.dateTime.push(formattedDate2);
this.componentData1.entity.dateTime.push(formattedDate1);
this.componentData1.entity.dateTime.push(formattedDate2);
+ this.componentData1.entity.dateTime = JSON.stringify(this.componentData1.entity.dateTime)
this.refreshTable()
},
getPower(){
@@ -573,7 +575,9 @@
if(this.currentTable=='ValueTable0'){
entity.state = this.entity.state
this.componentData.entity = {...this.componentData.entity,...entity}
- this.$refs['ValueTable0'].selectList(e)
+ this.$nextTick(() => {
+ this.$refs['ValueTable0'].selectList(e)
+ })
}else{
this.componentData1.entity = {...this.componentData1.entity,...entity}
this.$refs['ValueTable1'].selectList(e)
@@ -920,7 +924,4 @@
height: calc(100% - 60px - 80px - 10px - 40px - 25px);
padding: 20px;
}
->>>.el-dialog__wrapper {
- z-index: 9999 !important; /* 鏍规嵁闇�瑕佽皟鏁村眰绾� */
-}
</style>
--
Gitblit v1.9.3