@@ -25,6 +25,14 @@ export function getDicts(dictType) { | |||||
}) | }) | ||||
} | } | ||||
// 根据字典类型查询字典数据信息 | |||||
export function getAllDicts(dictType) { | |||||
return request({ | |||||
url: '/system/dict/data/type/all/' + dictType, | |||||
method: 'get' | |||||
}) | |||||
} | |||||
// 新增字典数据 | // 新增字典数据 | ||||
export function addData(data) { | export function addData(data) { | ||||
return request({ | return request({ | ||||
@@ -16,7 +16,7 @@ import { download } from '@/utils/request' | |||||
import './assets/icons' // icon | import './assets/icons' // icon | ||||
import './permission' // permission control | import './permission' // permission control | ||||
import { getDicts } from "@/api/system/dict/data" | |||||
import { getDicts, getAllDicts } from "@/api/system/dict/data" | |||||
import { getConfigKey } from "@/api/system/config" | import { getConfigKey } from "@/api/system/config" | ||||
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi" | import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi" | ||||
// 分页组件 | // 分页组件 | ||||
@@ -38,6 +38,7 @@ import DictData from '@/components/DictData' | |||||
// 全局方法挂载 | // 全局方法挂载 | ||||
Vue.prototype.getDicts = getDicts | Vue.prototype.getDicts = getDicts | ||||
//Vue.prototype.getAllDicts = getAllDicts | |||||
Vue.prototype.getConfigKey = getConfigKey | Vue.prototype.getConfigKey = getConfigKey | ||||
Vue.prototype.parseTime = parseTime | Vue.prototype.parseTime = parseTime | ||||
Vue.prototype.resetForm = resetForm | Vue.prototype.resetForm = resetForm | ||||
@@ -67,10 +67,10 @@ function loadDict(dict, dictMeta) { | |||||
const type = dictMeta.type | const type = dictMeta.type | ||||
let dicts = dictMeta.responseConverter(response, dictMeta) | let dicts = dictMeta.responseConverter(response, dictMeta) | ||||
if (!(dicts instanceof Array)) { | if (!(dicts instanceof Array)) { | ||||
console.error('the return of responseConverter must be Array.<DictData>') | |||||
//console.error('the return of responseConverter must be Array.<DictData>') | |||||
dicts = [] | dicts = [] | ||||
} else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) { | } else if (dicts.filter(d => d instanceof DictData).length !== dicts.length) { | ||||
console.error('the type of elements in dicts must be DictData') | |||||
//console.error('the type of elements in dicts must be DictData') | |||||
dicts = [] | dicts = [] | ||||
} | } | ||||
dict.type[type].splice(0, Number.MAX_SAFE_INTEGER, ...dicts) | dict.type[type].splice(0, Number.MAX_SAFE_INTEGER, ...dicts) | ||||
@@ -29,7 +29,7 @@ | |||||
/> | /> | ||||
</el-select> | </el-select> | ||||
</el-form-item> | </el-form-item> | ||||
<el-form-item label="创建时间"> | |||||
<!--<el-form-item label="创建时间"> | |||||
<el-date-picker | <el-date-picker | ||||
v-model="dateRange" | v-model="dateRange" | ||||
style="width: 240px" | style="width: 240px" | ||||
@@ -39,7 +39,7 @@ | |||||
start-placeholder="开始日期" | start-placeholder="开始日期" | ||||
end-placeholder="结束日期" | end-placeholder="结束日期" | ||||
></el-date-picker> | ></el-date-picker> | ||||
</el-form-item> | |||||
</el-form-item>--> | |||||
<el-form-item> | <el-form-item> | ||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | ||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | ||||