From 528be26be68501c05fc0e2540d45035d4ce8df86 Mon Sep 17 00:00:00 2001
From: BabyBoy <2019108827@qq.com>
Date: Thu, 21 Aug 2025 15:33:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pms/productCategory.js          |   6 +-
 src/layout/components/Navbar.vue        |   4 +-
 src/views/pms/product/AddProduct.vue    | 402 +++++++++++++++---------
 src/views/pms/product/index.vue         |  34 +-
 src/views/pms/productCategory/index.vue |  51 +--
 src/views/system/category/index.vue     |   5 +-
 6 files changed, 316 insertions(+), 186 deletions(-)

diff --git a/src/api/pms/productCategory.js b/src/api/pms/productCategory.js
index 83f5598..d21717e 100644
--- a/src/api/pms/productCategory.js
+++ b/src/api/pms/productCategory.js
@@ -3,10 +3,10 @@ import request from '@/utils/request';
 // 查询商品分类列表
 export function listPmsProductCategory(query, pageReq) {
   return request({
-    url: '/app/productCategory/page',
+    url: '/pms/product/category/tree',
     method: 'post',
-    data: query,
-    params: pageReq
+    data: query
+    // params: pageReq
   });
 }
 
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index e27f598..9d1f086 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,7 +6,7 @@
 
     <div class="right-menu flex align-center">
       <template v-if="appStore.device !== 'mobile'">
-        <!-- <el-select
+        <el-select
           v-if="userId === 1 && tenantEnabled"
           v-model="companyId"
           class="min-w-244px"
@@ -19,7 +19,7 @@
         >
           <el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"> </el-option>
           <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
-        </el-select> -->
+        </el-select>
 
         <search-menu ref="searchMenuRef" />
         <el-tooltip content="搜索" effect="dark" placement="bottom">
diff --git a/src/views/pms/product/AddProduct.vue b/src/views/pms/product/AddProduct.vue
index abd44da..249b152 100644
--- a/src/views/pms/product/AddProduct.vue
+++ b/src/views/pms/product/AddProduct.vue
@@ -27,7 +27,21 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="分类" prop="categoryId">
-              <product-category-select v-model="form.categoryId" @change="categoryChange" :style="{ width: '300px' }"></product-category-select>
+              <el-cascader
+                style="width: 100%"
+                v-model="form.categoryId"
+                :options="categoryOptions"
+                :props="{
+                  value: 'id',
+                  label: 'name',
+                  children: 'children',
+                  checkStrictly: true,
+                  emitPath: false
+                }"
+                placeholder="请选择分类"
+                clearable
+                filterable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -69,10 +83,10 @@
           </div>
         </template>
         <el-form-item label="主图" prop="pic">
-          <oss-image-upload v-model="form.pic" :limit="1" @input=""></oss-image-upload>
+          <oss-image-upload v-model="form.pic" :limit="1"></oss-image-upload>
         </el-form-item>
         <el-form-item label="轮播图" prop="albumPics">
-          <oss-image-upload v-model="albumPics" :limit="5"></oss-image-upload>
+          <oss-image-upload v-model="albumPics" :limit="5" class="img-upload-mini"></oss-image-upload>
         </el-form-item>
       </el-card>
 
@@ -85,15 +99,26 @@
         <el-form-item label="规格类型">
           <div class="sku-wrapper">
             <div class="sku_sorts">
+              <div :style="{ display: 'flex', width: '500px' }">
+                <el-input v-model="nameAdd" placeholder="请输入要添加的规格名称（例如大小，版本，颜色）"></el-input>
+                <el-button @click="addSkuSort" :style="{ marginLeft: '10px' }">+添加规格类型</el-button>
+              </div>
               <div class="sku_sort" v-for="(s, idx0) in productAttr" :key="s.name">
                 <div class="label flex-center">
-                  <div class="flex-one">
+                  <!-- <div class="flex-one">
                     <dict-select v-model="s.name" prop-name="sku_sort_list" value-prop="label"></dict-select>
