From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b3-work-time-management/work-time-management.vue | 76 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 30 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 d061a24..add61f4 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
@@ -27,8 +27,8 @@
size="small"
type="daterange"
range-separator="鑷�"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" @change="refreshTable()" clearable>
</el-date-picker>
@@ -63,7 +63,7 @@
</el-radio-group>
<div style="display: flex;align-items: center;">
<p style="font-size: 14px;margin-right: 30px;">
- 鎬诲伐鏃舵眹鎬伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{ (totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��'])? (totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��']):0 }}</span> 浜ч噺宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['浜ч噺宸ユ椂姹囨��']?totalInfo['浜ч噺宸ユ椂姹囨��']:0}}</span> 杈呭姪宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['杈呭姪宸ユ椂姹囨��']?totalInfo['杈呭姪宸ユ椂姹囨��']:0}}</span>
+ 鎬诲伐鏃舵眹鎬伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{ (totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��'])? Number((totalInfo['浜ч噺宸ユ椂姹囨��']+totalInfo['杈呭姪宸ユ椂姹囨��'])).tofixed(4):0 }}</span> 浜ч噺宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['浜ч噺宸ユ椂姹囨��']?Number(totalInfo['浜ч噺宸ユ椂姹囨��']).tofixed(4):0}}</span> 杈呭姪宸ユ椂姹囨�伙細<span style="font-size: 16px;color: #3A7BFA;" v-if="totalInfo">{{totalInfo['杈呭姪宸ユ椂姹囨��']?Number(totalInfo['杈呭姪宸ユ椂姹囨��']).tofixed(4):0}}</span>
</p>
<el-button size="small" type="primary" @click="openAdd" v-show="currentTable == 'ValueTable0'&&add">褰曞叆鏁版嵁</el-button>
<el-button size="small" type="primary"
@@ -75,12 +75,11 @@
</div>
<div class="table">
<ValueTable ref="ValueTable0"
- v-if="currentTable == 'ValueTable0'"
+ v-if="currentTable == 'ValueTable0'" :isColumnWidth="true"
:url="$api.auxiliaryWorkingHoursDay.selectAuxiliaryWorkingHoursDay"
:delUrl="$api.auxiliaryWorkingHoursDay.deleteAuxiliaryWorkingHoursDay" :componentData="componentData" :key="upIndex"
@delete="handleDelete" />
- <ValueTable ref="ValueTable1"
- v-if="currentTable == 'ValueTable1'"
+ <ValueTable ref="ValueTable1" v-if="currentTable == 'ValueTable1'" :isColumnWidth="true"
:url="$api.auxiliaryOutputWorkingHours.selectAuxiliaryOutputWorkingHours" :componentData="componentData1" :key="upIndex1" />
</div>
<el-dialog :title="formData.id?'缂栬緫':'褰曞叆鏁版嵁'" :visible.sync="addVisible" width="600px" :before-close="handleClose">
@@ -162,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=='鎵瑰噯'">
@@ -333,7 +332,8 @@
}
},
requiredAdd: [],
- requiredUp: []
+ requiredUp: [],
+ needSort: ['createTime', 'name']
},
entityCopy: {},
upIndex: 0,
@@ -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,7 +400,8 @@
reviewerNonproductiveTime:'',
auxiliaryProject:'',
reviewerRemark:'',
- nameUser: ''
+ nameUser: '',
+ name: ''
},
checkVisible:false,
checkLoadN:false,
@@ -502,12 +503,13 @@
let year = currentDate.getFullYear();
let month = String(currentDate.getMonth() + 1).padStart(2, '0');
let day = String(currentDate.getDate()).padStart(2, '0');
- let formattedDate1 = `${year}-${month}-${day} 00:00:00`;
- let formattedDate2 = `${year}-${month}-${day} 23:59:59`;
+ let formattedDate1 = `${year}-${month}-${day}`;
+ let formattedDate2 = `${year}-${month}-${day}`;
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(){
@@ -557,7 +559,7 @@
getYearAndMonthAndDays(date){
return getYearAndMonthAndDays(date)
},
- refreshTable(){
+ refreshTable(e){
let entity = {}
if(this.entity.week1&&this.entity.week2){
entity.week = JSON.stringify([this.entity.week1,this.entity.week2])
@@ -574,10 +576,12 @@
if(this.currentTable=='ValueTable0'){
entity.state = this.entity.state
this.componentData.entity = {...this.componentData.entity,...entity}
- this.$refs['ValueTable0'].selectList()
+ this.$nextTick(() => {
+ this.$refs['ValueTable0'].selectList(e)
+ })
}else{
this.componentData1.entity = {...this.componentData1.entity,...entity}
- this.$refs['ValueTable1'].selectList()
+ this.$refs['ValueTable1'].selectList(e)
}
this.collectWorkingHours()
},
@@ -646,7 +650,7 @@
this.formData.nonproductiveTime = ''
this.formData.auxiliaryProject = ''
// this.addVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.collectWorkingHours()
})
}else{
@@ -667,7 +671,7 @@
this.formData.nonproductiveTime = ''
this.formData.auxiliaryProject = ''
// this.addVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.collectWorkingHours()
})
}
@@ -676,11 +680,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))
@@ -718,7 +724,7 @@
},
submitBatchCheckDialog () {
this.batchCheckDialog = false
- this.refreshTable()
+ this.refreshTable('page')
this.collectWorkingHours()
},
submitCheck(e){
@@ -757,7 +763,7 @@
if (res.code == 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.checkVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.collectWorkingHours()
})
}else{
@@ -782,7 +788,7 @@
if (res.code == 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.checkVisible = false
- this.refreshTable()
+ this.refreshTable('page')
this.collectWorkingHours()
})
}
@@ -823,8 +829,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'
@@ -908,7 +927,4 @@
height: calc(100% - 60px - 80px - 10px - 40px - 25px);
padding: 20px;
}
->>>.el-dialog__wrapper {
- z-index: 9999 !important; /* 鏍规嵁闇�瑕佽皟鏁村眰绾� */
-}
</style>
--
Gitblit v1.9.3