Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/form/demoForm2.vue

@@ -468,6 +468,19 @@ export default {
                                var that = this
                                setTimeout(function(){
                                that.$refs.KFB.setData({[item[0].label]:that.$store.getters.userInfo.username})   
+							   
+							     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]})   
+							     }
+							     if(that.processData.businessTable == 'seal_apply'){//用印申请单
+							       that.$refs.KFB.setData({apply_department:that.deptInfo[that.$store.getters.userInfo.username]})   
+							     }
+							     if(that.processData.businessTable == 'separation_application'){//离职申请
+							       that.$refs.KFB.setData({job_title:that.postInfo[that.$store.getters.userInfo.username]})   
+							     }
+							   
+							   
                                   },0)
                                   annualLeave({username:that.$store.getters.userInfo.username}).then(res => {
                                    if (res.success) {
@@ -597,6 +610,10 @@ export default {
          },
         // 表单字段数值发生改变事件
         handleChange (value, key) {  
+			if(key == 'proposer' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请
+			  this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
+			  this.$refs.KFB.setData({job_title:this.postInfo[value]})   
+			}
           if(key == 'proposer' && this.processData.businessTable == 'seal_apply'){//用印申请单
             this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
           }