-                  </div>
-                  <a class="red" @click="deleteSkuSort(idx0)">{{ s.name }}</a>
+                  </div> -->
+                  <a class="red" @click="deleteSkuSort(idx0)">{{ s.name }}</a
+                  ><span :style="{ color: 'blue', cursor: 'pointer', padding: '0 4px' }" @click="moveSpecGroupUp(s, idx0)" v-if="idx0 > 0">↑</span>
+                  <span
+                    :style="{ color: 'blue', cursor: 'pointer', padding: '0 4px' }"
+                    @click="moveSpecGroupDown(s, idx0)"
+                    v-if="idx0 < s.options.length - 1"
+                    >↓</span
+                  >
                 </div>
                 <div class="values" v-if="s.name">
-                  <div :style="{ display: 'flex' }" v-if="s.name == '颜色'">
+                  <div :style="{ display: 'flex' }">
                     <div class="value" v-for="(it2, idx1) in s.options" :key="idx1">
                       <el-tag type="primary" v-if="idx1 != undefined">
                         <span>{{ it2.name }} </span>
@@ -103,59 +128,21 @@
                       </el-tag>
                     </div>
                     <div :style="{ padding: '0 32px 8px 0', display: 'flex', alignItems: 'center', gap: '8px' }">
-                      <el-input v-model="color" placeholder="请输入规格名称"></el-input>
+                      <el-input v-model="s.newOptionName" placeholder="请输入规格值"></el-input>
                       <el-tag type="primary">
                         <span @click="addOption(s, idx1)">添加</span>
                       </el-tag>
                     </div>
                   </div>
-                  <div :style="{ display: 'flex' }" v-if="s.name == '大小'">
-                    <div class="value" v-for="(it2, idx1) in s.memory" :key="idx1">
-                      <el-tag type="primary" v-if="idx1 != undefined">
-                        <span>{{ it2.name }} </span>
-                        <span
-                          :style="{ color: 'red', cursor: 'pointer', paddingLeft: '8px' }"
-                          @click="deleteOption1(s, idx1)"
-                          v-if="idx1 != undefined"
-                          >X</span
-                        >
-                      </el-tag>
-                    </div>
-                    <div :style="{ padding: '0 32px 8px 0', display: 'flex', alignItems: 'center', gap: '8px' }">
-                      <el-input v-model="memory" placeholder="请输入规格名称" @keyup.enter="addOption1(s, idx1)"></el-input>
-                      <el-tag type="primary">
-                        <span @click="addOption1(s, idx1)">添加</span>
-                      </el-tag>
-                    </div>
-                  </div>
-                  <div :style="{ display: 'flex' }" v-if="s.name == '版本'">
-                    <div class="value" v-for="(it2, idx1) in s.version" :key="idx1">
-                      <el-tag type="primary" v-if="idx1 != undefined">
-                        <span>{{ it2.name }} </span>
-                        <span
-                          :style="{ color: 'red', cursor: 'pointer', paddingLeft: '8px' }"
-                          @click="deleteOption2(s, idx1)"
-                          v-if="idx1 != undefined"
-                          >X</span
-                        >
-                      </el-tag>
-                    </div>
-                    <div :style="{ padding: '0 32px 8px 0', display: 'flex', alignItems: 'center', gap: '8px' }">
-                      <el-input v-model="version" placeholder="请输入规格名称" @keyup.enter="addOption2(s, idx1)"></el-input>
-                      <el-tag type="primary">
-                        <span @click="addOption2(s, idx1)">添加</span>
-                      </el-tag>
-                    </div>
-                  </div>
                 </div>
               </div>
             </div>
-            <!-- <el-button v-if="productAttr.length < 2" @click="addSkuSort">+添加规格类型</el-button> -->
           </div>
         </el-form-item>
