From 5f6c6d66353665b5698e3aebe73bb8d063fcb38e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Tue, 10 Dec 2024 18:09:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E8=AF=BE=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=A5=97=E9=A4=90=E4=B8=8B=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/dialogpackage.vue | 8 +++++++-
 src/views/tool/Instead/index.vue                    | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/tool/Instead/components/dialogpackage.vue b/src/views/tool/Instead/components/dialogpackage.vue
index 6851a66..67564e7 100644
--- a/src/views/tool/Instead/components/dialogpackage.vue
+++ b/src/views/tool/Instead/components/dialogpackage.vue
@@ -56,7 +56,7 @@ export default {
                 })
                 this.disabledshow = !this.listdata.proGroupVo.every((element, num) => element.number == this.multipleSelection[num].length);
             } catch (error) { }
-            
+
             this.$set(this.listdata.proGroupVo, index, { ...this.listdata.proGroupVo[index], alertshow: this.listdata.proGroupVo[index].number != this.multipleSelection[index].length ? true : false });
         },
         confirm() {
@@ -73,6 +73,12 @@ export default {
                 })
             } catch (error) { }
             this.multipleSelection = []
+            console.log(item)
+            // 不用选套餐
+            if (item.groupType == 0) {
+                this.$emit("dialogpackageconfirm", this.listdata, [item.proGroupVo[0].goods]);
+                return false;
+            }
             this.disabledshow = true
             console.log(this.listdata, this.multipleSelection);
             this.show = true;
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 45b6311..8380f57 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1902,7 +1902,7 @@ export default {
     },
     //套餐下单
     async dialogpackageconfirm(item, multipleSelection) {
-      this.goodsClick(item, 1, true, multipleSelection.flatMap(subArray => subArray.map(item => item.proId))) 
+      this.goodsClick(item, 1, true, multipleSelection.flatMap(subArray => subArray.map(item => item.proId)))
     },
     //挂账人支付确认
     guazhangPayConfirm(guazhangren, price) {
@@ -2039,7 +2039,7 @@ export default {
     },
     quansConfirm(e, goodsPayPriceMap) {
       console.log(e);
-     // this.createOrder.discount = 1;
+      // this.createOrder.discount = 1;
       this.points.selected = "";
       e.map((v, index) => {
         return {
@@ -3438,8 +3438,8 @@ export default {
     },
     reset() {
       // this.goods.list = [];
-      this.isAllWaitCall=false;
-      this.selQuan=[];
+      this.isAllWaitCall = false;
+      this.selQuan = [];
       this.guazhangRen = "";
       this.order.status = "";
       this.loading = false;

From c3ed239ee243e84c424397570519e554386e042d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Tue, 10 Dec 2024 18:14:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E8=AF=BE=E4=B8=8B=E5=8D=95x2?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/components/dialogpackage.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/tool/Instead/components/dialogpackage.vue b/src/views/tool/Instead/components/dialogpackage.vue
index 67564e7..755f04a 100644
--- a/src/views/tool/Instead/components/dialogpackage.vue
+++ b/src/views/tool/Instead/components/dialogpackage.vue
@@ -45,9 +45,14 @@ export default {
     },
     methods: {
         toggleSelection() {
-            this.$refs.refdialogpackagetable.forEach((a) => {
-                a.clearSelection();
-            })
+            try {
+                this.$refs.refdialogpackagetable.forEach((a) => {
+                    a.clearSelection();
+                })
+                this.show = false
+            } catch (error) {
+
+            }
         },
         handleSelectionChange(val, index) {
             try {
@@ -73,7 +78,6 @@ export default {
                 })
             } catch (error) { }
             this.multipleSelection = []
-            console.log(item)
             // 不用选套餐
             if (item.groupType == 0) {
                 this.$emit("dialogpackageconfirm", this.listdata, [item.proGroupVo[0].goods]);