From 51bfe4a889a45a1733cc6542f3bc624ad1675f33 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 31 五月 2024 09:27:04 +0800
Subject: [PATCH] 完善工时管理
---
src/components/do/b1-ins-order/add.vue | 2
src/components/do/b3-work-time-management/work-time-management.vue | 131 ++++++++++++++++++++++++++++++++-----------
src/components/do/b3-work-time-management/work-time-statistics.vue | 4
src/components/do/b1-ins-order/fiberoptic-config.vue | 1
src/assets/api/controller.js | 5 +
5 files changed, 105 insertions(+), 38 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index dc2db2a..84b36a2 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -28,6 +28,7 @@
companies,
auxiliaryOutputWorkingHours,
auxiliaryWorkingHoursDay,
+ auxiliaryCorrectionHours,
}
}
@@ -319,3 +320,7 @@
check: "/auxiliaryWorkingHoursDay/check", //瀹℃牳
approve: "/auxiliaryWorkingHoursDay/approve", //鎵瑰噯
}
+
+const auxiliaryCorrectionHours = {
+ selectAuxiliaryCorrectionHours: "/auxiliaryCorrectionHours/selectAuxiliaryCorrectionHours", //鏌ヨ淇宸ユ椂
+}
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index e6dfa2a..8762763 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -373,7 +373,7 @@
<el-table-column prop="section" label="鍖洪棿" width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="ask" label="瑕佹眰鍊�" min-width="220px">
<template slot-scope="scope">
- <el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea" readonly
+ <el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
:autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)" :readonly="active>1"></el-input>
</template>
</el-table-column>
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index aaa8bcb..6b301fa 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -355,7 +355,6 @@
} else {
this.bushing = []
}
- console.log(1111111,this.bushing)
},
getStandTreeBySampleType() {
this.$axios.post(this.$api.standardTree.getStandTreeBySampleType, {
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 e5dbe6f..7348983 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
@@ -174,13 +174,13 @@
<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-input v-model="formData0.reviewerNumber" size="small" :disabled="title=='鎵瑰噯'"></el-input>
</el-form-item>
<el-form-item label="鏍稿噯宸ユ椂:">
<el-input v-model="formData0.approvedWorkingHour" size="small" disabled></el-input>
</el-form-item>
- <el-form-item label="杈呭姪宸ユ椂:">
- <el-input v-model="formData0.nonproductiveTime" size="small" disabled></el-input>
+ <el-form-item label="澶嶆牳宸ユ椂:">
+ <el-input v-model="formData0.reviewerNonproductiveTime" size="small" disabled></el-input>
</el-form-item>
<el-form-item label="杈呭姪椤圭洰:">
<el-input v-model="formData0.auxiliaryProject" size="small" disabled></el-input>
@@ -254,11 +254,55 @@
tagField: {
shift:{
select:[]
+ },
+ state:{
+ select:[
+ {
+ label:'宸叉彁浜�',
+ value:'宸叉彁浜�',
+ type:'primary'
+ },
+ {
+ label:'宸插鏍�',
+ value:'宸插鏍�',
+ type:'warning'
+ },
+ {
+ label:'宸叉壒鍑�',
+ value:'宸叉壒鍑�',
+ type:'success'
+ },
+ ]
+ },
+ weekDay:{
+ select:[]
}
},
linkEvent: {},
selectField: {
shift:{
+ select:[]
+ },
+ state:{
+ select:[
+ {
+ label:'宸叉彁浜�',
+ value:'宸叉彁浜�',
+ type:'primary'
+ },
+ {
+ label:'宸插鏍�',
+ value:'宸插鏍�',
+ type:'warning'
+ },
+ {
+ label:'宸叉壒鍑�',
+ value:'宸叉壒鍑�',
+ type:'success'
+ },
+ ]
+ },
+ weekDay:{
select:[]
}
},
@@ -292,13 +336,13 @@
entityCopy1: {},
upIndex1:100,
weekList:[
- {label: '鏄熸湡涓�', value: '1'},
- {label: '鏄熸湡浜�', value: '2'},
- {label: '鏄熸湡涓�', value: '3'},
- {label: '鏄熸湡鍥�', value: '4'},
- {label: '鏄熸湡浜�', value: '5'},
- {label: '鏄熸湡鍏�', value: '6'},
- {label: '鏄熸湡鏃�', value: '7'}
+ {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'}
],
currentTable:'ValueTable0',
addVisible:false,
@@ -324,9 +368,9 @@
createUser:'',
shift:'',
number:'',
- amount:'',
+ reviewerNumber:'',
approvedWorkingHour:'',
- nonproductiveTime:'',
+ reviewerNonproductiveTime:'',
auxiliaryProject:'',
reviewerRemark:'',
},
@@ -387,21 +431,21 @@
this.formData.nonproductiveTime = this.formData.amount*val
}
},
- 'formData0.amount'(val){
+ 'formData0.reviewerNumber'(val){
if(val){
if(!isNaN(val)){
if(this.formData0.approvedWorkingHour){
- this.formData0.nonproductiveTime = this.formData0.approvedWorkingHour*val
+ this.formData0.reviewerNonproductiveTime = this.formData0.approvedWorkingHour*val
}
}else{
this.$message.error('璇疯緭鍏ユ暟瀛�')
- this.formData0.amount = ''
+ this.formData0.reviewerNumber = ''
}
}
},
'formData0.approvedWorkingHour'(val){
- if(val&&this.formData0.amount){
- this.formData0.nonproductiveTime = this.formData0.amount*val
+ if(val&&this.formData0.reviewerNumber){
+ this.formData0.reviewerNonproductiveTime = this.formData0.reviewerNumber*val
}
}
},
@@ -412,6 +456,8 @@
this.selectshiftByUser()
this.entityCopy = this.HaveJson(this.componentData.entity);
this.entityCopy1 = this.HaveJson(this.componentData1.entity);
+ this.componentData.tagField.weekDay.select = this.weekList
+ this.componentData.selectField.weekDay.select = this.weekList
},
methods:{
getYearAndMonthAndDays(date){
@@ -534,14 +580,16 @@
this.$message.error('璇疯緭鍏ユ暟閲�')
return
}
- this.checkLoadY = true
+
if(this.title == '瀹℃牳'){
- // if(e==0){
- // // 瀹℃牳涓嶉�氳繃
- // }else{
- // // 瀹℃牳閫氳繃
- // }
- this.formData0.state = e==0?'瀹℃牳涓嶉�氳繃':'瀹℃牳閫氳繃'
+ if(e==0){
+ // 瀹℃牳涓嶉�氳繃
+ this.checkLoadN = true
+ }else{
+ // 瀹℃牳閫氳繃
+ this.checkLoadY = true
+ }
+ this.formData0.state = e==0?this.formData0.state:'宸插鏍�'
this.$axios.post(this.$api.auxiliaryWorkingHoursDay.check, {
...this.formData0
}, {
@@ -549,7 +597,13 @@
'Content-Type': 'application/json'
}
}).then(res => {
- this.checkLoadY = false
+ if(e==0){
+ // 瀹℃牳涓嶉�氳繃
+ this.checkLoadN = false
+ }else{
+ // 瀹℃牳閫氳繃
+ this.checkLoadY = false
+ }
if (res.code == 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.checkVisible = false
@@ -557,20 +611,24 @@
this.collectWorkingHours()
})
}else{
- // if(e==0){
- // // 瀹℃牳涓嶉�氳繃
- // }else{
- // // 瀹℃牳閫氳繃
- // }
+ if(e==0){
+ this.checkLoadN = true
+ }else{
+ this.checkLoadY = true
+ }
this.$axios.post(this.$api.auxiliaryWorkingHoursDay.approve, {
id:this.formData0.id,
- state:e==0?'鎵瑰噯涓嶉�氳繃':'鎵瑰噯閫氳繃'
+ state:e==0?'宸叉彁浜�':'宸叉壒鍑�'
}, {
headers: {
'Content-Type': 'application/json'
}
}).then(res => {
- this.checkLoadY = false
+ if(e==0){
+ this.checkLoadN = false
+ }else{
+ this.checkLoadY = false
+ }
if (res.code == 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.checkVisible = false
@@ -628,8 +686,13 @@
if(this.formData.number){
this.$axios.post(this.$api.auxiliaryWorkingHoursDay.selectAuxiliaryWorkingHoursByNumber+'?number='+this.formData.number).then(res => {
this.auxiliaryWorking = res.data
- this.formData.approvedWorkingHour = this.auxiliaryWorking.approvedWorkingHour
- this.formData.auxiliaryProject = this.auxiliaryWorking.auxiliaryProject
+ if(this.addVisible){
+ this.formData.approvedWorkingHour = this.auxiliaryWorking.approvedWorkingHour
+ this.formData.auxiliaryProject = this.auxiliaryWorking.auxiliaryProject
+ }else if(this.title=='瀹℃牳'&&this.checkVisible){
+ this.formData0.approvedWorkingHour = this.auxiliaryWorking.approvedWorkingHour
+ this.formData0.auxiliaryProject = this.auxiliaryWorking.auxiliaryProject
+ }
})
}
},
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 321f637..06e33e7 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -52,8 +52,8 @@
:url="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours"
:componentData="componentData" :inputUrl="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :downUrl="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours" :key="upIndex" />
<ValueTable ref="ValueTable1"
- v-show="currentTable == 'value1'"
- :url="$api.auxiliaryWorkingHours.selectAuxiliaryWorkingHours"
+ v-if="currentTable == 'value1'"
+ :url="$api.auxiliaryCorrectionHours.selectAuxiliaryCorrectionHours"
:componentData="componentData0" :key="upIndex" />
</div>
</div>
--
Gitblit v1.9.3