From 996e3e343760bcfa23b55138f85abd62d6ebfb22 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 25 十二月 2024 09:02:07 +0800
Subject: [PATCH] 报告预览调试
---
src/components/do/b3-work-time-management/work-time-management.vue | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 e8665b8..d99450d 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=='鎵瑰噯'">
@@ -332,7 +332,8 @@
}
},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'name']
},
entityCopy: {},
upIndex: 0,
@@ -399,7 +400,8 @@
reviewerNonproductiveTime:'',
auxiliaryProject:'',
reviewerRemark:'',
- nameUser: ''
+ nameUser: '',
+ name: ''
},
checkVisible:false,
checkLoadN:false,
@@ -528,7 +530,6 @@
if (power[i].menuMethod == 'insertAuxiliaryWorkingHoursDay') {
add = true
}
- console.log(add)
if (power[i].menuMethod == 'updateAuxiliaryWorkingHoursDay') {
up = true
}
@@ -574,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)
@@ -676,11 +679,13 @@
this.title = '瀹℃牳'
this.formData0 = row;
this.checkVisible = true
+ this.formData0.reviewerNumber = this.formData0.amount
},
handleRatify(row){
this.title = '鎵瑰噯'
this.formData0 = row;
this.checkVisible = true
+ this.formData0.reviewerNumber = this.formData0.amount
},
handleChangeTask (row) {
this.ValueTable0Selected = JSON.parse(JSON.stringify(row))
@@ -741,7 +746,7 @@
}
this.formData0.state = e==0?this.formData0.state:'宸插鏍�'
this.$axios.post(this.$api.auxiliaryWorkingHoursDay.check, {
- ...this.formData0
+ auxiliaryWorkingHoursDays:[this.formData0]
}, {
headers: {
'Content-Type': 'application/json'
@@ -767,8 +772,10 @@
this.checkLoadY = true
}
this.$axios.post(this.$api.auxiliaryWorkingHoursDay.approve, {
- id:this.formData0.id,
- state:e==0?'宸叉彁浜�':'宸叉壒鍑�'
+ auxiliaryWorkingHoursDays:[{
+ id:this.formData0.id,
+ state:e==0?'宸叉彁浜�':'宸叉壒鍑�'
+ }]
}, {
headers: {
'Content-Type': 'application/json'
@@ -921,7 +928,4 @@
height: calc(100% - 60px - 80px - 10px - 40px - 25px);
padding: 20px;
}
->>>.el-dialog__wrapper {
- z-index: 9999 !important; /* 鏍规嵁闇�瑕佽皟鏁村眰绾� */
-}
</style>
--
Gitblit v1.9.3