chore:商品上线

src/components/search-good-modal/columns.js

@@ -25,6 +25,12 @@ export default [
     prop: "brand_name",
     label: "品牌",
   },
+  {
+    prop: "create_source",
+    label: "来源",
+    _slot_: "create_source",
+    width: '110px'
+  },
   {
     prop: "good_type",
     label: "是否定制",
@@ -68,4 +74,4 @@ export default [
     fixed: "right",
     width: "95",
   },
-]
+]

src/components/search-good-modal/main.vue

@@ -115,12 +115,28 @@
                   </el-select>
                 </el-input>
               </el-col>
+              <!-- <el-col :span="3" style="margin-left:10px">
+                <el-select placeholder="来源" clearable size="mini" style="width:100%" v-model="parmValue.create_source" @change=" pageInfo.curr = 1;
+                    parmValue.page = 1;
+                   searchList();">
+                  <el-option value="0" label="手动创建商品" />
+                  <el-option value="1" label="咨询成交商品" />
+              </el-select>
+            </el-col> -->
+
               <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
                 <el-button type="success" :size="searchSize" @click="resultList(selection)">保存</el-button>
               </el-col>
             </el-row>
           </div>
         </template>
+
+        <template #create_source="{ scope }">
+        <el-tag size="mini" :type="scope.row.create_source === '1' ? 'warning' : ''">
+          {{ scope.row.create_source === "1" ? "咨询成交商品" : "手动创建商品" }}
+        </el-tag>
+      </template>
+
         <template #good_thumb_img="{ scope }">
           <div
             v-if="scope.row.good_thumb_img"
@@ -167,6 +183,7 @@ export default {
     "isonline",
     "is_stock",
     "isNoble",
+    "isConsult",
     "checkType",
     "is_combind"
   ],
