Merge branch 'feature/activity' of...

Merge branch 'feature/activity' of https://git.yidian-inc.com:8021/bp/op-web-service into feature/activity

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -241,23 +241,23 @@ import {
   getBusinessList,
   pindanGoods,
   markGoodsInfo,
-  editGoods
+  editGoods,
 } from "../../../../service/Activity/index";
 
 export default {
   props: {
     editInfo: {
       type: Object,
-      required: () => {}
+      required: () => {},
     },
     addProduc: {
       type: Array,
-      required: () => {}
+      required: () => {},
     },
     stepTwoTitle: {
       type: String,
-      default: ""
-    }
+      default: "",
+    },
   },
   data() {
     return {
@@ -278,7 +278,7 @@ export default {
         original_price: "",
         inventory_total: null,
         total_amount_order: null,
-        business1: ""
+        business1: "",
       },
 
       picUrlList: [],
@@ -293,7 +293,7 @@ export default {
       business2: "", // 商家
       multipleSelection: [], // 勾选的数据
 
-      goodsSkuID: ""
+      goodsSkuID: "",
     };
   },
   computed: {
@@ -307,7 +307,7 @@ export default {
             this.commodityForm.total_amount_order
         );
       }
-    }
+    },
   },
   methods: {
     // 上移
@@ -364,7 +364,7 @@ export default {
         const res = await getBusinessList(params);
         this.businessOpt = [
           { ota_id: "", ota_name: "全部" },
-          ...res.result.list
+          ...res.result.list,
         ];
       } catch (error) {
         this.$message.error("发生未知错误,请稍后再试一下吧~~~");
@@ -381,7 +381,7 @@ export default {
       this.commodityForm.business1 = res.result.goods_info.ota_id;
       for (var i in res.result.goods_info.desc_pic_url_list) {
         this.picUrlList.push({
-          url: res.result.goods_info.desc_pic_url_list[i]
+          url: res.result.goods_info.desc_pic_url_list[i],
         });
       }
     },
@@ -399,12 +399,12 @@ export default {
         marketing_type: "4",
         ota_id: this.commodityForm.business1,
         op_cur_user: store.state.userInfo.email,
-        goods_sku_id: goodsSkuID
+        goods_sku_id: goodsSkuID,
       });
       if (res.code == 0) {
         ElMessage.success({
           message: "修改成功",
-          type: "success"
+          type: "success",
         });
         await this.pindanGoodsMet();
         let result = null;
@@ -444,6 +444,7 @@ export default {
       this.commodityForm = {};
       if (type == "add") {
         this.commodityForm.total_amount_order = 0;
+        this.$refs.infoForm.resetFields();
         this.addCommodityTitle = "商品添加";
       } else {
         this.addCommodityTitle = "商品编辑";
@@ -464,12 +465,12 @@ export default {
         marketing_type: "4",
         price: this.commodityForm.price,
         ota_id: this.commodityForm.business1,
-        op_cur_user: store.state.userInfo.email
+        op_cur_user: store.state.userInfo.email,
       });
       if (res.code == 0) {
         ElMessage.success({
           message: "添加商品成功",
-          type: "success"
+          type: "success",
         });
         this.comTableData.push(res.result.goods_info);
         this.addCommodityPopup = false;
@@ -486,7 +487,7 @@ export default {
 
     // 添加商品保存
     commoditySave(infoForm) {
-      this.$refs[infoForm].validate(valid => {
+      this.$refs[infoForm].validate((valid) => {
         if (valid) {
           if (this.addCommodityTitle == "商品添加") {
             this.addGoodsMet();
@@ -525,19 +526,21 @@ export default {
       if (this.comTableData.length == 0) {
         this.comTableData.push(...this.multipleSelection);
       } else {
-        this.multipleSelection.forEach(item => {
+        this.multipleSelection.forEach((item) => {
           let num = 0;
-          this.comTableData.some(val => {
+          this.comTableData.some((val) => {
             num++;
             if (val.goods_sku_id === item.goods_sku_id) {
               val.goods_sku_id = item.goods_sku_id;
+              if (num == 1) {
+                ElMessage.error("商品添加重复,已过滤掉重复选项");
+              }
               return true;
             } else if (num === this.comTableData.length) {
               this.comTableData.push(Object.assign({}, item));
             }
           });
         });
-        ElMessage.error("商品添加重复,已过滤掉重复选项");
       }
     },
 
@@ -548,21 +551,21 @@ export default {
           this.comTableData.splice(i, 1);
         }
       }
-    }
+    },
   },
 
   watch: {
-    addProduc: function(newVal) {
+    addProduc: function (newVal) {
       let marketingId = this.$route.query.marketing_id;
       if (marketingId == undefined) {
         return;
       }
       this.comTableData = newVal;
-    }
+    },
   },
   created() {
     this.getBusinessListMet();
-  }
+  },
 };
 </script>
 <style scoped>