Merge branch 'dev-1124' into 'release'

去除服务商品的条形码必填校验

去除服务商品的条形码必填校验

See merge request !233

src/views/goods/create-good.vue

@@ -847,7 +847,7 @@
       this.rules = originRules;
       this.rules1 = originRules1;
       this.rules2 = originRules2;
-      this.rules2.barCode = originRules.barCode;
+      // this.rules2.barCode = originRules.barCode;
 
       this.jumPathThird = '/goods-manage?storeId='+storeId
       //this.jumPathThird = '/create-good?id=add&storeId=46'

src/views/goods/rules.js

@@ -66,10 +66,10 @@ const rules1 = {
 }
 
 const rules2 = {
-  barCode: [
-    { required: true, message: "请输入条形码", trigger: "submit" },
-    { validator: checkBarcode, trigger: "submit" }
-  ],
+  // barCode: [
+  //   { required: true, message: "请输入条形码", trigger: "submit" },
+  //   { validator: checkBarcode, trigger: "submit" }
+  // ],
   checkName: [{ required: true, message: "请输入检测名称", trigger: "blur" }],
   hospitalName: [{ required: true, message: "请输入医疗机构名称", trigger: "blur" }],
   hospitalType: [{ required: true, message: "请选择医疗机构类型", trigger: "blur" }],