@@ -195,6 +212,7 @@ export default {
       loading: true,
       showModelThis: false,
       parmValue: {
+        create_source:"",
         type_code: "", // 是否定制
         supplierNo: "", // 供应商code
         cat_id: [],
@@ -261,6 +279,7 @@ export default {
       this.select = "1";
       // this.supplierCode = [];
       this.parmValue = {
+        create_source:"",
         type_code: "", // 是否定制
         supplierNo: "", // 供应商code
         spucode: "", // 商品编码
@@ -361,93 +380,109 @@ export default {
       }
       this.selectLoading = false;
     },
-    async resultList(selection) {
-      if (selection && selection.length > 1 && this.once) {
-        this.$message.warning("只能选择一条商品信息！");
-        return;
-      }
-
-      if (this.checkType) {
-        const h = this.$createElement;
-        const categoryIds = selection.map(({ cat_info, is_gold_price }) => ({
-          id: String(cat_info[0].id),
-          isGoldPrice: String(is_gold_price)
-        }));
-
-        console.log(categoryIds);
-        const nobleMetalIds = categoryIds.filter(
-          ({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1"
-        );
-
-        if (
-          nobleMetalIds.length > 0 &&
-          categoryIds.length !== nobleMetalIds.length
-        ) {
-          // this.$message.warning('勾选商品的分类必须全部为"贵金属"或全部为"非贵金属"')
-
-          this.$message({
+    createWarningMessage$1(_f,_s){
+      const h = this.$createElement;
+        this.$message({
+          message: h("p", null, [
+            h("span", null, "勾选商品必须全部为"),
+            h("i", { style: "color: red" }, _f),
+            h("span", null, "或者全部为"),
+            h( "i", { style: "color: red" },  _s)
+          ]),
+          type: "warning",
+          dangerouslyUseHTMLString: true
+        });
+    },
+    createWarningMessage$2(_f, _s){
+      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" },
-                "未开启实时金价的贵金属商品和非贵金属商品"
-              )
+              h("span", null, "如需添加"),
+              h("i", { style: "color: red" }, _f),
+              h("span", null, "请将已添加的所有"),
+              h( "i",{ style: "color: red" }, _s),
+              h("span", null, "删除!")
             ]),
             type: "warning",
             dangerouslyUseHTMLString: true
           });
+    },
+    getAllGoods(selection){
+      return selection.map(({ cat_info, is_gold_price ,create_source}) => ({
+          create_source,
+          id: String(cat_info[0].id),
+          isGoldPrice: String(is_gold_price)
+        })
+      );
+    },
+    async resultList(selection) {
+        if (selection && selection.length > 1 && this.once) {
+          this.$message.warning("只能选择一条商品信息！");
           return;
         }
 
-        const isNoble =
-          nobleMetalIds.length > 0 &&
-          categoryIds.length === nobleMetalIds.length;
-        if (isNoble && !this.isNoble && this.isNoble !== null) {
-          // this.$message.warning('如需添加 "贵金属商品",请将已添加的所有 "非贵金属商品" 删除！')
+        let isNoble = null;
+        let isConsult = null;
+        if (this.checkType) {
+          const allGoods = this.getAllGoods(selection);
+          if (allGoods.length === 0) {
+          this.$message.warning("至少选择一个商品！");
+          return;
+        }
 
-          this.$message({
-            message: h("p", null, [
-              h("span", null, "如需添加"),
-              h("i", { style: "color: red" }, "开启实时金价的贵金属商品"),
-              h("span", null, "请将已添加的所有"),
-              h(
-                "i",
-                { style: "color: red" },
-                "未开启实时金价的贵金属商品和非贵金属商品"
-              ),
-              h("span", null, "删除!")
-            ]),
-            type: "warning",
-            dangerouslyUseHTMLString: true
-          });
+        if (allGoods.length > 100) {
+          this.$message.warning("商品数量不能超过100！");
           return;
         }
 
-        if (!isNoble && this.isNoble && this.isNoble !== null) {
-          this.$message({
-            message: h("p", null, [
-              h("span", null, "如需添加"),
-              h(
-                "i",
-                { style: "color: red" },
-                "未开启实时金价的贵金属商品和非贵金属商品"
-              ),
-              h("span", null, "请将已添加的所有"),
-              h("i", { style: "color: red" }, "开启实时金价的贵金属商品"),
-              h("span", null, "删除!")
-            ]),
-            type: "warning",
-            dangerouslyUseHTMLString: true
-          });
+        // 咨询成交id集合
+        const consultList = allGoods.filter(({create_source}) => create_source === "1")
+        // 不是全部为咨询成交商品或手动创建商品
+        if(consultList.length > 0 && allGoods.length !== consultList.length){
+          this.createWarningMessage$1("咨询成交商品", "手动创建商品")
+          return
+        }
+        // 本次添加是否全部为咨询商品..
+        isConsult = consultList.length > 0 && allGoods.length === consultList.length
+
+        //本次添加全部为咨询商品,上次添加为手动创建商品
+        if(isConsult && !this.isConsult && this.isConsult !== null){
+          this.createWarningMessage$2("咨询成交商品", "手动创建商品")
           return;
         }
+
+        //本次添加全部为手动创建商品,上次添加咨询商品
+        if(!isConsult && this.isConsult && this.isConsult !== null){
+          this.createWarningMessage$2("手动创建商品","咨询成交商品")
+          return
+        }
+        // 到这里不是初始化就是全部为咨询商品或者全部为手动创建的商品,区分出来,手动创建商品需要判断贵金属
+        if(!this.isConsult && !isConsult){
+          // 手动创建商品,走是否贵金属校验...
+          const nobleMetalIds = allGoods.filter(({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1");
+          // 当前勾选商品中有贵金属和非贵金属
+          if (nobleMetalIds.length > 0 && allGoods.length !== nobleMetalIds.length ) {
+            this. createWarningMessage$1("开启实时金价贵金属商品", "未开启实时金价的贵金属商品和非贵金属商品");
+            return;
+          }
+          // 本次添加的是否全部为贵金属....
+          isNoble = nobleMetalIds.length > 0 &&  allGoods.length === nobleMetalIds.length;
+          //上次添加的不是贵金属商品，且本次添加的是贵金属商品
+          if (isNoble && !this.isNoble && this.isNoble !== null) {
+            this.createWarningMessage$2("开启实时金价贵金属商品", "未开启实时金价的贵金属商品和非贵金属商品")
+            return;
+          }
+          //上次添加的是贵金属商品，且本次添加不是贵金属商品
+          if (!isNoble && this.isNoble && this.isNoble !== null) {
+            this.createWarningMessage$2("未开启实时金价的贵金属商品和非贵金属商品","开启实时金价贵金属商品")
+            return;
+          }
+        }
       }
 
       this.showModelThis = false;
-      this.$emit("resultList", selection);
+      //本次添加是否贵金属和是否咨询商品传递出去，下次传入作为上次添加的结果判断条件
+      this.$emit("resultList", selection, {isNoble,  isConsult });
     }
   }
 };

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -259,10 +259,7 @@ export default {
       );
     },
     pricingOptions() {
-      return [
-        { value: "1", label: "一口价" },
-        ...(this.isFiexed ? [{ value: "0", label: "实时金价" }] : [])
-      ];
+      return [{ value: "1", label: "一口价" }];
     }
   },
   methods: {

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

@@ -160,12 +160,12 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/goodStore/goodsCost";
-import resToken from "@/mixins/resToken";
 import { replaceTextWrapAndSpace } from "@/utils";
+import resToken from "@/mixins/resToken";
 export default {
   name: "Brand",
   mixins: [resToken],
-  props: ["showModel", "id", "sitem", "isNobleMetal"],
+  props: ["showModel", "id", "sitem", "isNobleMetal", "isConsultFlag"],
   data() {
     return {
       loading: false,
@@ -225,25 +225,19 @@ export default {
     };
   },
   computed: {
-    isFiexed() {
-      return (
-        !this.isYZPlatform &&
-        this.isNobleMetal &&
-        this.ruleForm.platform_type !== "1"
-      );
+    isFixed() {
+      /** 选择实时金价条件：非有赞平台&非咨询成交商品&贵金属商品 */
+      return !this.isYZPlatform && !this.isConsultFlag && this.isNobleMetal && this.ruleForm.platform_type !== "1" 
     },
     pricingOptions() {
       return [
         { value: "1", label: "一口价" },
-        ...(this.isFiexed ? [{ value: "0", label: "实时金价" }] : [])
+        ...(this.isFixed ? [{ value: "0", label: "实时金价" }] : [])
       ];
     }
   },
-  // mounted(){
-    
-  // },
   watch: {
-    isFiexed() {
+    isFixed() {
       if (this.ruleForm.is_fixed === "0") {
         this.ruleForm.is_fixed = "";
       }
@@ -256,17 +250,12 @@ export default {
       }
     },
     showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
+      if (!val) { this.$emit("cancel");}
     }
   },
   methods: {
     changeMarketUrl(market_url,index){
-      this.$set(this.list,index,{
-        ...this.list[index],
-        market_url
-      })
+      this.$set(this.list,index,{ ...this.list[index], market_url })
     },
     async initForm() {
       this.loading = true;

src/views/goodStore/goodsCost/index.vue

@@ -445,6 +445,7 @@
     <add-edit
       :id="''"
       :isNobleMetal="isNobleMetal"
+      :isConsultFlag="isConsultFlag"
       :sitem="changeList"
       :show-model="showModel"
       :is-detail="false"
@@ -497,7 +498,10 @@ export default {
       }
     };
     return {
+      //标记勾选商品是否全部为贵金属商品
       isNobleMetal: false,
+      //标记勾选商品是否全部为咨询成交商品
+      isConsultFlag:false,
       dialogFormVisible: false,
       has_account_list,
       donline_formStOps: [],
@@ -924,52 +928,68 @@ export default {
       this.parmValue.page = 1;
       await this.searchList();
     },
-    add_online() {
-      if (this.changeList.length === 0) {
-        this.$message.warning("至少选择一个商品！");
-        return;
-      }
-      if (this.changeList.length > 100) {
-        this.$message.warning("商品数量不能超过100！");
-        return;
-      }
-
-      const categoryIds = this.changeList.map(
-        ({ cat_info, is_gold_price }) => ({
+    getLightWeightList(){
+      return this.changeList.map(({ cat_info, is_gold_price ,create_source}) => ({
+          create_source,
           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;
-
+    },
+    createWarningMessage(_f = "开启实时金价贵金属商品",_s = "未开启实时金价的贵金属商品和非贵金属商品"){
+      const h = this.$createElement;
         this.$message({
           message: h("p", null, [
             h("span", null, "勾选商品必须全部为"),
-            h("i", { style: "color: red" }, "开启实时金价贵金属商品"),
+            h("i", { style: "color: red" }, _f),
             h("span", null, "或者全部为"),
-            h(
-              "i",
-              { style: "color: red" },
-              "未开启实时金价的贵金属商品和非贵金属商品"
-            )
+            h( "i", { style: "color: red" },  _s)
           ]),
           type: "warning",
           dangerouslyUseHTMLString: true
         });
+    },
+    add_online() {
+      if (this.changeList.length === 0) {
+        this.$message.warning("至少选择一个商品！");
+        return;
+      }
+      if (this.changeList.length > 100) {
+        this.$message.warning("商品数量不能超过100！");
         return;
       }
 
-      this.isNobleMetal =
-        nobleMetalIds.length > 0 && categoryIds.length === nobleMetalIds.length;
+      // 勾选商品集合
+      const allList = this.changeList.map(({ cat_info, is_gold_price ,create_source}) => ({
+          id: String(cat_info[0].id),
+          isGoldPrice: String(is_gold_price),
+          createSource: String(create_source)
+        })
+      );
+      
+      // 咨询成交id集合
+      const consultList = allList.filter(({id,createSource}) => createSource === "1")
+      
+      // 不是全部为咨询成交商品或手动创建商品
+      if(consultList.length > 0 && allList.length !== consultList.length){
+        this.createWarningMessage("咨询成交商品", "手动创建商品")
+        return
+      }
+      
+      //标记是否全部为咨询成交商品
+      this.isConsultFlag = consultList.length > 0 && allList.length === consultList.length;
+
+      if(!this.isConsultFlag){  //手动创建商品标记是否全部为贵金属(咨询商品不需要)
+        //贵金属商品id集合
+        const nobleMetalList= allList.filter(
+          ({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1"
+        );
+        if (nobleMetalList.length > 0 && allList.length !== nobleMetalList.length) {
+         this.createWarningMessage()
+          return;
+        }
+        this.isNobleMetal = nobleMetalList.length > 0 && allList.length === nobleMetalList.length;
+      }
 
       let isok = true;
       this.changeList.forEach(e => {

src/views/goodStore/goodsOnline/add.vue

@@ -100,6 +100,16 @@
                 min-width="brand_name"
                 show-overflow-tooltip
               />
+              <el-table-column prop="good_type" label="来源" min-width="110" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <el-tag
+                    :size="'mini'"
+                    :type="scope.row.create_source == '1' ? 'warning' : ''"
+                    v-text="scope.row.create_source === '1' ? '咨询成交商品' : '手动创建商品'"
+                  ></el-tag>
+                </template>
+              </el-table-column>
+
               <el-table-column prop="good_type" label="是否定制" min-width="70" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <el-tag
@@ -149,6 +159,7 @@
             <!--添加商品-->
             <search-good-modal
               :is-noble="isNoble"
+              :is-consult="isConsult"
               :check-type="true"
               :showModel="showModel"
               :once="false"
@@ -188,8 +199,10 @@ export default {
   },
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
-    isFiexed() {
+    isFixed() {
+      // 非咨询商品 && 非有赞平台 && 贵金属开启实时金价
       return (
+        !this.isConsult &&
         !this.isYzPlatform &&
         this.isNoble &&
         this.ruleForm.platform_type !== "1"
@@ -206,7 +219,7 @@ export default {
     fixedOptions() {
       return [
         { value: "1", label: "一口价" },
-        ...(this.isFiexed ? [{ value: "0", label: "实时金价" }] : [])
+        ...(this.isFixed ? [{ value: "0", label: "实时金价" }] : [])
       ];
     }
   },
@@ -216,7 +229,7 @@ export default {
         this.initForm();
       }
     },
-    isFiexed() {
+    isFixed() {
       if (this.ruleForm.is_fixed === "0") {
         this.ruleForm.is_fixed = "";
       }
@@ -225,6 +238,7 @@ export default {
   data() {
     return {
       isNoble: null,
+      isConsult:null,
       tableData: [],
       costshowModel: false,
       costmodelIndex: "",
@@ -259,17 +273,16 @@ export default {
     },
     async initForm() {
       this.loading = true;
+      console.log(this.resetFormData)
       this.resetFormData();
       this.rulesThis = this.rules;
       await this.resetForm();
       this.loading = false;
     },
-
     openDel(index) {
       this.tableData.splice(index, 1);
-      if (this.tableData.length === 0) {
-        this.isNoble = null;
-      }
+      this.isConsult = this.tableData.length === 0 ? null : this.isConsult;
+      this.isNoble = this.tableData.length === 0 ? null : this.isNoble;
     },
     changeMarketUrlByIndex(market_url,index){
       console.log(market_url)
@@ -279,31 +292,19 @@ export default {
         market_url
       })
     },
-    resultList(e) {
+    resultList(e, {isNoble, isConsult}) {
       this.showModel = false;
       let list = JSON.parse(JSON.stringify(e));
       let oldList = JSON.parse(JSON.stringify(this.tableData));
 
-      const categoryIds = list.map(({ cat_info, is_gold_price }) => ({
-        id: String(cat_info[0].id),
-        isGoldPrice: String(is_gold_price)
-      }));
-
-      const nobleIds = categoryIds.filter(({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1");
-      this.isNoble = nobleIds.length > 0 && categoryIds.length === nobleIds.length;
+      this.isNoble = isNoble;
+      this.isConsult = isConsult;
 
       list.forEach((e, ei) => {
-        let index = oldList.findIndex(a => {
-          return e.spuCode === a.spuCode;
-        });
-
-        if (index === -1) {
-          let item = JSON.parse(JSON.stringify(list[ei]));
-          this.tableData.push({
-            ...item,
-            market_url:""
-          });
-        }
+        let index = oldList.findIndex(a =>e.spuCode === a.spuCode);
+        if(index !== -1) return
+        let item = JSON.parse(JSON.stringify(list[ei]));
+        this.tableData.push({...item, market_url:"" });
       });
     },
     async submitForm() {
@@ -399,7 +400,6 @@ export default {
         message: htmlList
       });
     },
-
     resetFormData() {
       this.ruleForm = {
         platform_type: "",

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -237,7 +237,7 @@
         <el-table-column fixed="right">
           <template slot="header" slot-scope="scope">
             <span>操作</span>
-            <el-tooltip effect="dark" content="添加阶梯" placement="top">
+            <el-tooltip effect="dark" content="添加阶梯" placement="top" v-if="sitem.create_source !== '1'">
               <i class="el-icon-circle-plus-outline tb-icon fr" @click="openCostEdit(-1)"></i>
             </el-tooltip>
           </template>
@@ -908,11 +908,25 @@ export default {
                 ? JSON.parse(JSON.stringify(ladderlist))
                 : []
           };
-          this.good_ladder =
-            ladderlist && ladderlist.length > 0
-              ? JSON.parse(JSON.stringify(ladderlist))
-              : [];
-          // console.log(this.ruleForm.proof_url);
+
+          if(this.sitem.create_source === '1'){
+            this.good_ladder = [
+              {
+                cost_fee:"0",
+                edit:false,
+                market_platform: "京东",
+                market_price: "",
+                new_sale_price:Number(this.sitem.sale_price),
+                sale_price:"0",
+                search_loading:false
+              }
+            ]
+
+            console.log(this.good_ladder);
+          }else{
+            this.good_ladder = ladderlist && ladderlist.length > 0 ? JSON.parse(JSON.stringify(ladderlist)) : [];
+          }
+
           switch (this.ruleForm.proof_type) {
             case "1":
               this.video_url = this.ruleForm.proof_url;
@@ -969,6 +983,10 @@ export default {
             }
             let list = JSON.parse(JSON.stringify(this.addrForm.good_ladder));
 
+            console.log(list);
+            this.loading = false;
+            return;
+
             for (let index = 0; index < list.length; index++) {
               const item = list[index];
               if (item.edit) {
@@ -1006,9 +1024,7 @@ export default {
                 index < this.addrForm.good_ladder.length;
                 index++
               ) {
-                const { sale_price, new_sale_price, cost_fee, new_cost_fee } =
-                  this.addrForm.good_ladder[index] || {};
-
+                const { sale_price, new_sale_price, cost_fee, new_cost_fee } = this.addrForm.good_ladder[index] || {};
                 const _salePrice = Number(sale_price);
                 const _systemSalePrice = Number(new_sale_price);
                 const _costFee = Number(cost_fee);