From 15228767ddcd4c8c254ac87c527ebcfbd06e68ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 七月 2024 18:04:53 +0800
Subject: [PATCH] 修复
---
src/components/do/b3-work-time-management/work-time-management.vue | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 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 bea077b..b1a9914 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
@@ -170,6 +170,9 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="澶嶆牳璇存槑:">
+ <el-input v-model="formData0.reviewerRemark" type="textarea" :rows="3" size="small" :disabled="title=='鎵瑰噯'"></el-input>
+ </el-form-item>
</el-form>
</el-col>
<el-col :span="12">
@@ -178,6 +181,9 @@
<el-input v-model="formData0.number" size="small" :disabled="title=='鎵瑰噯'"></el-input>
</el-form-item>
<el-form-item label="鏁伴噺:" required>
+ <el-input v-model="formData0.amount" size="small" :disabled="title=='鎵瑰噯'"></el-input>
+ </el-form-item>
+ <el-form-item label="澶嶆牳鏁伴噺:" required>
<el-input v-model="formData0.reviewerNumber" size="small" :disabled="title=='鎵瑰噯'"></el-input>
</el-form-item>
<el-form-item label="鏍稿噯宸ユ椂:">
@@ -192,12 +198,6 @@
</el-form>
</el-col>
</el-row>
- <el-form :model="formData0" label-width="90px">
- <el-form-item label="澶嶆牳璇存槑:">
- <el-input v-model="formData0.reviewerRemark" type="textarea"
- :rows="3" size="small" :disabled="title=='鎵瑰噯'"></el-input>
- </el-form-item>
- </el-form>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="submitCheck(0)" :loading="checkLoadN">{{title=='瀹℃牳'?'涓嶉�氳繃':'涓嶆壒鍑�'}}</el-button>
@@ -341,7 +341,7 @@
entity: {
week: null,
weekDay: null,
- dateTime: null,
+ dateTime: [],
name:null,
orderBy: {
field: 'id',
@@ -363,13 +363,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,
@@ -400,6 +400,7 @@
reviewerNonproductiveTime:'',
auxiliaryProject:'',
reviewerRemark:'',
+ nameUser: ''
},
checkVisible:false,
checkLoadN:false,
@@ -505,6 +506,9 @@
let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
this.entity.dateTime.push(formattedDate1);
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(){
@@ -820,8 +824,21 @@
return String(d)
},
collectWorkingHours(){
+ let entity = {}
+ if(this.entity.week1&&this.entity.week2){
+ entity.week = JSON.stringify([this.entity.week1,this.entity.week2])
+ }else{
+ entity.week = ''
+ }
+ if(this.entity.dateTime){
+ entity.dateTime = JSON.stringify(this.entity.dateTime)
+ }else{
+ entity.dateTime = ''
+ }
+ entity.weekDay = this.entity.weekDay
+ entity.name = this.entity.name
this.$axios.post(this.$api.auxiliaryOutputWorkingHours.collectWorkingHours,{
- entity:this.componentData.entity
+ entity:entity
}, {
headers: {
'Content-Type': 'application/json'
--
Gitblit v1.9.3