From fa6cba311ee44105b7edc7359f001fa461e77bcd Mon Sep 17 00:00:00 2001
From: zhaochencheng <zccbbg@qq.com>
Date: Sun, 1 Jan 2023 01:32:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E5=88=86=E7=B1=BB=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/ProdCategory.vue         | 65 -------------------
 .../components/ProductCategorySelect.vue      | 56 ++++++++++++++++
 src/views/index.vue                           |  2 +-
 src/views/pms/product/AddProduct.vue          |  4 +-
 src/views/pms/productCategory/index.vue       | 11 ++--
 5 files changed, 66 insertions(+), 72 deletions(-)
 delete mode 100644 src/views/components/ProdCategory.vue
 create mode 100644 src/views/components/ProductCategorySelect.vue

diff --git a/src/views/components/ProdCategory.vue b/src/views/components/ProdCategory.vue
deleted file mode 100644
index 726ffbf..0000000
--- a/src/views/components/ProdCategory.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-  <treeselect
-    v-model="value1"
-    :options="menuOptions"
-    :show-count="true"
-    placeholder="选择上级菜单"
-  />
-</template>
-
-<script>
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import {mapGetters} from "vuex";
-
-export default {
-  name: "ProdCategory",
-  components: {Treeselect},
-  props: ['value', 'root'],
-  computed: {
-    ...mapGetters(['productCategories']),
-    value1: {
-      get() {
-        return this.value;
-      },
-      set(v) {
-        this.$emit('input', v);
-      }
-    },
-    menuOptions() {
-      if (!this.productCategories || this.productCategories.length === 0) {
-        return [];
-      }
-      const map = {}
-      this.productCategories.forEach(it => {
-        let list = map[it.parentId]
-        if (!list) {
-          list = [];
-          map[it.parentId] = list;
-        }
-        list.push({id: it.id, label: it.name, parentId: it.parentId});
-      })
-      const stack = [...map['0']];
-      while (stack.length > 0) {
-        const p = stack.shift();
-        if (!map[p.id]) {
-          continue
-        }
-        p.children = map[p.id];
-        stack.push(...map[p.id])
-      }
-      if (this.root) {
-        return [{id: 0, label: '根节点', children: map['0']}];
-      }
-      return map['0'];
-    }
-  },
-  created() {
-    this.$store.dispatch('mall/loadProductCategories')
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/components/ProductCategorySelect.vue b/src/views/components/ProductCategorySelect.vue
new file mode 100644
index 0000000..373b8a4
--- /dev/null
+++ b/src/views/components/ProductCategorySelect.vue
@@ -0,0 +1,56 @@
+<template>
+  <el-cascader
+    v-model="value1"
+    :options="menuOptions"
+    :props="{ checkStrictly: true }"
+    placeholder="选择上级类目"
+  />
+</template>
+
+<script>
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {mapGetters} from "vuex";
+
+export default {
+  name: "ProductCategorySelect",
+  props: ['value'],
+  computed: {
+    ...mapGetters(['productCategories']),
+    value1: {
+      get() {
+        console.log(this.value)
+        return this.value;
+      },
+      set(v) {
+        console.log(v)
+        this.$emit('input', v);
+      }
+    },
+    menuOptions() {
+      if (!this.productCategories || this.productCategories.length === 0) {
+        return [];
+      }
+      this.recurs(this.productCategories)
+      return this.productCategories
+    }
+  },
+  methods: {
+    recurs(list){
+      list.forEach(it => {
+        it.label = it.name
+        it.value = it.id
+        if(it.children){
+          this.recurs(it.children)
+        }
+      })
+    }
+  },
+  created() {
+    this.$store.dispatch('mall/loadProductCategories')
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/index.vue b/src/views/index.vue
index a8df30a..e3805f2 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -130,7 +130,7 @@
                 h4 参与京东服务市场商品分析应用开发，参与京东服务市场会员积分应用开发
             el-timeline-item(placement="top" timestamp="2019年")
               el-card
-                h4 参与京东服务市场商品搬家应用开发，参与京东服务市场商品搬家应用开发，参与拼多多服务市场订单应用开发
+                h4 参与京东服务市场商品搬家应用开发，参与拼多多服务市场订单应用开发
             el-timeline-item(placement="top" timestamp="2020年")
               el-card
                 h4 所参与开发的拼多多订单应用排名服务市场类目第一，开始快手服务市场订单应用开发
diff --git a/src/views/pms/product/AddProduct.vue b/src/views/pms/product/AddProduct.vue
index e4e6b2c..174b3b6 100644
--- a/src/views/pms/product/AddProduct.vue
+++ b/src/views/pms/product/AddProduct.vue
@@ -75,12 +75,12 @@
 
 <script>
 import {addPmsProduct, getPmsProduct, updatePmsProduct} from "@/api/pms/product";
-import ProdCategory from "@/views/components/ProdCategory";
+import ProductCategorySelect from "@/views/components/ProductCategorySelect";
 import BrandSelect from "@/views/components/BrandSelect";
 
 export default {
   name: "AddProduct",
-  components: {BrandSelect, ProdCategory},
+  components: {BrandSelect, ProductCategorySelect},
   data() {
     return {
       form: {},
diff --git a/src/views/pms/productCategory/index.vue b/src/views/pms/productCategory/index.vue
index 0c10f07..a8d65a1 100644
--- a/src/views/pms/productCategory/index.vue
+++ b/src/views/pms/productCategory/index.vue
@@ -93,10 +93,10 @@
           <el-input v-model="form.sort" placeholder="排序"/>
         </el-form-item>
         <el-form-item label="层级" prop="level">
-          <el-input v-model="form.level" placeholder="层级：0->1级；1->2级"/>
+          <el-input v-model="form.level" placeholder="层级"/>
         </el-form-item>
         <el-form-item label="上级分类" prop="parentId">
-          <prod-category class="w200" v-model="form.parentId" :root="true"/>
+          <product-category-select class="w200" v-model="form.parentId"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -116,12 +116,12 @@ import {
   updatePmsProductCategory,
   exportPmsProductCategory
 } from "@/api/pms/productCategory";
-import ProdCategory from "@/views/components/ProdCategory";
+import ProductCategorySelect from "@/views/components/ProductCategorySelect";
 
 export default {
   name: "PmsProductCategory",
   dicts: ['sys_normal_disable'],
-  components: {ProdCategory},
+  components: {ProductCategorySelect},
   data() {
     return {
       // 遮罩层
@@ -227,6 +227,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.id != null) {
             p = updatePmsProductCategory(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");