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

src/views/hisStore/storeProduct/index.vue

@@ -1738,9 +1738,12 @@ export default {
         manufacturerAddress: [
           {required: true, message: "生产企业地址不能为空", trigger: "blur"}
         ],
-        reviewAudit: [
-          {required: true, message: "审核资质不能为空！", trigger: "blur"}
-        ],
+        // reviewAudit: [
+        //   {required: true, message: "审核资质不能为空！", trigger: "blur"}
+        // ],
+        // businessLink: [
+        //   { required: true, message: "非首营链接不能为空！", trigger: "change" }
+        // ],
         business: [
           { required: true, message: "营业执照不能为空！", trigger: "blur" }
         ],
@@ -1768,9 +1771,6 @@ export default {
         gmpAuth: [
           { required: true, message: "GMP认证不能为空！", trigger: "blur"  }
         ],
-        businessLink: [
-          { required: true, message: "非首营链接不能为空！", trigger: "change" }
-        ],
         indications: [
           { required: true, message: "功能主治不能为空", trigger: "blur" }
         ],
@@ -2598,6 +2598,7 @@ export default {
           }
 
           let checkBoolean = false
+          let itemErrMsg = "";
           if (this.form.specType === 0) {
             this.form.items = [];
             this.form.values = this.oneFormValidate;
@@ -2609,11 +2610,24 @@ export default {
           //验证是否填写商品编码
           this.form.values.forEach(item => {
             if (item.barCode == null || item.barCode === '') {
+              itemErrMsg = "规格/型号，商品条码不能为空！";
+              return checkBoolean = true;
+            }
+            if(item.price == null || item.price === '' || item.price === 0){
+              itemErrMsg = "规格/型号，商品售价不能为空且不能为0！";
+              return checkBoolean = true;
+            }
+            if(item.cost == null || item.cost === ''){
+              itemErrMsg = "规格/型号，商品成本价不能为空！";
+              return checkBoolean = true;
+            }
+            if(item.otPrice == null || item.otPrice === ''){
+              itemErrMsg = "规格/型号，商品原价不能为空！";
               return checkBoolean = true;
             }
           })
           if (checkBoolean) {
-            return this.$message.warning("规格，商品条码不能为空！");
+            return this.$message.warning(itemErrMsg);
           }
 
           if (this.form.specType === 1 && this.manyFormValidate.length === 0) {