From ec7292cf4c44bfe891a29b3e3b57658c89a864b3 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 24 Mar 2025 21:55:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=A5=97=E9=A4=90=E9=AB=98=E4=BA=AE=E3=80=81=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=87=A0=E9=80=89=E5=87=A0=E6=95=88=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/index.vue                |  8 +++--
 src/views/product/indexconfig/addgoods.vue | 38 +++++++++++++++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index a3f499c..041d104 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -26,9 +26,11 @@
           @click="handleSwitchChange(scope.row)"></el-switch>
       </template>
       <template #kucunedit="scope">
-        {{ scope.row.stockNumber }} <el-icon @click="kucunedit(scope.row)" style="cursor: pointer;color: #4080ff;">
-          <EditPen />
-        </el-icon>
+        <template v-if="scope.row.type != null">
+          {{ scope.row.stockNumber }} <el-icon @click="kucunedit(scope.row)" style="cursor: pointer;color: #4080ff;">
+            <EditPen />
+          </el-icon>
+        </template>
       </template>
 
       <template #tuikuantuihui="scope">
diff --git a/src/views/product/indexconfig/addgoods.vue b/src/views/product/indexconfig/addgoods.vue
index 4460af7..a29d74b 100644
--- a/src/views/product/indexconfig/addgoods.vue
+++ b/src/views/product/indexconfig/addgoods.vue
@@ -66,8 +66,8 @@
         <div style="display: block;width: 100%;">
           <div class="head-container">
             <el-radio-group v-model="ruleForm.groupType" @change="typeChange">
-              <el-radio-button :label="0">固定套餐</el-radio-button>
-              <el-radio-button :label="1">可选套餐</el-radio-button>
+              <el-radio-button label="0">固定套餐</el-radio-button>
+              <el-radio-button label="1">可选套餐</el-radio-button>
             </el-radio-group>
           </div>
           <div v-if="ruleForm.groupType == '0'">
