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

src/views/activiti/form/demoForm2.vue

@@ -955,6 +955,9 @@ export default {
           if(key == 'proposer' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请：申请人部门
             this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
           }
+          if(key == 'proposer' && this.processData.businessTable == 'request_for_overtime'){//员工转正申请：加班申请
+            this.$refs.KFB.setData({department:this.deptInfo[value]})   
+          }
           if(key == 'regular_employee' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请：转正人员岗位
             this.$refs.KFB.setData({job_title:this.postInfo[value]})   
           }