Merge remote-tracking branch 'origin/develop' into develop

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

@@ -1238,7 +1238,27 @@
             TreeSelectNew
         },
         data () {
-            return {
+          const validateQcdw = (rule, value, callback) => {
+            if(this.form.standInData === '0'){
+              if (value === null ||  value.length === 0) {
+                callback(new Error('请选择起草单位！'))
+              } else {
+                callback()
+              }
+            }
+            callback()
+          };
+          const validateCysd = (rule, value, callback) => {
+            if(this.form.standInData === '0'){
+              if (value === '') {
+                callback(new Error('请选择我司参与深度！'))
+              } else {
+                callback()
+              }
+            }
+            callback()
+          }
+          return {
               fileList: [],
               caFileList: [],
               FBGBJBDFileList: [],
@@ -1477,10 +1497,10 @@
                         { required: true, message: '请选择标准发布日期', trigger: 'change' }
                     ],
                     qcdw: [
-                        { required: true, message: '请选择起草单位', trigger: 'change' }
+                        { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }
                     ],
                     cysd: [
-                        { required: true, message: '请选择我司参与深度', trigger: 'change' }
+                        { required: true, message: '请选择我司参与深度', validator: validateCysd, trigger: 'change' }
                     ],
                 },
                 zrUserIds: [], // 选择多个会签责任人