From 6e872f02877e27f893e8a46f647a7c18292e449a Mon Sep 17 00:00:00 2001
From: Yer11214 <17633066053@163.com>
Date: Mon, 7 Oct 2024 17:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=A1=E9=A2=9D=E6=B4=BB=E5=8A=A8=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E5=95=86=E5=93=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../full-discount/full-discount-detail.vue    | 35 ++++++++++++++++++-
 .../full-discount/full-discount.vue           |  6 +---
 .../src/views/promotions/pintuan/pintuan.vue  |  7 ++++
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/manager/src/views/promotions/full-discount/full-discount-detail.vue b/manager/src/views/promotions/full-discount/full-discount-detail.vue
index 0aba51ea..3c43bfde 100644
--- a/manager/src/views/promotions/full-discount/full-discount-detail.vue
+++ b/manager/src/views/promotions/full-discount/full-discount-detail.vue
@@ -158,7 +158,11 @@
               style="width: 100%"
               v-if="form.scopeType == 'PORTION_GOODS'"
             >
-              <Table border :columns="columns" :data="form.promotionGoodsList">
+             <div style="display: flex; margin-bottom: 10px" v-if="form.promotionStatus == 'NEW'">
+                <Button type="primary" @click="openSkuList">选择商品</Button>
+                <Button type="error" ghost style="margin-left: 10px" @click="delSelectGoods">批量删除</Button>
+              </div>
+              <Table border :columns="columns" @on-selection-change="changeSelect" :data="form.promotionGoodsList">
                 <template slot-scope="{ row }" slot="goodsName">
                   <div>
                     <a class="mr_10" @click="linkTo(row.goodsId, row.skuId)">{{
@@ -204,6 +208,8 @@
         </FormItem>
       </Form>
     </Card>
+    <sku-select ref="skuSelect" @selectedGoodsData="selectedGoodsData"></sku-select>
+
   </div>
 </template>
 
@@ -211,11 +217,16 @@
 import { getPlatformCouponList, getFullDiscountById, newFullDiscount, editFullDiscount,} from "@/api/promotion";
 import { getGoodsSkuData } from "@/api/goods";
 import { regular } from "@/utils";
+import skuSelect from "@/components/lili-dialog";
+
+
 import vueQr from "vue-qr";
 export default {
   name: "add-full-discount",
   components: {
     "vue-qr": vueQr,
+    skuSelect,
+
   },
   data() {
     const checkPrice = (rule, value, callback) => {
@@ -322,6 +333,20 @@ export default {
     this.getGiftList();
   },
   methods: {
+
+    changeSelect (e) {
+      // 已选商品批量选择
+      this.selectedGoods = e;
+    },
+    openSkuList () {
+      // 显示商品选择器
+      this.$refs.skuSelect.open("goods");
+      let data = JSON.parse(JSON.stringify(this.form.promotionGoodsList));
+      data.forEach((e) => {
+        e.id = e.skuId;
+      });
+      this.$refs.skuSelect.goodsData = data;
+    },
     getDetail() {
       // 获取活动详情
       getFullDiscountById(this.id).then((res) => {
@@ -447,6 +472,14 @@ export default {
         }
       });
     },
+    closeCurrentPage () {
+      this.$store.commit("removeTag", "full-cut-detail");
+      this.$store.commit("removeTag", "promotions/full-discount");
+      localStorage.storeOpenedList = JSON.stringify(
+        this.$store.state.app.storeOpenedList
+      );
+      this.$router.go(-1);
+    },
     changeSelect (e) {
       // 已选商品批量选择
       this.selectedGoods = e;
diff --git a/manager/src/views/promotions/full-discount/full-discount.vue b/manager/src/views/promotions/full-discount/full-discount.vue
index dbc2ca30..1551d0fe 100644
--- a/manager/src/views/promotions/full-discount/full-discount.vue
+++ b/manager/src/views/promotions/full-discount/full-discount.vue
@@ -136,11 +136,7 @@ export default {
           key: "endTime",
           width: 170,
         },
-        {
-          title: "店铺名称",
-          key: "storeName",
-          minWidth: 60,
-        },
+      
         {
           title: "活动类型",
           slot: "promotionType",
diff --git a/manager/src/views/promotions/pintuan/pintuan.vue b/manager/src/views/promotions/pintuan/pintuan.vue
index a00b7ee4..4ca34e4e 100644
--- a/manager/src/views/promotions/pintuan/pintuan.vue
+++ b/manager/src/views/promotions/pintuan/pintuan.vue
@@ -56,6 +56,9 @@
           <Button type="info" size="small" @click="view(row)" style="margin-right: 5px"
             >查看</Button
           >
+          <Button type="default" v-if="row.promotionStatus === 'NEW'" size="small" @click="edit(row)" style="margin-right: 5px"
+            >编辑</Button
+          >
           <Button
             type="error"
             size="small"
@@ -147,6 +150,10 @@ export default {
     };
   },
   methods: {
+    edit(v){
+      this.$router.push({ name: 'pintuan-create', query: {id:v.id}})
+
+    },
     // 初始化数据
     init() {
       this.getDataList();