|
|
@@ -208,76 +208,76 @@ export default {
|
|
|
if (dictData.success) {
|
|
|
this.dynamicData = dictData.result.dicList
|
|
|
//技能博物馆部门信息
|
|
|
- // this.getAction('/sys/sysDepart/queryMyDeptList').then(res => {
|
|
|
- // if (res.success) {
|
|
|
- // var aa=[]
|
|
|
- // res.result.map(item=>{
|
|
|
- // aa.push({value:item.departName,label:item.departName})
|
|
|
- // })
|
|
|
- // this.dynamicData.department = aa
|
|
|
- // } else {
|
|
|
- // this.$message.error(res.message)
|
|
|
- // }
|
|
|
- // })
|
|
|
+ this.getAction('/sys/sysDepart/queryMyDeptList').then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ var aa=[]
|
|
|
+ res.result.map(item=>{
|
|
|
+ aa.push({value:item.departName,label:item.departName})
|
|
|
+ })
|
|
|
+ this.dynamicData.department = aa
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ })
|
|
|
//技能博物馆人员信息
|
|
|
- // this.getAction('/sys/user/list', { pageSize: -1}).then(res => {
|
|
|
- // if (res.success) {
|
|
|
- // var aa = []
|
|
|
- // res.result.records.map(item =>{
|
|
|
- // aa.push(
|
|
|
- // {value:item.realname,
|
|
|
- // label:item.realname,
|
|
|
- // workNo:item.workNo,
|
|
|
- // post:item.post,
|
|
|
- // nInductionTime:item.nInductionTimenInductionTime,
|
|
|
- // phone:item.phone,
|
|
|
- // telephone:item.telephone,
|
|
|
- // departIds_dictText:item.departIds_dictText,
|
|
|
- // departIds:item.departIds
|
|
|
- // })
|
|
|
- // })
|
|
|
- // this.dynamicData.personListJn = aa
|
|
|
- // //技能博物馆 --- 全馆值班 此时无法触碰到handleChange方法 手动触发
|
|
|
- // if(this.processData.businessTable == 'bwg_house_duty'){
|
|
|
- // this.handleChange()
|
|
|
- // }
|
|
|
+ this.getAction('/sys/user/list', { pageSize: -1}).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ var aa = []
|
|
|
+ res.result.records.map(item =>{
|
|
|
+ aa.push(
|
|
|
+ {value:item.realname,
|
|
|
+ label:item.realname,
|
|
|
+ workNo:item.workNo,
|
|
|
+ post:item.post,
|
|
|
+ nInductionTime:item.nInductionTimenInductionTime,
|
|
|
+ phone:item.phone,
|
|
|
+ telephone:item.telephone,
|
|
|
+ departIds_dictText:item.departIds_dictText,
|
|
|
+ departIds:item.departIds
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.dynamicData.personListJn = aa
|
|
|
+ //技能博物馆 --- 全馆值班 此时无法触碰到handleChange方法 手动触发
|
|
|
+ if(this.processData.businessTable == 'bwg_house_duty'){
|
|
|
+ this.handleChange()
|
|
|
+ }
|
|
|
|
|
|
- // } else {
|
|
|
- // this.$message.error(res.message)
|
|
|
- // }
|
|
|
- // })
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ })
|
|
|
|
|
|
//技能博物馆项目信息
|
|
|
- // this.getAction('/oa/activiti/getSelectionList',{tableName:'bwg_project_start'}).then(res => {
|
|
|
- // if (res.success) {
|
|
|
- // var aa=[]
|
|
|
- // res.result.map(item=>{
|
|
|
- // aa.push(
|
|
|
- // {value:item.project_name,
|
|
|
- // label:item.project_name,
|
|
|
- // startDate:item.start_date,
|
|
|
- // endDate:item.end_date,
|
|
|
- // projectReasons:item.project_reasons,
|
|
|
- // budgetInformation:item.budget_information
|
|
|
- // })
|
|
|
- // })
|
|
|
- // this.dynamicData.fundApproval = aa
|
|
|
- // } else {
|
|
|
- // this.$message.error(res.message)
|
|
|
- // }
|
|
|
- // })
|
|
|
+ this.getAction('/oa/activiti/getSelectionList',{tableName:'bwg_project_start'}).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ var aa=[]
|
|
|
+ res.result.map(item=>{
|
|
|
+ aa.push(
|
|
|
+ {value:item.project_name,
|
|
|
+ label:item.project_name,
|
|
|
+ startDate:item.start_date,
|
|
|
+ endDate:item.end_date,
|
|
|
+ projectReasons:item.project_reasons,
|
|
|
+ budgetInformation:item.budget_information
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.dynamicData.fundApproval = aa
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ })
|
|
|
//技能博物馆会议室信息
|
|
|
- // this.getAction('/oa/meetingRoom/all').then(res => {
|
|
|
- // if (res.success) {
|
|
|
- // var aa=[]
|
|
|
- // res.result.map(item=>{
|
|
|
- // aa.push({value:item.name,label:item.name})
|
|
|
- // })
|
|
|
- // this.dynamicData.conferenceRoom = aa
|
|
|
- // } else {
|
|
|
- // this.$message.error(res.message)
|
|
|
- // }
|
|
|
- // })
|
|
|
+ this.getAction('/oa/meetingRoom/all').then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ var aa=[]
|
|
|
+ res.result.map(item=>{
|
|
|
+ aa.push({value:item.name,label:item.name})
|
|
|
+ })
|
|
|
+ this.dynamicData.conferenceRoom = aa
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ }
|
|
|
+ })
|
|
|
// 获取用户下拉数据
|
|
|
this.getAction('/sys/user/list2', { pageSize: 20000 }).then(userData => {
|
|
|
if (res.success) {
|
|
|
@@ -703,7 +703,8 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 表单字段数值发生改变事件
|
|
|
- handleChange (value, key) {
|
|
|
+ handleChange (value, key) {
|
|
|
+ debugger
|
|
|
if(key == 'proposer' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请：申请人部门
|
|
|
this.$refs.KFB.setData({apply_department:this.deptInfo[value]})
|
|
|
}
|
jbb