yuansh 2 years ago
parent
commit
131845a1c5
1 changed files with 21 additions and 16 deletions
  1. 21 16
      src/views/activiti/form/demoForm2.vue

+ 21 - 16
src/views/activiti/form/demoForm2.vue

@@ -162,7 +162,7 @@ export default {
     },
     created () {
         window.deleteRow = this.deleteRow
-        console.log('流程数据', this.processData)
+        // console.log('流程数据', this.processData)
         // 加载一些下拉选择数据等
         // this.getDataList()
         let businessTable = ''
@@ -379,6 +379,7 @@ export default {
                     if (res.success) {
                         let formData = res.result
                         formData.tableName = r.tableName
+                        // console.log("taboe",formData);
                         this.data = formData
                         // 如果表单是手机端的子表则
                         if (this.isSJ) {
@@ -469,17 +470,17 @@ export default {
                                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]})   
-							     }
-							   
+                               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 => {
@@ -610,10 +611,12 @@ 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 == 'regular_employee_apply'){//员工转正申请:申请人部门
+            this.$refs.KFB.setData({apply_department:this.deptInfo[value]})   
+          }
+          if(key == 'regular_employee' && this.processData.businessTable == 'regular_employee_apply'){//员工转正申请:转正人员岗位
+            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]})   
           }
@@ -705,6 +708,8 @@ export default {
             // 通过函数获取数据
             this.$refs.KFB.getData()
                 .then(res => {
+                  let formData1 = JSON.parse(JSON.stringify(res))
+                  console.log("orl",formData1)
                     // 处理手机端子表数据
                     if (this.isSJ) {
                         this.itemData(res)