diff --git a/src/mixins/basic-page.js b/src/mixins/basic-page.js index 215dff8..93c812c 100644 --- a/src/mixins/basic-page.js +++ b/src/mixins/basic-page.js @@ -165,7 +165,11 @@ export default { this.$http("/sys/dict/type/all", { limit: 999, page: 1 }).then(({ data: res }) => { // console.log("[dictData] loading...", res); if (res.code === 0 && res.data) { - localStorage.setItem("dictList", JSON.stringify(res.data)); + let dictList = {} + res.data.map(item => { + Object.assign(dictList, { [item.dictType]: item.dataList }) + }) + localStorage.setItem("dictList", JSON.stringify(dictList)); } }); // end diff --git a/src/utils/filters.js b/src/utils/filters.js index 0c1f725..9d8539b 100644 --- a/src/utils/filters.js +++ b/src/utils/filters.js @@ -3,6 +3,7 @@ import moment from 'moment' export const dictFilter = dictTypeId => { return val => { + console.log('ddd', (JSON.parse(localStorage.getItem('dictList')))[dictTypeId]) return JSON.parse(localStorage.getItem('dictList'))[dictTypeId].find(item => item.dictValue === val)?.dictLabel || '-' } } @@ -21,8 +22,4 @@ export const pick = (obj, paths) => { } }) return result -} - -export const dictFind = (which) => { - return () => 1 } \ No newline at end of file diff --git a/src/views/modules/pms/materialStorage/config.js b/src/views/modules/pms/materialStorage/config.js index 4d5f469..09a99a9 100644 --- a/src/views/modules/pms/materialStorage/config.js +++ b/src/views/modules/pms/materialStorage/config.js @@ -1,13 +1,13 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; import StatusComponent from "@/components/noTemplateComponents/statusComponent"; import request from "@/utils/request"; -import { dictFind } from '@/utils/filters' +import { dictFilter } from '@/utils/filters' export default function () { const tableProps = [ { prop: "name", label: "料仓名称" }, { prop: "code", label: "料仓编码" }, - { prop: "typeDictValue", label: "料仓类型", filter: dictFind('料仓') }, + { prop: "typeDictValue", label: "料仓类型", filter: dictFilter('liangcang') }, { prop: "status", label: "产线状态", subcomponent: StatusComponent }, // subcomponent { prop: "description", label: "描述" }, { prop: "remark", label: "备注" }, diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 42b8743..616227f 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -198,13 +198,17 @@ export default { return this.$message.error(res.msg); } Cookies.set("token", res.data.token); - // 获取数据字典数据 - this.$http('/sys/dict/type/all', { limit: 999, page: 1 }).then(({data: res}) => { - // console.log('[dictData] loading...', res) + // 刷新数据字典数据 + this.$http("/sys/dict/type/all", { limit: 999, page: 1 }).then(({ data: res }) => { + // console.log("[dictData] loading...", res); if (res.code === 0 && res.data) { - localStorage.setItem('dictList', JSON.stringify(res.data)) + let dictList = {}; + res.data.map((item) => { + Object.assign(dictList, { [item.dictType]: item.dataList }); + }); + localStorage.setItem("dictList", JSON.stringify(dictList)); } - }) + }); // end this.$router.replace({ name: "home" }); })