From 019dfc754c253d4be1acee7166c1dae85c084eac Mon Sep 17 00:00:00 2001
From: yaoxin <1752800946@qq.com>
Date: Fri, 1 Mar 2024 19:25:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=BB=84=E5=A2=9E=E5=88=A0=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUpload/index.vue       |  1 +
 src/views/product/attribute/index.vue      |  7 ++++++
 src/views/product/attributeGroup/index.vue | 27 ++++++++++++++++++++--
 src/views/product/category/index.vue       |  9 +++++++-
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 3e32010..5198da2 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -151,6 +151,7 @@ export default {
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
         this.uploadList.push({name: res.data.url, url: res.data.url});
+        console.log(res.data.url)
         this.uploadedSuccessfully();
       } else {
         this.number--;
diff --git a/src/views/product/attribute/index.vue b/src/views/product/attribute/index.vue
index d1b259f..06757f8 100644
--- a/src/views/product/attribute/index.vue
+++ b/src/views/product/attribute/index.vue
@@ -117,11 +117,18 @@
 
 <script>
 import { listAttribute, getAttribute, delAttribute, addAttribute, updateAttribute } from "@/api/product/attribute";
+import {listAttributeGroup} from "@/api/product/attributeGroup";
 
 export default {
   name: "Attribute",
   data() {
     return {
+      queryParam: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        states: null
+      },
       // 遮罩层
       loading: true,
       // 选中数组
diff --git a/src/views/product/attributeGroup/index.vue b/src/views/product/attributeGroup/index.vue
index b9d3caf..1d69250 100644
--- a/src/views/product/attributeGroup/index.vue
+++ b/src/views/product/attributeGroup/index.vue
@@ -217,6 +217,13 @@ import {listAttribute} from "@/api/product/attribute";
 export default {
   name: "AttributeGroup",
   dicts: ['sys_yes_no'],
+  watch: {
+    'form.attributeIdList':{
+      handler(val) {
+        console.log(val)
+      }
+    }
+  },
   data() {
     return {
       // 遮罩层
@@ -245,7 +252,8 @@ export default {
         states: null
       },
       // 表单参数
-      form: {},
+      form: {
+      },
       // 表单校验
       rules: {
         name: [
@@ -270,6 +278,9 @@ export default {
       attributeList: []
     };
   },
+  activated() {
+    this.getList();
+  },
   created() {
     this.getList();
   },
@@ -283,6 +294,9 @@ export default {
         this.checkedAttributeList.push(attribute);
       }else {
         // 删除
+        console.log(this.checkedAttributeList)
+        console.log(attribute)
+        console.log(this.checkedAttributeList.indexOf(attribute))
         this.checkedAttributeList.splice(
           this.checkedAttributeList.indexOf(attribute), 1
         )
@@ -293,9 +307,10 @@ export default {
      * @param index
      */
     removeChecked(index){
-      console.log(index)
+      console.log(this.form.attributeIdList)
       this.checkedAttributeList.splice(index, 1);
       this.form.attributeIdList.splice(index, 1);
+      console.log(this.form.attributeIdList)
     },
 
     /**
@@ -320,6 +335,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.getList()
       this.reset();
     },
     // 表单重置
@@ -360,11 +376,18 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.checkedAttributeList = row.attributeInfoList
       const id = row.id || this.ids
       getAttributeGroup(id).then(response => {
+        const att = this.form.attributeIdList
         this.form = response.data;
         this.open = true;
         this.title = "修改属性组";
+        this.form.attributeIdList = att
+        row.attributeInfoList.forEach(att => {
+          this.form.attributeIdList.push(att.id)
+        })
+        this.queryAttribute();
       });
       this.queryAttribute();
     },
diff --git a/src/views/product/category/index.vue b/src/views/product/category/index.vue
index 1797ed9..e455df8 100644
--- a/src/views/product/category/index.vue
+++ b/src/views/product/category/index.vue
@@ -116,7 +116,13 @@
           <treeselect v-model="form.parentId" :options="categoryOptions" :normalizer="normalizer" placeholder="请选择父级品类" />
         </el-form-item>
         <el-form-item label="是否启用" prop="start">
-          <el-input v-model="form.start" placeholder="请输入是否启用" />
+          <el-radio-group v-model="form.start">
+            <el-radio
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="介绍">
           <editor v-model="form.introduction" :min-height="192"/>
@@ -140,6 +146,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Category",
+  dicts: ["sys_yes_no"],
   components: {
     Treeselect
   },