From a0c8a118c5cc4e4def4e42e1f1ae2567318d81bd Mon Sep 17 00:00:00 2001
From: zhh <zh@thinkerx.com>
Date: Thu, 24 May 2018 11:18:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=9B=E9=80=89=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/productAttrCate.js                    |  6 ++
 src/router/index.js                           |  3 +-
 .../components/ProductCateDetail.vue          | 55 ++++++++++---------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/api/productAttrCate.js b/src/api/productAttrCate.js
index 1d7043b..587630c 100644
--- a/src/api/productAttrCate.js
+++ b/src/api/productAttrCate.js
@@ -29,3 +29,9 @@ export function updateProductAttrCate(id,data) {
     data:data
   })
 }
+export function fetchListWithAttr() {
+  return request({
+    url:'/productAttribute/category/list/withAttr',
+    method:'get'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 217ebd7..48b85bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -60,7 +60,8 @@ export const constantRouterMap = [
         path: 'productComment',
         name: 'productComment',
         component: () => import('@/views/pms/product/index'),
-        meta: {title: '商品评价', icon: 'product-comment'}
+        meta: {title: '商品评价', icon: 'product-comment'},
+        hidden:true
       },
       {
         path: 'productCate',
diff --git a/src/views/pms/productCate/components/ProductCateDetail.vue b/src/views/pms/productCate/components/ProductCateDetail.vue
index 122511c..08381b8 100644
--- a/src/views/pms/productCate/components/ProductCateDetail.vue
+++ b/src/views/pms/productCate/components/ProductCateDetail.vue
@@ -46,8 +46,7 @@
         <el-cascader
           clearable
           v-model="filterProductAttr.value"
-          :options="filterAttrs"
-          @active-item-change="handleItemChange">
+          :options="filterAttrs">
         </el-cascader>
         <el-button style="margin-left: 20px" @click.prevent="removeFilterAttr(filterProductAttr)">删除</el-button>
       </el-form-item>
@@ -70,8 +69,8 @@
 
 <script>
   import {fetchList, createProductCate, updateProductCate, getProductCate} from '@/api/productCate';
-  import {fetchList as fetchProductAttrCateList} from '@/api/productAttrCate';
-  import {fetchList as fetchProductAttrList,getProductAttrInfo} from '@/api/productAttr';
+  import {fetchListWithAttr} from '@/api/productAttrCate';
+  import {getProductAttrInfo} from '@/api/productAttr';
   import SingleUpload from '@/components/Upload/singleUpload';
 
   const defaultProductCate = {
@@ -116,6 +115,17 @@
         getProductCate(this.$route.query.id).then(response => {
           this.productCate = response.data;
         });
+        getProductAttrInfo(this.$route.query.id).then(response => {
+          if (response.data != null && response.data.length > 0) {
+            this.filterProductAttrList = [];
+            for (let i = 0; i < response.data.length; i++) {
+              this.filterProductAttrList.push({
+                key: Date.now() + i,
+                value: [response.data[i].attributeCategoryId, response.data[i].attributeId]
+              })
+            }
+          }
+        });
       } else {
         this.productCate = Object.assign({}, defaultProductCate);
       }
@@ -130,11 +140,20 @@
         });
       },
       getProductAttrCateList() {
-        fetchProductAttrCateList({pageSize: 100, pageNum: 1}).then(response => {
-          let productAttrCateList = response.data.list;
-          for (let i = 0; i < productAttrCateList.length; i++) {
-            let productAttrCate = productAttrCateList[i];
-            this.filterAttrs.push({label: productAttrCate.name, value: productAttrCate.id, children: []});
+        fetchListWithAttr().then(response => {
+          let list = response.data;
+          for (let i = 0; i < list.length; i++) {
+            let productAttrCate = list[i];
+            let children = [];
+            if (productAttrCate.productAttributeList != null && productAttrCate.productAttributeList.length > 0) {
+              for (let j = 0; j < productAttrCate.productAttributeList.length; j++) {
+                children.push({
+                  label: productAttrCate.productAttributeList[j].name,
+                  value: productAttrCate.productAttributeList[j].id
+                })
+              }
+            }
+            this.filterAttrs.push({label: productAttrCate.name, value: productAttrCate.id, children: children});
           }
         });
       },
@@ -158,6 +177,7 @@
               type: 'warning'
             }).then(() => {
               if (this.isEdit) {
+                this.productCate.productAttributeIdList = this.getProductAttributeIdList();
                 updateProductCate(this.$route.query.id, this.productCate).then(response => {
                   this.$message({
                     message: '修改成功',
@@ -194,25 +214,10 @@
         this.$refs[formName].resetFields();
         this.productCate = Object.assign({}, defaultProductCate);
         this.getSelectProductCateList();
-        this.filterProductAttrList= [{
+        this.filterProductAttrList = [{
           value: []
         }];
       },
-      handleItemChange(val) {
-        let cateId = Number(val);
-        fetchProductAttrList(cateId, {pageSize: 100, pageNum: 1, type: 1}).then(response => {
-          let data = response.data.list;
-          let children = [];
-          for (let i = 0; i < data.length; i++) {
-            children.push({label: data[i].name, value: data[i].id});
-          }
-          for (let i = 0; i < this.filterAttrs.length; i++) {
-            if (cateId === this.filterAttrs[i].value) {
-              this.filterAttrs[i].children = children;
-            }
-          }
-        });
-      },
       removeFilterAttr(productAttributeId) {
         if (this.filterProductAttrList.length === 1) {
           this.$message({