build

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -83,6 +83,32 @@
                     @searchChange="platform_codesearchChange"
                   />
                 </el-form-item>
+
+                <el-form-item label="对接平台" prop="platform_type">
+                  <el-select
+                    :disabled="!ruleForm.platform_type"
+                    v-model="ruleForm.platform_type"
+                    @change="ruleForm.platform = ''"
+                    disabled
+                    placeholder="对接平台"
+                    style="width:100%"
+                  >
+                    <el-option label="有赞平台" value="1" />
+                    <el-option label="无对接" value="0" />
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="定价模式" prop="is_fixed">
+                  <el-select v-model="ruleForm.is_fixed" style="width:100%">
+                    <el-option
+                      v-for="p in pricingOptions"
+                      :key="p.value"
+                      :value="p.value"
+                      :label="p.label"
+                    />
+                  </el-select>
+                </el-form-item>
+
                 <el-form-item label="上线原因" prop="online_reason">
                   <el-input
                     :disabled="false"
@@ -123,13 +149,16 @@ import asyncRequest from "@/apis/service/goodStore/dealGoodsPool";
 import resToken from "@/mixins/resToken";
 export default {
   name: "brand",
-  props: ["showModel", "id", "sitem"],
+  props: ["showModel", "id", "sitem", "isNobleMetal"],
   mixins: [resToken],
   data() {
     return {
       loading: false,
+      isYZPlatform:false,
       showModelThis: this.showModel,
       ruleForm: {
+        platform_type: "",
+        is_fixed: "",
         platform: "", //string	平台id
         online_reason: "", //string	上线原因
         online_remark: "" //string	上线备注
@@ -141,6 +170,20 @@ export default {
       ],
       rulesThis: this.rules,
       rules: {
+        is_fixed: [
+          {
+            required: true,
+            message: "请选择定价模式",
+            trigger: "change"
+          }
+        ],
+        platform_type: [
+          {
+            required: true,
+            message: "请选择对接平台",
+            trigger: "change"
+          }
+        ],
         platform: [
           {
             required: true,
@@ -166,6 +209,11 @@ export default {
     };
   },
   watch: {
+    isFiexed() {
+      if (this.ruleForm.is_fixed === "0") {
+        this.ruleForm.is_fixed = "";
+      }
+    },
     showModel: function(val) {
       this.showModelThis = val;
       if (val) {
@@ -178,7 +226,35 @@ export default {
       }
     }
   },
+  computed:{
+    isFiexed() {
+      return (
+        !this.isYZPlatform &&
+        this.isNobleMetal &&
+        this.ruleForm.platform_type !== "1"
+      );
+    },
+    pricingOptions() {
+      return [
+        { value: "1", label: "一口价" },
+        ...(this.isFiexed ? [{ value: "0", label: "实时金价" }] : [])
+      ];
+    }
+  },
   methods: {
+    isFiexed() {
+      return (
+        !this.isYZPlatform &&
+        this.isNobleMetal &&
+        this.ruleForm.platform_type !== "1"
+      );
+    },
+    pricingOptions() {
+      return [
+        { value: "1", label: "一口价" },
+        ...(this.isFiexed ? [{ value: "0", label: "实时金价" }] : [])
+      ];
+    },
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
@@ -192,6 +268,8 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
+            platform_type:"",
+            is_fiexed:"",
             platform: "", //string	平台id
             online_reason: "", //string	上线原因
             online_remark: "" //string	上线备注
@@ -200,8 +278,10 @@ export default {
       });
     },
     platform_codesearchChange(e) {
-      const { id, code, label } = e;
+      const { id, code, label, platform_type } = e;
       this.ruleForm.platform = id || "";
+      this.isYZPlatform = platform_type === "1";
+      this.ruleForm.platform_type = platform_type
       this.$refs.ruleForm.validateField("platform");
     },
     async submitForm() {

src/views/goodStore/dealGoodsPool/index.vue

@@ -173,6 +173,7 @@
 
     <add-edit
       :id="''"
+      :isNobleMetal="isNobleMetal"
       :sitem="changeList"
       :show-model="showModel"
       :is-detail="false"
@@ -213,6 +214,7 @@ export default {
     return {
       row: {},
       visible: false,
+      isNobleMetal: false,
       select: "1",
       sinput: "",
       //弹窗
@@ -289,6 +291,43 @@ export default {
         this.$message.warning("商品数量不能超过100！");
         return;
       }
+      const categoryIds = this.changeList.map(
+        ({ cat_info, is_gold_price }) => ({
+          id: String(cat_info[0].id),
+          isGoldPrice: String(is_gold_price)
+        })
+      );
+
+      const nobleMetalIds = categoryIds.filter(
+        ({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1"
+      );
+
+      if (
+        nobleMetalIds.length > 0 &&
+        categoryIds.length !== nobleMetalIds.length
+      ) {
+        const h = this.$createElement;
+
+        this.$message({
+          message: h("p", null, [
+            h("span", null, "勾选商品必须全部为"),
+            h("i", { style: "color: red" }, "开启实时金价贵金属商品"),
+            h("span", null, "或者全部为"),
+            h(
+              "i",
+              { style: "color: red" },
+              "未开启实时金价的贵金属商品和非贵金属商品"
+            )
+          ]),
+          type: "warning",
+          dangerouslyUseHTMLString: true
+        });
+        return;
+      }
+
+      this.isNobleMetal =
+        nobleMetalIds.length > 0 && categoryIds.length === nobleMetalIds.length;
+
       this.showModel = true;
     },
     //选中触发函数

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

@@ -171,24 +171,24 @@ export default {
       ],
       rulesThis: this.rules,
       rules: {
-        platform_type: [
+        platform: [
           {
             required: true,
-            message: "请选择对接平台",
+            message: "请选择所属平台",
             trigger: "change"
           }
         ],
-        platform: [
+        is_fixed: [
           {
             required: true,
-            message: "请选择所属平台",
+            message: "请选择定价模式",
             trigger: "change"
           }
         ],
-        is_fixed: [
+        platform_type: [
           {
             required: true,
-            message: "请选择定价模式",
+            message: "请选择对接平台",
             trigger: "change"
           }
         ],
@@ -272,6 +272,8 @@ export default {
       this.$refs.ruleForm.validateField("platform");
     },
     async submitForm() {
+      console.log(this.ruleForm)
+      return
       this.ruleForm.online_remark = replaceTextWrapAndSpace(
         this.ruleForm.online_remark
       );
@@ -280,6 +282,7 @@ export default {
           if (!this.loading) {
             this.loading = true;
             const model = JSON.parse(JSON.stringify(this.ruleForm));
+
             // model.platform = model.platform.toString();
             model.codes = [];
             const list = JSON.parse(JSON.stringify(this.sitem));

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

@@ -35,7 +35,7 @@
                   v-model="ruleForm.is_stock"
                   filterable
                   clearable
-                  :disabled="type === 'view' || type === 'editBase' || type === 'editCoin' || type === 'edit'"
+                  :disabled="type === 'view' || type === 'editBase' || type === 'editCoin' || type === 'edit' && createSource === '0'"
                   style="width: 100%"
                   @change="stock_change"
                   placeholder="是否库存品"
@@ -54,7 +54,7 @@
               <el-form-item prop="is_combind" label="组合类型" label-width="110px">
                 <el-select
                   style="width:100%"
-                  :disabled="type !== 'add'"
+                  :disabled="type === 'view' || type === 'editBase' || type === 'editCoin' || type === 'edit' && createSource === '0'"
                   v-model="ruleForm.is_combind"
                   placeholder="是否组合商品"
                   @change="groupGoodChange"
@@ -72,7 +72,7 @@
                 <search-supplier
                   :value="ruleForm.supplierNo"
                   :placeholder="'供应商'"
-                  :disabled="type === 'view' || type === 'editCoin'"
+                  :disabled="type === 'view' || type === 'editCoin' || createSource === '1'"
                   :size="'mini'"
                   :names="supplierName"
                   :isDetail="type !== 'add'"
@@ -250,7 +250,7 @@
                     filterable
                     clearable
                     :disabled="
-                      type === 'view' || type === 'editBase' || type === 'editCoin'
+                      type === 'view' || type === 'editBase' || type === 'editCoin' || createSource === '1'
                     "
                     style="width: 100%"
                     placeholder="启用实时金价"
@@ -1185,6 +1185,7 @@ export default {
   },
   data() {
     return {
+      createSource:"",
       isStockOptions,
       areaInfo: {
         delivery_place: {
@@ -1323,7 +1324,7 @@ export default {
     },
     async number_change(e, key) {
       this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField(key);
       await this.get_all_fee();
     },
     openEdit(index, sitem) {
@@ -2027,18 +2028,24 @@ export default {
             stock_moq,
             is_support_stock,
             is_combind,
-            combind_list
+            combind_list,
+            create_source
           } = this.sitem;
 
+          this.createSource = create_source
+
           if (this.type !== "add") {
             const { name, area_code } = await this.getArea("delivery_place");
-            this.areaInfo.delivery_place.label = [name];
-            this.areaInfo.delivery_place.code = [area_code];
-            const { name: _name, area_code: _area_code } = await this.getArea(
-              "origin_place"
-            );
-            this.areaInfo.origin_place.label = [_name];
-            this.areaInfo.origin_place.code = [_area_code];
+
+            if(name && area_code){
+              this.areaInfo.delivery_place.label = [name];
+              this.areaInfo.delivery_place.code = [area_code];
+              const { name: _name, area_code: _area_code } = await this.getArea(
+                "origin_place"
+              );
+              this.areaInfo.origin_place.label = [_name];
+              this.areaInfo.origin_place.code = [_area_code];
+            }
           }
 
           this.companyName = companyName;
@@ -2266,6 +2273,7 @@ export default {
     },
     async getArea(prop = "delivery_place") {
       const chunks = this.sitem[prop].split(",");
+      if(chunks.length !== 3) return {nanme:"", area_code:""}
       let { data: province } = await asyncRequest.province();
       province = province.find(
         ({ province_code }) => province_code === chunks[0]