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

@@ -131,7 +131,11 @@
           剩余库存：<span>{{ inventoryRest }}</span>
         </div>
         <br />
-        <el-form-item label="商家">
+        <el-form-item
+          label="商家"
+          prop="business1"
+          :rules="[{ required: true, message: '请选择商家' }]"
+        >
           <el-select v-model="commodityForm.business1" placeholder="请选择">
             <el-option
               v-for="item in businessOpt"
@@ -390,6 +394,19 @@ export default {
           type: "success",
         });
         this.pindanGoodsMet();
+        setTimeout(() => {
+          for (var i in this.comTableData) {
+            if (this.comTableData[i].goods_sku_id == goodsSkuID) {
+              this.comTableData.splice(i, 1);
+            }
+          }
+
+          for (var j in this.comLibTableData) {
+            if (this.comLibTableData[j].goods_sku_id == goodsSkuID) {
+              this.comTableData.push(this.comLibTableData[j]);
+            }
+          }
+        },500);
         this.addCommodityPopup = false;
       } else {
         ElMessage.error(res.reason);
@@ -436,7 +453,6 @@ export default {
           message: "添加商品成功",
           type: "success",
         });
-        // [res.result.goods_info, ...this.multipleSelection];
         this.comTableData.push(res.result.goods_info);
         this.addCommodityPopup = false;
       } else {