限制审核人不填无法提交

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/goodsdataopera.vue

@@ -641,26 +641,42 @@
       // 审核通过
       makeSure () {
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
-            this.formData.Status !== '4' &&
-            this.formData.Status !== '5') {
+          if ((!this.auditer || this.auditer === 0) && (this.formData.Status == '0' || this.formData.Status == '10' || this.formData.Status == '3')) {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
-          if ((!this.fushenauditer || this.fushenauditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
-            this.formData.Status !== '4' &&
-            this.formData.Status !== '5') {
-            this.$message({
-              type: 'warning',
-              message: '请选择复审人！'
-            })
-            return
+          if (this.formData.Status == '10') {
+            if (!this.fushenauditer || this.fushenauditer === 0) {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
+            if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
+              if (this.selectDept === 0 || this.selectDept == '') {
+                this.$message({
+                  type: 'warning',
+                  message: '请选择专业处室！'
+                })
+                return
+              }
+            }
+            if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
+            }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
-            .Status !== '5' && this.formData.Status !== '10' ) {
+            .Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -672,7 +688,7 @@
             this.shenheForm.AuditorRemark = this.backRemark
           }
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
-            .Status !== '5') {
+            .Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -658,25 +658,40 @@
       },
       // 审核通过
       makeSure () {
-        console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
-            this.formData.Status !== '4' &&
-            this.formData.Status !== '5') {
+          if ((!this.auditer || this.auditer === 0) && (this.formData.Status == '0' || this.formData.Status == '10' || this.formData.Status == '3')) {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
-          if ((!this.fushenauditer || this.fushenauditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
-            this.formData.Status !== '4' &&
-            this.formData.Status !== '5') {
-            this.$message({
-              type: 'warning',
-              message: '请选择复审人！'
-            })
-            return
+          if (this.formData.Status == '10') {
+            if (!this.fushenauditer || this.fushenauditer === 0) {
+              this.$message({
+                type: 'warning',
+                message: '请选择复审人！'
+              })
+              return
+            }
+            if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
+              if (this.selectDept === 0 || this.selectDept == '') {
+                this.$message({
+                  type: 'warning',
+                  message: '请选择专业处室！'
+                })
+                return
+              }
+            }
+            if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
+              if (this.userOptions == null || this.userOptions.length === 0) {
+                this.$message({
+                  type: 'warning',
+                  message: '该专业科室未配置接收人！'
+                })
+                return
+              }
+            }
           }
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
             .Status !== '5' && this.formData.Status !== '10') {
@@ -686,7 +701,7 @@
             })
             return
           }
-        } else {
+        }  else {
           if (this.formData.Status === '10') {
             this.shenheForm.AuditorRemark = this.backRemark
           }