字典组件

src/api/system/dict/data.js

@@ -58,3 +58,12 @@ export function listByTypes(dictTypes) {
     data: dictTypes
   })
 }
+
+// 删除字典数据
+export function allByTypes(dictTypes) {
+  return request({
+    url: '/system/dict/data/all-by-types',
+    method: 'POST',
+    data: dictTypes
+  })
+}

src/components/DictSelect/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-select v-model="model" v-bind="$props" @change="valueChange">
+  <el-select v-model="value1" clearable>
     <el-option
       v-for="item in options"
       :key="item.value"
@@ -11,27 +11,26 @@
 </template>
 
 <script>
+import {mapGetters} from "vuex";
+
 export default {
-  props: ["size", "value","options"],
+  props: ["size", "value", "propName"],
-  data() {
-    return {
-      // value:this.value
-    }
-  },
-  methods: {
-    valueChange(val){
-      this.$emit("change",val)
-    }
-  },
   computed: {
-    model: {
+    ...mapGetters(['dictMap']),
+    value1: {
       get() {
-        return this.value+'';
+        return this.value;
       },
       set(v) {
         this.$emit("input", v);
       },
     },
+    options() {
+      if (!this.propName) {
+        return [];
+      }
+      return this.dictMap[this.propName] || []
+    }
   },
 };
 </script>

src/config/business.js

@@ -0,0 +1,4 @@
+export const dict_types = ["sys_user_sex",
+  "sys_show_hide", "sys_normal_disable", "sys_job_status", "sys_job_group", "sys_yes_no", "sys_notice_type", "sys_notice_status",
+  "sys_oper_type", "sys_common_status", "wms_item_type", "wms_carrier_level", "wms_supplier_level", "wms_receipt_type", "wms_receipt_status",
+  "wms_shipment_type", "wms_shipment_status", "wms_movement_type", "wms_movement_status"];

src/layout/index.vue

@@ -58,7 +58,7 @@ export default {
     }
   },
   created() {
-    this.$store.dispatch('loadAllDict')
+    this.$store.dispatch('loadDictionaries')
   },
   methods: {
     handleClickOutside() {

src/store/getters.js

@@ -14,5 +14,7 @@ const getters = {
   topbarRouters:state => state.permission.topbarRouters,
   defaultRoutes:state => state.permission.defaultRoutes,
   sidebarRouters:state => state.permission.sidebarRouters,
+
+  dictMap: state => state.dict.dictMap
 }
-export default getters
+export default getters

src/store/index.js

@@ -6,6 +6,7 @@ import tagsView from './modules/tagsView'
 import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
+import dict from "@/store/modules/dict";
 
 Vue.use(Vuex)
 
@@ -15,7 +16,8 @@ const store = new Vuex.Store({
     user,
     tagsView,
     permission,
-    settings
+    settings,
+    dict
   },
   getters
 })

src/store/modules/dict.js

@@ -0,0 +1,37 @@
+import {allByTypes} from "@/api/system/dict/data";
+import {dict_types} from "@/config/business";
+
+const dict = {
+  state: {
+    dictMap: {}
+  },
+
+  mutations: {
+    SET_DICT_MAP: (state, map) => {
+      state.dictMap = map
+    },
+  },
+  actions: {
+    loadDictionaries({ commit, state }, force = false) {
+      if (!force && Object.keys(state.dictMap).length > 0) {
+        return Promise.resolve();
+      }
+      return allByTypes(dict_types).then(res => {
+        const rows = res.data
+        rows.sort((a, b) => a.dictSort - b.dictSort);
+        const map = {}
+        rows.forEach(it => {
+          let list = map[it.dictType];
+          if (!list) {
+            list = [];
+            map[it.dictType] = list;
+          }
+          list.push({...it, label: it.dictLabel, value: it.dictValue.match(/^\d+$/) ? +it.dictValue : it.dictValue })
+        })
+        commit('SET_DICT_MAP', map)
+      })
+    },
+  }
+}
+
+export default dict

src/views/login.vue

@@ -142,6 +142,7 @@ export default {
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            this.$store.dispatch('loadDictionaries', true)
           }).catch(() => {
             this.loading = false;
             if (this.captchaEnabled) {

src/views/pms/productCategory/index.vue

@@ -1,37 +1,26 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
-      <el-form-item label="上机分类的编号：0表示一级分类" prop="parentId">
+      <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入上机分类的编号：0表示一级分类"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="NAME" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入NAME"
+          placeholder="名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="分类级别：0->1级；1->2级" prop="level">
+      <el-form-item label="层级" prop="level">
         <el-input
           v-model="queryParams.level"
-          placeholder="请输入分类级别：0->1级；1->2级"
+          placeholder="层级"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="显示状态：0->不显示；1->显示" prop="showStatus">
+      <el-form-item label="显示状态" prop="showStatus">
-        <el-select v-model="queryParams.showStatus" placeholder="请选择显示状态：0->不显示；1->显示" clearable size="small">
+        <dict-select v-model="queryParams.showStatus" prop-name="sys_normal_disable" />
-              <el-option label="请选择字典生成" value="" />
-        </el-select>
       </el-form-item>
       <el-form-item label="SORT" prop="sort">
         <el-input
@@ -73,7 +62,7 @@
 
     <el-table v-loading="loading" :data="pmsProductCategoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="上机分类的编号：0表示一级分类" align="center" prop="parentId" />
+      <el-table-column label="上级分类的编号：0表示一级分类" align="center" prop="parentId" />
       <el-table-column label="NAME" align="center" prop="name" />
       <el-table-column label="分类级别：0->1级；1->2级" align="center" prop="level" />
       <el-table-column label="显示状态：0->不显示；1->显示" align="center" prop="showStatus" />
@@ -98,7 +87,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -110,8 +99,8 @@
     <!-- 添加或修改商品分类对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
-        <el-form-item label="上机分类的编号：0表示一级分类" prop="parentId">
+        <el-form-item label="上级分类的编号：0表示一级分类" prop="parentId">
-          <el-input v-model="form.parentId" placeholder="请输入上机分类的编号：0表示一级分类" />
+          <el-input v-model="form.parentId" placeholder="请输入上级分类的编号：0表示一级分类" />
         </el-form-item>
         <el-form-item label="NAME" prop="name">
           <el-input v-model="form.name" placeholder="请输入NAME" />