员工请假单-剩余有年假的情况下不允许执行病假

src/views/activiti/form/demoForm2.vue

@@ -354,8 +354,8 @@ export default {
                                 this.cvarr = []
                                 this.cvarr = []
                                 this.fArr =[]
-                                //遍历help
-                                this.forHelp(this.jsonData)
+                               //遍历help
+                               this.forHelp(this.jsonData)
                                 this.jsonDataSave = JSON.parse(JSON.stringify(res.result.jsonContent))
                                 // 获取申请人信息
                                 this.getApplicant()
@@ -363,6 +363,7 @@ export default {
                                 this.listUpdateModel()
                                 if (!this.isNew) {
                                     this.init()
+                               
                                 }
                             } else {
                                 this.$message.error(userData.message)
@@ -379,8 +380,8 @@ export default {
                 // this.jsonData.list[0].trs[3].tds[2].list[0].help = 'today'
                  this.cvarr = []
                  this.fArr =[]
-                 //遍历help（计算）
-                 this.forHelp(this.jsonData)               
+                //  //遍历help（计算）
+                //  this.forHelp(this.jsonData)               
                 // 获取申请人信息
                 this.getApplicant()
                 // 如果是手机端子表初始化子表model
@@ -388,6 +389,8 @@ export default {
                 // window.jsonData=this.jsonData;
                 if (!this.isNew) {
                     this.init()
+                }else{
+                    this.forHelp(this.jsonData)      
                 }
             }
             
@@ -887,6 +890,9 @@ export default {
                       if(category == '事假' &&timeC>=180&&that.leave>=0.5){
                           that.$refs.KFB.setData({unit:'天'})
                           that.$refs.KFB.setData({leave_category:'年假'})
+                        }if(category == '病假' &&that.leave>0){
+                          that.$refs.KFB.setData({leave_category:''})
+                          that.$message.error('剩余年假未使用，不能执行病假！');
                         }else if(category == '年假' && that.leave<0.5){   //类型为年假，剩余年假小于0.5
                              that.$refs.KFB.setData({unit:'分'}) 
                              that.$refs.KFB.setData({leave_category:''})
@@ -915,7 +921,12 @@ export default {
                 },0)
             }else if(key == 'leave_category' && value == '病假'){  //病假
                 setTimeout(function(){
-                 that.$refs.KFB.setData({unit:'分'})   
+                    if(that.leave >0){  //剩余年假大于0.5
+                        that.$refs.KFB.setData({leave_category:''})
+                        that.$message.error('剩余年假未使用，不能执行病假！'); 
+                    }else{
+                        that.$refs.KFB.setData({unit:'天'}) 
+                    }
                 },0)
             }else if(key == 'leave_category' && value == '年假'){//年假
                  setTimeout(function(){