From d705ba0926a3a5736e86fa92adecbaa6ca1d8093 Mon Sep 17 00:00:00 2001
From: 34626 <3462644232@qq.com>
Date: Fri, 15 Nov 2024 12:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96-=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CheckAttribute/index.vue    | 4 +++-
 src/views/product/attributeGroup/index.vue | 3 ++-
 src/views/product/category/index.vue       | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/CheckAttribute/index.vue b/src/components/CheckAttribute/index.vue
index 5b20ab3..7435fc7 100644
--- a/src/components/CheckAttribute/index.vue
+++ b/src/components/CheckAttribute/index.vue
@@ -60,7 +60,6 @@
     </el-card>
   </el-row>
 </template>
-
 <script>
 import {listAttribute} from "@/api/product/attribute";
 
@@ -99,7 +98,9 @@ export default {
   data() {
     return {
       attributeIdList: [],
+      //选中集合
       checkedAttributeList: [],
+      //未选属性的查询参数
       attributeQuery: {
         pageNum: 1,
         pageSize: 10,
@@ -107,6 +108,7 @@ export default {
         name: null
       },
       attributeTotal: 0,
+      //查询出来未选属性的结果
       attributeList: []
     }
   },
diff --git a/src/views/product/attributeGroup/index.vue b/src/views/product/attributeGroup/index.vue
index 4a3b7df..bba261f 100644
--- a/src/views/product/attributeGroup/index.vue
+++ b/src/views/product/attributeGroup/index.vue
@@ -141,7 +141,7 @@
             <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
           </el-form-item>
         </el-row>
-        <CheckAttribute v-model="form.attributeIdList"/>
+        <CheckAttribute v-model="form.attributeIdList" :checked-list="form.attributeList"/>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -258,6 +258,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改属性组";
+        console.log(this.form)
       });
     },
     /** 提交按钮 */
diff --git a/src/views/product/category/index.vue b/src/views/product/category/index.vue
index 977dd35..a4edc18 100644
--- a/src/views/product/category/index.vue
+++ b/src/views/product/category/index.vue
@@ -244,7 +244,7 @@ export default {
   watch: {
     'form.parentId': {
       handler(val){
-        if (val !== undefined && val !== 0){
+        if (val !== undefined && val !== 0  && val!=null){
           parentCommonElement(val).then(response => {
             this.attributeInfoList = response.data.attributeInfoList;
             this.attributeGroupList = response.data.attributeGroupList;