+
         <el-form-item label="规格信息">
           <el-button @click="refreshSku()" class="mb20">刷新列表</el-button>
-          <el-table :data="form.skuList" :max-height="400">
+          <el-table :data="form.skuList" :max-height="400" :span-method="objectSpanMethod">
             <el-table-column v-for="s in skuAttr" :label="s.name" :key="s.name" :prop="s.name"></el-table-column>
             <el-table-column label="展示图片">
               <template v-slot="{ row }">
@@ -182,6 +169,13 @@
                 </el-form-item>
               </template>
             </el-table-column>
+            <el-table-column label="操作">
+              <template v-slot="{ row, $index }">
+                <el-form-item>
+                  <el-button text type="primary" icon="Delete" @click="handleDeleteSku(row, $index)">删除</el-button>
+                </el-form-item>
+              </template>
+            </el-table-column>
           </el-table>
         </el-form-item>
       </el-card>
@@ -209,106 +203,203 @@
 
 <script>
 import { addPmsProduct, getPmsProduct, updatePmsProduct } from '@/api/pms/product';
-import ProductCategorySelect from '@/views/components/ProductCategorySelect';
+// import ProductCategorySelect from '@/views/components/ProductCategorySelect';
 import BrandSelect from '@/views/components/BrandSelect';
