删除状态判断;审批意见判断;提交按钮方法

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -387,7 +387,7 @@
                    v-if="parseInt(activeName) < totalTab">下一步</el-button>
         <el-button type="primary"
                    size="mini"
-                   @click="nextStep()"
+                   @click="commitAudit()"
                    v-if="add_flat && IsCompanyUser == 1 && parseInt(activeName)==3">
           提交
         </el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -894,7 +894,7 @@ export default {
 
   methods: {
     checkStatus (val) {
-      if (val === '0' || val === '' || val === '-1' || val === '-2' || val === '-4') {
+      if (val === '0' || val === '' || val < '0') {
         return false
       } else {
         return true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -895,7 +895,7 @@ export default {
 
   methods: {
     checkStatus (val) {
-      if (val === '0' || val === '' || val === '-1' || val === '-2' || val === '-4') {
+      if (val === '0' || val === '' || val < '0') {
         return false
       } else {
         return true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -898,7 +898,7 @@ export default {
 
   methods: {
     checkStatus (val) {
-      if (val === '0' || val === '' || val === '-1' || val === '-2' || val === '-4') {
+      if (val === '0' || val === '' || val < '0') {
         return false
       } else {
         return true

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -632,6 +632,7 @@
           }
         } else {
           if (this.shenheForm.SuccessStatus === 1) {
+            console.log('初审')
             this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
           } else {
             this.textplaceholder = '退回意见不能少于5个字'
@@ -992,7 +993,11 @@
       },
       commonAuditMakeSure () {
         console.log('审批结果公共提交')
-        this.commonAuditParamsCheck()
+        var checkRes = this.commonAuditParamsCheck()
+        console.log(checkRes, '审批结果公共提交')
+        if (!checkRes) {
+          return false
+        }
         this.loading = true
         let params = {
           result: this.shenheForm.SuccessStatus,
@@ -1021,12 +1026,14 @@
       },
       commonAuditParamsCheck () {
         if (this.shenheForm.SuccessStatus === 1) {
+          console.log(this.shenheForm.AuditorRemarkh, '审批意见')
+          console.log(this.shenheForm.AuditorRemark.trim().length, '审批意见长度')
           if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
             })
-            return
+            return false
           }
           if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
             this.$message({
@@ -1051,6 +1058,7 @@
             return false
           }
         }
+        return true
       },
       // 二级单位分办审批会话框 ⬇
       secUnitSeparateAuditClick (val) {