@@ -733,6 +733,13 @@ const submitForm = async (formEl: FormInstance | undefined) => {
       ruleForm.coverImg = ruleForm.images[0]
       // 规格id修改
       // ruleForm.specId = specIdFunction(ruleForm.type)
+      let selectTitle = false
+      ruleForm.proGroupVo.forEach((item: any) => {
+      })
+      if (selectTitle) {
+        ElMessage.error('请填写标题和几选几')
+        return
+      }
       // 修改时间
       ruleForm.startTime = ruleForm.useTime[0]
       ruleForm.endTime = ruleForm.useTime[1]
@@ -748,18 +755,33 @@ const submitForm = async (formEl: FormInstance | undefined) => {
       } else if (ruleForm.type == 'package') {
         // console.log(ruleForm, '套餐')
       }
+      setTimeout(() => {
+        ruleForm.days = ruleForm.days.split(',')
+      }, 200);
+      // 标题和几选几是否填写
+      if (ruleForm.type == "package") {
+        if (ruleForm.groupType == '1') {
+          let selectTitle = false
+          ruleForm.proGroupVo.forEach((item: any) => {
+            if (item.number == '' || item.title == '') {
+              selectTitle = true
+            }
+          })
+          if (selectTitle) {
+            ElMessage.error('请填写标题和几选几')
+            return
+          }
+        }
+      }
+
+
       if (ruleForm.id) {
-        setTimeout(() => {
-          ruleForm.days = ruleForm.days.split(',')
-        }, 600);
         let res = await UserAPI3.update(ruleForm)
         if (res.code == 200) {
           ElMessage.success("修改成功");
         }
       } else {
-        setTimeout(() => {
-          ruleForm.days = ruleForm.days.split(',')
-        }, 600);
+
         let res = await UserAPI3.addunit(ruleForm)
         if (res.code == 200) {
           ElMessage.success("添加成功");

From ccab0a33ee88ebfe0709ea49a01184011df7268a Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 25 Mar 2025 00:20:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=88=86=E7=BB=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=95=86=E5=93=81=E6=95=B0=E6=8D=AE=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue           | 303 +++++-------------
 src/views/online-shop/goods-group.vue         |  17 +-
 .../online-shop/goodsGroupconfig/content2.ts  |  11 +-
 3 files changed, 104 insertions(+), 227 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 7d722ed..4fd5da0 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -8,58 +8,37 @@
           <template v-if="typeof item === 'string'">
             <!-- 新增 -->
             <template v-if="item === 'add'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="primary"
-                icon="plus"
-                @click="handleToolbar(item)"
-              >
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="primary" icon="plus"
+                @click="handleToolbar(item)">
                 新增
               </el-button>
             </template>
             <!-- 删除 -->
             <template v-else-if="item === 'delete'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="danger"
-                icon="delete"
-                :disabled="removeIds.length === 0"
-                @click="handleToolbar(item)"
-              >
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="danger" icon="delete"
+                :disabled="removeIds.length === 0" @click="handleToolbar(item)">
                 删除
               </el-button>
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'import'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="default"
-                icon="upload"
-                @click="handleToolbar(item)"
-              >
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="upload"
+                @click="handleToolbar(item)">
                 导入
               </el-button>
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'export'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="default"
-                icon="download"
-                @click="handleToolbar(item)"
-              >
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="download"
+                @click="handleToolbar(item)">
                 导出
               </el-button>
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
-            <el-button
-              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
-              :icon="item.icon"
-              :type="item.type ?? 'default'"
-              @click="handleToolbar(item.name)"
-            >
+            <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon"
+              :type="item.type ?? 'default'" @click="handleToolbar(item.name)">
               {{ item.text }}
             </el-button>
           </template>
@@ -88,68 +67,36 @@
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'exports'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:export`]"
-                icon="download"
-                circle
-                title="导出"
-                @click="handleToolbar(item)"
-              />
+              <el-button v-hasPerm="[`${contentConfig.pageName}:export`]" icon="download" circle title="导出"
+                @click="handleToolbar(item)" />
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'imports'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:import`]"
-                icon="upload"
-                circle
-                title="导入"
-                @click="handleToolbar(item)"
-              />
+              <el-button v-hasPerm="[`${contentConfig.pageName}:import`]" icon="upload" circle title="导入"
+                @click="handleToolbar(item)" />
             </template>
             <!-- 搜索 -->
             <template v-else-if="item === 'search'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:query`]"
-                icon="search"
-                circle
-                title="搜索"
-                @click="handleToolbar(item)"
-              />
+              <el-button v-hasPerm="[`${contentConfig.pageName}:query`]" icon="search" circle title="搜索"
+                @click="handleToolbar(item)" />
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
             <template v-if="item.auth">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
-                :icon="item.icon"
-                circle
-                :title="item.title"
-                @click="handleToolbar(item.name)"
-              />
+              <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon" circle
+                :title="item.title" @click="handleToolbar(item.name)" />
             </template>
             <template v-else>
-              <el-button
-                :icon="item.icon"
-                circle
-                :title="item.title"
-                @click="handleToolbar(item.name)"
-              />
+              <el-button :icon="item.icon" circle :title="item.title" @click="handleToolbar(item.name)" />
             </template>
           </template>
         </template>
       </div>
     </div>
     <!-- 列表 -->
-    <el-table
-      ref="tableRef"
-      v-loading="loading"
-      v-bind="contentConfig.table"
-      :data="pageData"
-      :row-key="pk"
-      @selection-change="handleSelectionChange"
-      @filter-change="handleFilterChange"
-    >
+    <el-table ref="tableRef" v-loading="loading" v-bind="contentConfig.table" :data="pageData" :row-key="pk"
+      @selection-change="handleSelectionChange" @filter-change="handleFilterChange">
       <template v-for="col in cols" :key="col">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
@@ -158,24 +105,15 @@
               <template v-if="col.prop">
                 <template v-if="Array.isArray(scope.row[col.prop])">
                   <template v-for="(item, index) in scope.row[col.prop]" :key="item">
-                    <el-image
-                      :src="item"
-                      :preview-src-list="scope.row[col.prop]"
-                      :initial-index="index"
-                      :preview-teleported="true"
-                      :style="`width: ${col.imageWidth ?? 40}px; height: ${
-                        col.imageHeight ?? 40
-                      }px`"
-                    />
+                    <el-image :src="item" :preview-src-list="scope.row[col.prop]" :initial-index="index"
+                      :preview-teleported="true" :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40
+                        }px`" />
                   </template>
                 </template>
                 <template v-else>
-                  <el-image
-                    :src="scope.row[col.prop]"
-                    :preview-src-list="[scope.row[col.prop]]"
+                  <el-image :src="scope.row[col.prop]" :preview-src-list="[scope.row[col.prop]]"
                     :preview-teleported="true"
-                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
-                  />
+                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`" />
                 </template>
               </template>
             </template>
@@ -197,30 +135,20 @@
             <template v-else-if="col.templet === 'switch'">
               <template v-if="col.prop">
                 <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
-                <el-switch
-                  v-model="scope.row[col.prop]"
-                  :active-value="col.activeValue ?? 1"
-                  :inactive-value="col.inactiveValue ?? 0"
-                  :inline-prompt="true"
-                  :active-text="col.activeText ?? ''"
-                  :inactive-text="col.inactiveText ?? ''"
-                  :validate-event="false"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @change="
+                <el-switch v-model="scope.row[col.prop]" :active-value="col.activeValue ?? 1"
+                  :inactive-value="col.inactiveValue ?? 0" :inline-prompt="true" :active-text="col.activeText ?? ''"
+                  :inactive-text="col.inactiveText ?? ''" :validate-event="false"
+                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)" @change="
                     pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
-                  "
-                />
+                    " />
               </template>
             </template>
             <!-- 生成输入框组件 -->
             <template v-else-if="col.templet === 'input'">
               <template v-if="col.prop">
-                <el-input
-                  v-model="scope.row[col.prop]"
-                  :type="col.inputType ?? 'text'"
+                <el-input v-model="scope.row[col.prop]" :type="col.inputType ?? 'text'"
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)"
-                />
+                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)" />
               </template>
             </template>
             <!-- 格式化为价格 -->
@@ -252,7 +180,7 @@
                 {{
                   scope.row[col.prop]
                     ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
-                        .value
+                      .value
                     : ""
                 }}
               </template>
@@ -263,82 +191,56 @@
                 <template v-if="typeof item === 'string'">
                   <!-- 编辑/删除 -->
                   <template v-if="item === 'edit' || item === 'delete'">
-                    <el-button
-                      v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                      :type="item === 'edit' ? 'primary' : 'danger'"
-                      :icon="item"
-                      size="small"
-                      link
-                      @click="
+                    <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                      :type="item === 'edit' ? 'primary' : 'danger'" :icon="item" size="small" link @click="
                         handleOperat({
                           name: item,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                      "
-                    >
+                        ">
                       {{ item === "edit" ? "编辑" : "删除" }}
                     </el-button>
                   </template>
                 </template>
                 <!-- 其他 -->
                 <template v-else-if="typeof item === 'object'">
-                  <el-button
-                    v-if="item.isBtn"
-                    v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
-                    :icon="item.icon"
-                    :type="item.type ?? 'primary'"
-                    size="small"
-                    link
-                    @click="
+                  <el-button v-if="item.isBtn" v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon"
+                    :type="item.type ?? 'primary'" size="small" link @click="
                       handleOperat({
                         name: item.name,
                         row: scope.row,
                         column: scope.column,
                         $index: scope.$index,
                       })
-                    "
-                  >
+                      ">
                     {{ item.text }}
                   </el-button>
 
                   <el-dropdown style="margin-top: 4px" v-else>
-                    <el-button
-                      v-if="item.render === undefined || item.render(scope.row)"
-                      v-bind="
-                        item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
-                      "
-                      :icon="item.icon"
-                      :type="item.type ?? 'primary'"
-                      size="small"
-                      link
-                      @click="
+                    <el-button v-if="item.render === undefined || item.render(scope.row)" v-bind="item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
+                      " :icon="item.icon" :type="item.type ?? 'primary'" size="small" link @click="
                         handleOperat({
                           name: item.name,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                      "
-                    >
+                        ">
                       {{ item.text }}
                     </el-button>
                     <template #dropdown v-if="item.options && item.options.length > 0">
                       <el-dropdown-menu>
-                        <el-dropdown-item
-                          @click="
-                            handleOperat({
-                              name: item.name,
-                              row: scope.row,
-                              column: scope.column,
-                              $index: scope.$index,
-                              command: opt.command ? opt.command : '',
-                            })
-                          "
-                          v-for="opt in item.options"
-                          :key="opt.value"
-                        >
+                        <el-dropdown-item @click="
+                          handleOperat({
+                            name: item.name,
+                            row: scope.row,
+                            column: scope.column,
+                            $index: scope.$index,
+                            command: opt.command ? opt.command : '',
+                          })
+                          " v-for="opt in item.options" :key="opt.value">
                           {{ opt.label }}
                         </el-dropdown-item>
                       </el-dropdown-menu>
@@ -359,33 +261,18 @@
     <template v-if="showPagination">
       <el-scrollbar>
         <div class="mt-[12px]">
-          <el-pagination
-            v-bind="pagination"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
+          <el-pagination v-bind="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
-    <el-dialog
-      v-model="exportsModalVisible"
-      :align-center="true"
-      title="导出数据"
-      width="600px"
-      style="padding-right: 0"
-      @close="handleCloseExportsModal"
-    >
+    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0"
+      @close="handleCloseExportsModal">
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form
-          ref="exportsFormRef"
-          label-width="auto"
-          style="padding-right: var(--el-dialog-padding-primary)"
-          :model="exportsFormData"
-          :rules="exportsFormRules"
-        >
+        <el-form ref="exportsFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
+          :model="exportsFormData" :rules="exportsFormRules">
           <el-form-item label="文件名" prop="filename">
             <el-input v-model="exportsFormData.filename" clearable />
           </el-form-item>
@@ -395,16 +282,10 @@
           <el-form-item label="数据源" prop="origin">
             <el-select v-model="exportsFormData.origin">
               <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
-              <el-option
-                label="选中数据 (所有选中的数据)"
-                :value="ExportsOriginEnum.SELECTED"
-                :disabled="selectionData.length <= 0"
-              />
-              <el-option
-                label="全量数据 (所有分页的数据)"
-                :value="ExportsOriginEnum.REMOTE"
-                :disabled="contentConfig.exportsAction === undefined"
-              />
+              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED"
+                :disabled="selectionData.length <= 0" />
+              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE"
+                :disabled="contentConfig.exportsAction === undefined" />
             </el-select>
           </el-form-item>
           <el-form-item label="字段" prop="fields">
@@ -425,35 +306,17 @@
       </template>
     </el-dialog>
     <!-- 导入弹窗 -->
-    <el-dialog
-      v-model="importModalVisible"
-      :align-center="true"
-      title="导入数据"
-      width="600px"
-      style="padding-right: 0"
-      @close="handleCloseImportModal"
-    >
+    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0"
+      @close="handleCloseImportModal">
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form
-          ref="importFormRef"
-          label-width="auto"
-          style="padding-right: var(--el-dialog-padding-primary)"
-          :model="importFormData"
-          :rules="importFormRules"
-        >
+        <el-form ref="importFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
+          :model="importFormData" :rules="importFormRules">
           <el-form-item label="文件名" prop="files">
-            <el-upload
-              ref="uploadRef"
-              v-model:file-list="importFormData.files"
-              class="w-full"
+            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
               accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-              :drag="true"
-              :limit="1"
-              :auto-upload="false"
-              :on-exceed="handleFileExceed"
-            >
+              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
               <el-icon class="el-icon--upload"><upload-filled /></el-icon>
               <div class="el-upload__text">
                 <span>将文件拖到此处，或</span>
@@ -462,13 +325,8 @@
               <template #tip>
                 <div class="el-upload__tip">
                   *.xlsx / *.xls
-                  <el-link
-                    v-if="contentConfig.importTemplate"
-                    type="primary"
-                    icon="download"
-                    :underline="false"
-                    @click="handleDownloadTemplate"
-                  >
+                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" :underline="false"
+                    @click="handleDownloadTemplate">
                     下载模板
                   </el-link>
                 </div>
@@ -480,11 +338,7 @@
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button
-            type="primary"
-            :disabled="importFormData.files.length === 0"
-            @click="handleImportSubmit"
-          >
+          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
             确 定
           </el-button>
           <el-button @click="handleCloseImportModal">取 消</el-button>
@@ -960,10 +814,10 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
     .indexAction(
       showPagination
         ? {
-            [request.pageName]: pagination.currentPage,
-            [request.limitName]: pagination.pageSize,
-            ...formData,
-          }
+          [request.pageName]: pagination.currentPage,
+          [request.limitName]: pagination.pageSize,
+          ...formData,
+        }
         : formData
     )
     .then((data) => {
@@ -1025,9 +879,14 @@ function saveXlsx(fileData: BlobPart, fileName: string) {
   document.body.removeChild(downloadLink);
   window.URL.revokeObjectURL(downloadUrl);
 }
-
+function test(rows: any[]) {
+  console.log(tableRef, 'tioshi222222222222222222222')
+  // rows.forEach((row) => {
+  //   tableRef.value!.toggleRowSelection(row, undefined)
+  // })
+}
 // 暴露的属性和方法
-defineExpose({ fetchPageData, exportPageData, getFilterParams, getselectTable, pagination });
+defineExpose({ fetchPageData, exportPageData, getFilterParams, getselectTable, pagination, test });
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/online-shop/goods-group.vue b/src/views/online-shop/goods-group.vue
index 24b24d9..444d429 100644
--- a/src/views/online-shop/goods-group.vue
+++ b/src/views/online-shop/goods-group.vue
@@ -107,6 +107,14 @@
           <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
         </template>
       </page-content>
+
+
+
+
+      <!-- <el-table :data="selectData" border style="width: 100%">
+        <el-table-column prop="date" align="center" label="Date" />
+        <el-table-column prop="address" align="center" label="Address" />
+      </el-table> -->
     </myDialog>
     <!-- 新增 -->
     <myDialog :title="title" width="30%" ref="myDialogRefAdd" @Confirm="addConfirm()">
@@ -212,8 +220,10 @@ let forms = reactive({
 
 // 添加商品
 function addgoods() {
+  // console.log(selectData.value, '编辑时候有的数据')
   switchref.value = true
   myDialogRef.value.open()
+
 }
 const rules = reactive<FormRules<RuleForm>>({
   name: [
@@ -273,7 +283,12 @@ function subitgood() {
 
   if (title.value == "编辑分组") {
     let arr = selectData.value
-    arr.push(...contentRefs.value.getselectTable())
+    contentRefs.value.getselectTable().forEach((item: any) => {
+      let selectdata = selectData.value.find(ele => ele.id == item.id)
+      if (!selectdata) {
+        arr.push(item)
+      }
+    })
     selectData.value = arr
   } else {
     selectData.value = contentRefs.value.getselectTable()
diff --git a/src/views/online-shop/goodsGroupconfig/content2.ts b/src/views/online-shop/goodsGroupconfig/content2.ts
index 27479f1..0390627 100644
--- a/src/views/online-shop/goodsGroupconfig/content2.ts
+++ b/src/views/online-shop/goodsGroupconfig/content2.ts
@@ -13,14 +13,17 @@ const contentConfig: IContentConfig = {
     pageSize: 10,
     pageSizes: [10, 20, 30, 50],
   },
-  indexAction: function (params) {
-    return UserAPI.getPage(params);
+  indexAction: async function (params) {
+    let res = await UserAPI.getPage(params);
+    console.log("indexAction:", res);
+    return res;
+    // return UserAPI.getPage(params);
   },
   modifyAction(data) {
     // 模拟发起网络请求修改字段
     // console.log("modifyAction:", data);
-    ElMessage.success(JSON.stringify(data));
-    return Promise.resolve(null);
+    // ElMessage.success(JSON.stringify(data));
+    // return Promise.resolve(null);
   },
 
   cols: [