Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

src/views/tool/Instead/components/dialogpackage.vue

@@ -45,9 +45,14 @@ export default {
     },
     methods: {
         toggleSelection() {
-            this.$refs.refdialogpackagetable.forEach((a) => {
+            try {
-                a.clearSelection();
+                this.$refs.refdialogpackagetable.forEach((a) => {
-            })
+                    a.clearSelection();
+                })
+                this.show = false
+            } catch (error) {
+
+            }
         },
         handleSelectionChange(val, index) {
             try {
@@ -56,7 +61,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 +78,11 @@ export default {
                 })
             } catch (error) { }
             this.multipleSelection = []
+            // 不用选套餐
+            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;

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.isAllWaitCall = false;
-      this.selQuan=[];
+      this.selQuan = [];
       this.guazhangRen = "";
       this.order.status = "";
       this.loading = false;