From 907b763fca964269f21aa65afb2d5cfffea946e3 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 24 Feb 2025 10:26:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/indexconfig/addgoods.vue | 45 ++++++++++++----------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index 02880a5..3350b47 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -88,7 +88,7 @@
               </el-table-column>
               <el-table-column width="150">
                 <template #header>
-                  <el-button type="primary" @click="addgoods">添加商品</el-button>
+                  <el-button type="primary" @click="addgoods(-1)">添加商品</el-button>
                 </template>
                 <template v-slot="scope">
                   <el-button type="text" :disabled="scope.row.type != 'sku'"
@@ -112,7 +112,7 @@
                   <el-button @click="ruleForm.proGroupVo.splice(index, 1)">删除</el-button>
                 </el-form-item>
               </el-form>
-              <div>
+              <div style="margin-top: 20px;">
                 <el-table border :data="item.goods">
                   <el-table-column label="名称" prop="proName"></el-table-column>
                   <el-table-column label="规格" prop="skuName"></el-table-column>
@@ -124,8 +124,7 @@
                   </el-table-column>
                   <el-table-column width="150">
                     <template #header>
-                      <!-- <el-button type="primary"
-                        @click="$refs.shopListRef.show([...form.proGroupVo[index].goods]); addGroupIndex = index">添加商品</el-button> -->
+                      <el-button type="primary" @click="addgoods(index);">添加商品</el-button>
                     </template>
                     <template v-slot="scope">
                       <el-button type="text" :disabled="scope.row.type != 'sku'"
@@ -311,7 +310,8 @@ let datas = reactive<datasForm>({
   selectSkuTableIndex: 0,
   selectSkuConfirmIndex: 0,
   showSelectSku: false,
-  selectSkuItem: {}
+  selectSkuItem: {},
+  addGroupIndex: -1
 })
 let shopListRef = ref(null)
 interface datasForm {
@@ -325,7 +325,8 @@ interface datasForm {
   selectSkuTableIndex: any,
   selectSkuConfirmIndex: number,
   showSelectSku: boolean,
-  selectSkuItem: any
+  selectSkuItem: any,
+  addGroupIndex: any
 }
 interface RuleForm {
   name: string,
@@ -483,7 +484,8 @@ function showSelectSkuHandle(row: any, index: any, tabIndex: any) {
   datas.selectSkuItem = obj
 }
 // 添加商品
-function addgoods() {
+function addgoods(index: number = -1) {
+  datas.addGroupIndex = index;
   (shopListRef.value as any)?.opens()
 }
 // 分组选择商品
@@ -507,19 +509,20 @@ function selectShopRes(res: Array<any>) {
     }
     ruleForm.proGroupVo = [{ ...obj }]
   } else {
-    // if (this.addGroupIndex !== false) {
-    //   this.form.proGroupVo[this.addGroupIndex].count = newres.length
-    //   this.form.proGroupVo[this.addGroupIndex].goods = newres
-    // } else {
-    let arr = [...ruleForm.proGroupVo]
-    arr.push({
-      title: '',
-      count: newres.length,
-      number: '',
-      goods: newres
-    })
-    ruleForm.proGroupVo = [...arr]
-    // }
+    if (datas.addGroupIndex != -1) {
+      console.log(newres, 'newres')
+      ruleForm.proGroupVo[datas.addGroupIndex].count = newres.length
+      ruleForm.proGroupVo[datas.addGroupIndex].goods = newres
+    } else {
+      let arr = [...ruleForm.proGroupVo]
+      arr.push({
+        title: '',
+        count: newres.length,
+        number: '',
+        goods: newres
+      })
+      ruleForm.proGroupVo = [...arr]
+    }
   }
 }
 // 获取单位、分类数据
@@ -548,6 +551,7 @@ function createSkuHeader() {
 }
 // 可选套餐弹窗
 function addtaocan() {
+  datas.addGroupIndex = -1;
   (shopListRef.value as any)?.opens()
 }
 // 生成多规格表体
@@ -639,6 +643,7 @@ function cartesian(arr: any[]) {
 function typeChange() {
   // ruleForm.typeEnum = 'normal'
   if (ruleForm.groupType == '0') {
+    ruleForm.proGroupVo = []
     ruleForm.proGroupVo[0] = {
       title: '',
       count: '',