-
+import { listPmsProductCategory } from '@/api/pms/productCategory';
 export default {
   name: 'AddProduct',
   dicts: ['pms_publish_status'],
-  components: { BrandSelect, ProductCategorySelect },
+  components: { BrandSelect },
   data() {
     return {
       color: '',
-      memory: '',
-      version: '',
+      nameAdd: '',
       rules: {
         name: [{ required: true, message: '请输入商品名称', trigger: 'blur' }]
       },
+      categoryOptions: [],
       form: {
         publishStatus: '',
         sort: 1000
       },
       skuAttr: [],
       albumPics: null,
-      productAttr: [
-        {
-          name: '颜色',
-          options: [{ name: '红' }]
-        },
-        {
-          name: '大小',
-          memory: [{ name: '4G' }]
-        },
-        {
-          name: '版本',
-          version: [{ name: '12' }]
-        }
-      ],
+      productAttr: [],
       maxOptionNum: 44
     };
   },
   created() {
+    this.getSkuList();
     const { id } = this.$route.query;
     if (id) {
       this.getInfo(id);
     }
   },
   methods: {
+    // 删除单个SKU
+    handleDeleteSku(row, index) {
+      this.$modal.confirm('确定要删除这个规格组合吗？').then(() => {
+        // 只删除当前这一行
+        console.log(this.form.skuList, index);
+        this.form.skuList.splice(index, 1);
+        this.$modal.success('删除成功');
+      });
+    },
+    // 向上移动整个规格组
+    moveSpecGroupUp(s, index) {
+      if (index > 0) {
+        const temp = this.productAttr[index];
+        this.productAttr[index] = this.productAttr[index - 1];
+        this.productAttr[index - 1] = temp;
+        this.refreshSku(); // 重新生成SKU列表
+      }
+    },
+
+    // 向下移动整个规格组
+    moveSpecGroupDown(s, index) {
+      if (index < this.productAttr.length - 1) {
+        const temp = this.productAttr[index];
+        this.productAttr[index] = this.productAttr[index + 1];
+        this.productAttr[index + 1] = temp;
+        this.refreshSku(); // 重新生成SKU列表
+      }
+    },
+    // 完全替换现有的 objectSpanMethod 方法
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      // 只对规格列进行合并（排除图片、价格等操作列）
+      if (columnIndex < this.skuAttr.length) {
+        return this.calculateMultiLevelSpan(rowIndex, columnIndex);
+      }
+      return { rowspan: 1, colspan: 1 };
+    },
+
+    // 新增多级合并计算逻辑
+    calculateMultiLevelSpan(rowIndex, columnIndex) {
+      if (!this.form.skuList || this.form.skuList.length === 0) {
+        return { rowspan: 1, colspan: 1 };
+      }
+
+      const currentRow = this.form.skuList[rowIndex];
+
+      // 如果是第一列（最外层规格）
+      if (columnIndex === 0) {
+        const specName = this.skuAttr[0].name;
+        const currentValue = currentRow[specName];
+
+        // 找到这个值的起始行和结束行
+        let startRow = rowIndex;
+        let endRow = rowIndex;
+
+        // 向上查找
+        for (let i = rowIndex - 1; i >= 0; i--) {
+          if (this.form.skuList[i][specName] === currentValue) {
+            startRow = i;
+          } else {
+            break;
+          }
+        }
+
+        // 向下查找
+        for (let i = rowIndex + 1; i < this.form.skuList.length; i++) {
+          if (this.form.skuList[i][specName] === currentValue) {
+            endRow = i;
+          } else {
+            break;
+          }
+        }
+
+        const rowspan = endRow - startRow + 1;
+
+        // 只在起始行显示合并
+        if (rowIndex === startRow) {
+          return { rowspan, colspan: 1 };
+        } else {
+          return { rowspan: 0, colspan: 0 };
+        }
+      }
+
+      // 对于其他列（内层规格）
+      if (columnIndex > 0) {
+        const specName = this.skuAttr[columnIndex].name;
+        const currentValue = currentRow[specName];
+
+        // 获取所有前置规格的值
+        const prefixSpecs = {};
+        for (let i = 0; i < columnIndex; i++) {
+          prefixSpecs[this.skuAttr[i].name] = currentRow[this.skuAttr[i].name];
+        }
+
+        // 找到在当前前置规格组合下的相同值范围
+        let startRow = rowIndex;
+        let endRow = rowIndex;
+
+        // 向上查找
+        for (let i = rowIndex - 1; i >= 0; i--) {
+          let match = true;
+          for (const [key, value] of Object.entries(prefixSpecs)) {
+            if (this.form.skuList[i][key] !== value) {
+              match = false;
+              break;
+            }
+          }
+          if (match && this.form.skuList[i][specName] === currentValue) {
+            startRow = i;
+          } else {
+            break;
+          }
+        }
+
+        // 向下查找
+        for (let i = rowIndex + 1; i < this.form.skuList.length; i++) {
+          let match = true;
+          for (const [key, value] of Object.entries(prefixSpecs)) {
+            if (this.form.skuList[i][key] !== value) {
+              match = false;
+              break;
+            }
+          }
+          if (match && this.form.skuList[i][specName] === currentValue) {
+            endRow = i;
+          } else {
+            break;
+          }
+        }
+
+        const rowspan = endRow - startRow + 1;
+
+        // 只在起始行显示合并
+        if (rowIndex === startRow) {
+          return { rowspan, colspan: 1 };
+        } else {
+          return { rowspan: 0, colspan: 0 };
+        }
+      }
+
+      return { rowspan: 1, colspan: 1 };
+    },
     refreshSku() {
       let skus = [];
       const skuMap = new Map();
       this.skuAttr = [...this.productAttr];
       if (this.form.skuList) {
         this.form.skuList.forEach((sku) => {
-          console.log(sku);
           skuMap.set(sku.spData, sku);
         });
       }
-      console.log(skuMap);
       this.productAttr.forEach((attr, index) => {
         const attrSku = [];
-        if (attr.name === '颜色') {
-          attr.options.forEach((option) => {
-            if (!option.name) {
-              return;
-            }
-            if (index === 0) {
-              attrSku.push({ [attr.name]: option.name });
-            } else {
-              skus.forEach((it3) => {
-                attrSku.push({ ...it3, [attr.name]: option.name });
-              });
-            }
-          });
-        }
-        if (attr.name === '大小') {
-          attr.memory.forEach((option) => {
-            if (!option.name) {
-              return;
-            }
-            if (index === 0) {
-              attrSku.push({ [attr.name]: option.name });
-            } else {
-              skus.forEach((it3) => {
-                attrSku.push({ ...it3, [attr.name]: option.name });
-              });
-            }
-          });
-        }
-        if (attr.name === '版本') {
-          attr.version.forEach((option) => {
-            if (!option.name) {
-              return;
-            }
-            if (index === 0) {
-              attrSku.push({ [attr.name]: option.name });
-            } else {
-              skus.forEach((it3) => {
-                attrSku.push({ ...it3, [attr.name]: option.name });
-              });
-            }
-          });
-        }
+        attr.options.forEach((option) => {
+          if (!option.name) {
+            return;
+          }
+          if (index === 0) {
+            attrSku.push({ [attr.name]: option.name });
+          } else {
+            skus.forEach((it3) => {
+              attrSku.push({ ...it3, [attr.name]: option.name });
+            });
+          }
+        });
         skus = attrSku;
       });
       skus.forEach((it) => {
@@ -333,7 +424,17 @@ export default {
         }
       });
       this.form.productAttr = JSON.stringify(this.productAttr);
-      this.form.skuList = skus;
+      this.form.skuList = skus.sort((a, b) => {
+        // 按规格顺序排序，确保合并正确
+        for (let i = 0; i < this.skuAttr.length; i++) {
+          const specName = this.skuAttr[i].name;
+          if (a[specName] !== b[specName]) {
+            return a[specName].localeCompare(b[specName]);
+          }
+        }
+        return 0;
+      });
+      // this.form.skuList = skus;
     },
     categoryChange(value) {
       if (Array.isArray(value)) {
@@ -352,7 +453,7 @@ export default {
           this.albumPics = albumPics.split(',');
         }
         this.form = response.data;
-
+        this.form.publishStatus = this.form.publishStatus.toString();
         if (this.form.productAttr) {
           this.productAttr = JSON.parse(this.form.productAttr);
         }
@@ -411,45 +512,44 @@ export default {
       s.options.push({ name: null });
     },
     addSkuSort() {
-      this.productAttr.push({
-        name: null,
-        options: [{ name: null }]
-      });
+      if (this.nameAdd != '') {
+        this.productAttr.push({
+          name: this.nameAdd,
+          options: [],
+          newOptionName: ''
+        });
+        this.nameAdd = '';
+      } else {
+        this.$modal.msgError(`请输入规格名称`);
+      }
     },
     deleteSkuSort(idx) {
-      this.productAttr.splice(idx);
+      this.productAttr.splice(idx, 1);
     },
-    deleteOption(s, idx) {
-      s.options.splice(idx, 1);
+    addOption(specGroup, index) {
+      const newName = specGroup.newOptionName?.trim();
+      if (!newName) {
+        this.$modal.msgError('请输入规格值');
+        return;
+      }
+      // 检查是否已存在
+      const exists = specGroup.options.some((opt) => opt.name === newName);
+      if (exists) {
+        this.$modal.msgError('该规格已存在');
+        return;
+      }
+      specGroup.options.push({ name: newName });
+      specGroup.newOptionName = ''; // 清空输入框
+      this.refreshSku();
     },
-    deleteOption1(s, idx) {
-      s.memory.splice(idx, 1);
+
+    deleteOption(specGroup, index) {
+      specGroup.options.splice(index, 1);
+      this.refreshSku();
     },
-    deleteOption2(s, idx) {
-      s.version.splice(idx, 1);
-    },
-    addOption(s, idx) {
-      this.$nextTick(() => {
-        if (this.color != '') {
-          s.options.push({ name: this.color });
-          this.color = '';
-        }
-      });
-    },
-    addOption1(s, idx) {
-      this.$nextTick(() => {
-        if (this.memory !== '') {
-          s.memory.push({ name: this.memory });
-          this.memory = '';
-        }
-      });
-    },
-    addOption2(s, idx) {
-      this.$nextTick(() => {
-        if (this.version !== '') {
-          s.version.push({ name: this.version });
-          this.version = '';
-        }
+    getSkuList() {
+      listPmsProductCategory({ id: null }).then((response) => {
+        this.categoryOptions = response.data;
       });
     }
   }
@@ -485,4 +585,12 @@ export default {
     width: 48px;
     height: 48px;
     line-height: 57px;
+  .hide  .el-upload-list--picture-card .el-upload-list__item
+      width: 80px;
+      height: 80px;
+      margin-bottom: 0;
+      margin-right: 8px;
+  .el-upload-list--picture-card .el-upload-list__item
+    width: 80px;
+    height:80px;
 </style>
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index 5f02226..8977cbc 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -15,9 +15,21 @@
             </el-select>
           </el-form-item>
           <el-form-item label="分类" prop="categoryId">
-            <el-select v-model="queryParams.categoryId" placeholder="请选择分类" clearable @change="handleQuery">
-              <el-option v-for="item in getCategoryNameLike" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
+            <el-cascader
+              style="width: 100%"
+              v-model="queryParams.categoryId"
+              :options="categoryOptions"
+              :props="{
+                value: 'id',
+                label: 'name',
+                children: 'children',
+                checkStrictly: true,
+                emitPath: false
+              }"
+              placeholder="请选择分类"
+              clearable
+              filterable
+            />
           </el-form-item>
           <el-form-item label="编码" prop="outProductId">
             <el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable @keyup.enter="handleQuery" />
@@ -184,6 +196,7 @@ import { isStarRepo } from '@/utils/is-star-plugin';
 import { useUserStore } from '@/store/modules/user';
 import AddressSelector from '@/views/components/AddressSelector/index.vue';
 import { editUserData } from '@/api/ums/member.js';
+import { listPmsProductCategory } from '@/api/pms/productCategory';
 export default {
   name: 'PmsProduct',
   components: { AddressSelector },
@@ -230,7 +243,6 @@ export default {
         /*        email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],*/
         phone: [{ required: true, pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }]
       },
-      getCategoryNameLike: [],
       getbrandList: [],
       // 查询参数
       queryParams: {
@@ -252,12 +264,13 @@ export default {
         brandName: null,
         productCategoryName: null,
         brandId: null
-      }
+      },
+      categoryOptions: []
     };
   },
   created() {
+    this.getSkuList();
     this.getList();
-    this.getgetproductCategoryNameLike();
     this.getbrand();
   },
   computed: {
@@ -268,11 +281,12 @@ export default {
     }
   },
   methods: {
-    // 查询商品分类列表
-    async getgetproductCategoryNameLike() {
-      const res = await getproductCategoryNameLike();
-      this.getCategoryNameLike = res.data;
+    getSkuList() {
+      listPmsProductCategory({ id: null }).then((response) => {
+        this.categoryOptions = response.data;
+      });
     },
+
     // 查询商品分类列表
     async getbrand() {
       const res = await getbrand();
diff --git a/src/views/pms/productCategory/index.vue b/src/views/pms/productCategory/index.vue
index 855be09..538f6ba 100644
--- a/src/views/pms/productCategory/index.vue
+++ b/src/views/pms/productCategory/index.vue
@@ -27,8 +27,7 @@
         v-loading="loading"
         :data="pmsProductCategoryList"
         border
-        :tree-props="{ hasChildren: 'hasChildren', children: 'children' }"
-        @selection-change="handleSelectionChange"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         row-key="id"
       >
         <el-table-column label="名称" prop="name" align="center" />
@@ -44,7 +43,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="排序" prop="sort" align="center" />
+        <el-table-column label="排序" prop="sort" align="left" />
         <el-table-column label="状态" prop="showStatus" align="center">
           <template v-slot="{ row }">
             <dict-tag :options="showStatusMap" :value="row.showStatus" prop-name="sys_show_status"></dict-tag>
@@ -52,6 +51,7 @@
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template v-slot="scope">
+            <el-button text type="primary" icon="Edit" @click="handadd(scope.row)" v-if="!scope.row.parentId">添加二级分类 </el-button>
             <el-button text type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改 </el-button>
             <el-button text type="primary" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
           </template>
@@ -77,9 +77,10 @@
         <!-- <el-form-item label="层级" prop="level">
           <el-input v-model="form.level" placeholder="层级" />
         </el-form-item> -->
-        <!-- <el-form-item label="上级分类" prop="parentId">
-          <product-category-select class="w200" v-model="form.parentId" :props="{ checkStrictly: true }"/>
-        </el-form-item> -->
+        <el-form-item label="上级分类" prop="parentId" v-if="form.parentId">
+          {{ nameFn }}
+          <!-- <product-category-select class="w200" v-model="form.parentId" :props="{ checkStrictly: true }"/> -->
+        </el-form-item>
       </el-form>
       <template v-slot:footer>
         <div class="dialog-footer">
@@ -136,11 +137,13 @@ export default {
         showStatus: '',
         sort: null
       },
+
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
-      showStatusMap: []
+      showStatusMap: [],
+      nameFn: ''
     };
   },
   async mounted() {
@@ -154,11 +157,11 @@ export default {
       this.loading = true;
       const { pageNum, pageSize } = this.queryParams;
       const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
-      const pageReq = { current: pageNum - 1, size: pageSize };
-      listPmsProductCategory(query, pageReq).then((response) => {
-        const { records, total } = response.data || {};
-        this.pmsProductCategoryList = records;
-        this.total = total;
+      // const pageReq = { current: pageNum - 1, size: pageSize };
+      listPmsProductCategory(query).then((response) => {
+        const res = response.data || {};
+        this.pmsProductCategoryList = res;
+
         this.loading = false;
       });
     },
@@ -194,17 +197,25 @@ export default {
       this.handleQuery();
     },
     // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
+    // handleSelectionChange(selection) {
+    //   this.ids = selection.map((item) => item.id);
+    //   this.single = selection.length !== 1;
+    //   this.multiple = !selection.length;
+    // },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.title = '添加商品分类';
     },
+    handadd(row) {
+      this.reset();
+
+      this.title = '添加二级商品分类';
+      this.form.parentId = row.id;
+      this.nameFn = row.name;
+      this.open = true;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -224,9 +235,9 @@ export default {
       this.$refs['form'].validate((valid) => {
         if (valid) {
           let p;
-          if (this.form.parentId) {
-            this.form.parentId = this.form.parentId.pop();
-          }
+          // if (this.form.parentId) {
+          //   this.form.parentId = this.form.parentId.pop();
+          // }
           if (this.form.id != null) {
             p = updatePmsProductCategory(this.form).then((response) => {
               this.$modal.msgSuccess('修改成功');
diff --git a/src/views/system/category/index.vue b/src/views/system/category/index.vue
index bd7107a..e871aa2 100644
--- a/src/views/system/category/index.vue
+++ b/src/views/system/category/index.vue
@@ -10,7 +10,7 @@
               </el-col>
             </el-row>
           </template>
-          <el-table v-loading="loading" border :data="postList" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" row-key="id">
+          <el-table v-loading="loading" border :data="postList" :tree-props="{ children: 'children' }" row-key="id">
             <el-table-column label="分类名称" align="left" prop="name" />
             <el-table-column label="排序" align="center" prop="sort" />
             <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
@@ -70,9 +70,6 @@ const showSearch = ref(true);
 const ids = ref<Array<number | string>>([]);
 const single = ref(true);
 const multiple = ref(true);
-const total = ref(0);
-const deptName = ref('');
-const deptOptions = ref<DeptVO[]>([]);
 const deptTreeRef = ref<ElTreeInstance>();
 const postFormRef = ref<ElFormInstance>();
 const queryFormRef = ref<ElFormInstance>();