前:return resolve(false);中石油准入证编号不能为空

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/bassicoperation.vue

@@ -2960,7 +2960,7 @@ import Viewer from 'v-viewer'
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 检查是否缺少资质
                 let fileType = {
@@ -2979,7 +2979,7 @@ import Viewer from 'v-viewer'
                       type: 'warning',
                       message: res.data.message
                     })
-                    resolve(false)
+                    return resolve(false)
                   }
                   this.saveLoading = false
                 })
@@ -2990,7 +2990,7 @@ import Viewer from 'v-viewer'
             return true
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -2917,14 +2917,16 @@
               message: '中石油准入证编号不能为空！'
             })
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
-          if (this.formData.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
+          console.log(this.InStyle, this.formData.MgrUnit.indexOf('大庆油田'), '大庆油田')
+          if (this.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
             this.$message({
               type: 'warning',
               message: '中石油准入证编号不能为空！'
             })
-            return
+            this.saveLoading = false
+            return resolve(false)
           }
           if (this.formData.InStyle === '3' && this.formData.MgrUnit === '大港油田分公司') {
             this.$message({
@@ -2932,7 +2934,7 @@
               message: '二级物资准入不能选择大港油田分公司！'
             })
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
           if (valid1 && valid2) {
             api.checkBack(this.formData.BankAccount, this.formData.Id, this.$axios).then(res => {
@@ -2942,7 +2944,7 @@
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 检查是否缺少资质
                 let fileType = {
@@ -2963,18 +2965,18 @@
                       message: res.data.message
                     })
                     this.saveLoading = false
-                    resolve(false)
+                    return resolve(false)
                   }
                 })
               }
             }).catch(err => {
               this.saveLoading = false
-              resolve(false)
+              return resolve(false)
               console.error(err)
             })
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -2929,7 +2929,7 @@ import Viewer from 'v-viewer'
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 检查是否缺少资质
                 let fileType = {
@@ -2948,7 +2948,7 @@ import Viewer from 'v-viewer'
                       type: 'warning',
                       message: res.data.message
                     })
-                    resolve(false)
+                    return resolve(false)
                   }
                   this.saveLoading = false
                 })
@@ -2959,7 +2959,7 @@ import Viewer from 'v-viewer'
             return true
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -2587,7 +2587,7 @@
                   message: '该银行账号与其他公司重复'
                 })
                 this.saveLoading = false
-                resolve(false)
+                return resolve(false)
               } else {
                 // 供应商类型变更时检查是否缺少资质
                 let fileType = {
@@ -2604,18 +2604,18 @@
                       message: res.data.message
                     })
                     this.saveLoading = false
-                    resolve(false)
+                    return resolve(false)
                   }
                 })
               }
             }).catch(err => {
               this.saveLoading = false
               console.error(err)
-              resolve(false)
+              return resolve(false)
             })
           } else {
             this.saveLoading = false
-            resolve(false)
+            return resolve(false)
           }
         })
       },

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

@@ -1603,13 +1603,6 @@ export default {
         })
         return
       }
-      if (this.formData.InStyle === '3' && this.formData.MgrUnit.indexOf('大庆油田') != -1 && (this.formData.PACNumber == '' || typeof this.formData.PACNumber == 'undefined')) {
-        this.$message({
-          type: 'warning',
-          message: '中石油准入证编号不能为空！'
-        })
-        return
-      }
       if (this.formData.InStyle === '3' && this.formData.MgrUnit === '大港油田分公司') {
         this.$message({
           type: 'warning',