Merge branch 'develop' into 'FOTON'

入库发起

See merge request LAWS/laws-system-front-FOTON!296

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1721,12 +1721,23 @@ export default {
         if(this.form.standInData === '1') {
           this.rules.standYear[0].required = false;
           this.rules.standName[0].required = false
+          this.rules.standNature[0].required = false
         } else {
           this.rules.standYear[0].required = true;
           this.rules.standName[0].required = true
+          this.rules.standNature[0].required = true
         }
       }
     },
+   /* 'form.signFlag' : {
+      handler: function () {
+        if (this.form.signFlag === '1') {
+          this.roleRules.jlUserName[0].required = true
+        } else {
+          this.roleRules.jlUserName[0].required = false
+        }
+      }
+    },*/
     /*'form.standInData': {
       handler: function (val) {
         this.verifySarStandard = false

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -2666,9 +2666,11 @@ export default {
         if(this.form.standInData === '1') {
           this.rules.standYear[0].required = false;
           this.rules.standName[0].required = false
+          this.rules.standNature[0].required = false
         } else {
           this.rules.standYear[0].required = true;
           this.rules.standName[0].required = true
+          this.rules.standNature[0].required = true
         }
       }
     },