|
|
@@ -243,9 +243,9 @@ export default {
|
|
|
})
|
|
|
this.dynamicData.personListJn = aa
|
|
|
//技能博物馆 --- 全馆值班 此时无法触碰到handleChange方法 手动触发
|
|
|
- if(this.processData.businessTable == 'bwg_house_duty'){
|
|
|
- this.handleChange()
|
|
|
- }
|
|
|
+ // if(this.processData.businessTable == 'bwg_house_duty'){
|
|
|
+ // this.handleChange()
|
|
|
+ // }
|
|
|
|
|
|
} else {
|
|
|
this.$message.error(res.message)
|
|
|
@@ -553,7 +553,7 @@ export default {
|
|
|
this.printDisable = true
|
|
|
}
|
|
|
},
|
|
|
- defualtData(item){
|
|
|
+ defualtData(item){
|
|
|
if(item[1].label =='today'){
|
|
|
item[0].value =moment(new Date().toLocaleDateString()).format('YYYY-MM-DD HH:mm')
|
|
|
var that = this
|
|
|
@@ -565,7 +565,14 @@ export default {
|
|
|
var that = this
|
|
|
setTimeout(function(){
|
|
|
that.$refs.KFB.setData({[item[0].label]:that.$store.getters.userInfo.username})
|
|
|
-
|
|
|
+ var jnDeparment = ''
|
|
|
+ if(getProjctName() =='技能博物馆'){ //获取技能博物馆登录人对应的部门
|
|
|
+ that.dynamicData.personListJn.map(item =>{
|
|
|
+ if(item.label == that.$store.getters.nickname){
|
|
|
+ jnDeparment = item.departIds_dictText
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
if(that.processData.businessTable == 'regular_employee_apply'){//员工转正申请
|
|
|
that.$refs.KFB.setData({apply_department:that.deptInfo[that.$store.getters.userInfo.username]})
|
|
|
// that.$refs.KFB.setData({job_title:that.postInfo[that.$store.getters.userInfo.username]})
|
|
|
@@ -595,8 +602,10 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ //技能博物馆-任务--默认当前登陆人
|
|
|
+ if(that.processData.businessTable == 'task_management'){
|
|
|
+ that.$refs.KFB.setData({initiate_department:jnDeparment})
|
|
|
+ }
|
|
|
},0)
|
|
|
annualLeave({username:that.$store.getters.userInfo.username}).then(res => {
|
|
|
if (res.success) {
|
|
|
@@ -1026,7 +1035,6 @@ export default {
|
|
|
},
|
|
|
// 我的待办点击通过保存专用
|
|
|
handleSubmit2 (e) {
|
|
|
- debugger
|
|
|
// return new Promise((resolve)=>{
|
|
|
// 通过函数获取数据
|
|
|
this.$refs.KFB.getData()
|
jbb