Merge branch 'v3.0-dev-before' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into v3.0-dev-before

src/views/goodStore/goodsCost/components/baseFormNormal.vue

@@ -1142,7 +1142,7 @@ import { replaceTextWrapAndSpace } from "@/utils";
 import ProductModal from "./productModal.vue";
 import ProductListModal from "./productListModal.vue";
 import { isStockOptions } from "@/assets/js/statusList";
-
+import { isArray } from "@/utils/validate";
 import {
   options1,
   options2,
@@ -2158,18 +2158,8 @@ export default {
             lead_time: lead_time || "",
             sample_day: sample_day || "",
             good_thumb_img: good_thumb_img || "",
-            good_img: good_img
-              ? Object.prototype.toString.call(good_img) === "[object Array]"
-                ? []
-                : (good_img || "").split(",")
-              : [],
-            good_info_img: good_info_img
-              ? (Object.prototype.toString.call(good_info_img) ===
-                "[object Array]"
-                  ? []
-                  : good_info_img || ""
-                ).split(",")
-              : [],
+            good_img: good_img?!isArray(good_img || "") ? good_img.split(",") : []:[],
+            good_info_img: good_info_img || [],
             //固定阶梯成本
             demo_fee: demo_fee || "",
             open_fee: open_fee || "",
@@ -2408,7 +2398,7 @@ export default {
     async noble_metalsearchChange(e) {
       const { id, code, label } = e;
       this.ruleForm.noble_metal = id || "";
-      tthis.$refs.ruleForm && his.$refs.ruleForm.validateField("noble_metal");
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("noble_metal");
       await this.get_all_fee();
     },
     async areaChange(e, key) {

src/views/goodStore/supplierGoodsCost/components/baseForm.vue

@@ -1159,7 +1159,7 @@ import { replaceTextWrapAndSpace } from "@/utils";
 import ProductModal from "./productModal.vue";
 import ProductListModal from "./productListModal.vue";
 import { isStockOptions } from "@/assets/js/statusList";
-
+import { isArray } from "@/utils/validate";
 import {
   options1,
   options2,
@@ -2192,18 +2192,8 @@ export default {
             lead_time: lead_time || "",
             sample_day: sample_day || "",
             good_thumb_img: good_thumb_img || "",
-            good_img: good_img
-              ? Object.prototype.toString.call(good_img) === "[object Array]"
-                ? []
-                : (good_img || "").split(",")
-              : [],
-            good_info_img: good_info_img
-              ? (Object.prototype.toString.call(good_info_img) ===
-                "[object Array]"
-                  ? []
-                  : good_info_img || ""
-                ).split(",")
-              : [],
+            good_img: good_img ?!isArray(good_img || "") ? good_img.split(",") : []:[],
+            good_info_img: good_info_img?!isArray(good_info_img || "") ? good_info_img.split(",") : []:[],
             //固定阶梯成本
             demo_fee: demo_fee || "",
             open_fee: open_fee || "",
@@ -2446,7 +2436,7 @@ export default {
     async noble_metalsearchChange(e) {
       const { id, code, label } = e;
       this.ruleForm.noble_metal = id || "";
-      tthis.$refs.ruleForm && his.$refs.ruleForm.validateField("noble_metal");
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("noble_metal");
       await this.get_all_fee();
     },
     async areaChange(e, key) {

src/views/goodStore/supplierGoodsCost/components/baseFormNormal.vue

@@ -1157,7 +1157,7 @@ import { replaceTextWrapAndSpace } from "@/utils";
 import ProductModal from "./productModal.vue";
 import ProductListModal from "./productListModal.vue";
 import { isStockOptions } from "@/assets/js/statusList";
-
+import { isArray } from "@/utils/validate";
 import {
   options1,
   options2,
@@ -2184,18 +2184,8 @@ export default {
             lead_time: lead_time || "",
             sample_day: sample_day || "",
             good_thumb_img: good_thumb_img || "",
-            good_img: good_img
-              ? Object.prototype.toString.call(good_img) === "[object Array]"
-                ? []
-                : (good_img || "").split(",")
-              : [],
-            good_info_img: good_info_img
-              ? (Object.prototype.toString.call(good_info_img) ===
-                "[object Array]"
-                  ? []
-                  : good_info_img || ""
-                ).split(",")
-              : [],
+            good_img: good_img ?!isArray(good_img || "") ? good_img.split(",") : []:[],
+            good_info_img: good_info_img?!isArray(good_info_img || "") ? good_info_img.split(",") : []:[],
             //固定阶梯成本
             demo_fee: demo_fee || "",
             open_fee: open_fee || "",
@@ -2437,7 +2427,7 @@ export default {
     async noble_metalsearchChange(e) {
       const { id, code, label } = e;
       this.ruleForm.noble_metal = id || "";
-      tthis.$refs.ruleForm && his.$refs.ruleForm.validateField("noble_metal");
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("noble_metal");
       await this.get_all_fee();
     },
     async areaChange(e, key) {