完成字典、字典类型管理相关

2023-02-05 15:17:11 +08:00
parent b01d242cbc
commit 95484877a3
51 changed files with 1388 additions and 76 deletions
--- a/Yi.RuoYi.Vue3/src/api/system/dict/data.js
+++ b/Yi.RuoYi.Vue3/src/api/system/dict/data.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询字典数据列表
 export function listData(query) {
  return request({
-    url: '/dictionaryInfo/pageList',
+    url: '/dictionary',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listData(query) {
 // 查询字典数据详细
 export function getData(dictCode) {
  return request({
-    url: '/dictionaryInfo/getById/' + dictCode,
+    url: '/dictionary/' + dictCode,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getData(dictCode) {
 // 根据字典类型查询字典数据信息
 export function getDicts(dictType) {
  return request({
-    url: '/dictionaryInfo/GetListByType/' + dictType,
+    url: '/dictionary/dic-type/' + dictType,
    method: 'get'
  })
 }
@@ -28,7 +28,7 @@ export function getDicts(dictType) {
 // 新增字典数据
 export function addData(data) {
  return request({
-    url: '/dictionaryInfo/add',
+    url: '/dictionary',
    method: 'post',
    data: data
  })
@@ -37,7 +37,7 @@ export function addData(data) {
 // 修改字典数据
 export function updateData(data) {
  return request({
-    url: '/dictionaryInfo/update',
+    url: `/dictionary/${data.id}`,
    method: 'put',
    data: data
  })
@@ -45,14 +45,9 @@ export function updateData(data) {

 // 删除字典数据
 export function delData(dictCode) {
-
-if("string"==typeof(dictCode))
-{
-  dictCode=[dictCode];
-}
+console.log(dictCode,"dictCode")
  return request({
-    url: '/dictionaryInfo/delList',
-    method: 'delete',
-    data:dictCode
+    url: `/dictionary/${dictCode}`,
+    method: 'delete'
  })
 }
--- a/Yi.RuoYi.Vue3/src/api/system/dict/type.js
+++ b/Yi.RuoYi.Vue3/src/api/system/dict/type.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询字典类型列表
 export function listType(query) {
  return request({
-    url: '/dictionary/pageList',
+    url: '/dictionary-type',
    method: 'get',
    params: query
  })
@@ -12,7 +12,7 @@ export function listType(query) {
 // 查询字典类型详细
 export function getType(dictId) {
  return request({
-    url: '/dictionary/getById/' + dictId,
+    url: '/dictionary-type/' + dictId,
    method: 'get'
  })
 }
@@ -20,7 +20,7 @@ export function getType(dictId) {
 // 新增字典类型
 export function addType(data) {
  return request({
-    url: '/dictionary/add',
+    url: '/dictionary-type',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@ export function addType(data) {
 // 修改字典类型
 export function updateType(data) {
  return request({
-    url: '/dictionary/update',
+    url: `/dictionary-type/${data.id}`,
    method: 'put',
    data: data
  })
@@ -37,14 +37,9 @@ export function updateType(data) {

 // 删除字典类型
 export function delType(dictId) {
-  if("string"==typeof(dictId))
-{
-  dictId=[dictId];
-}
  return request({
-    url: '/dictionary/delList',
+    url: `/dictionary-type/${dictId}`,
    method: 'delete',
-    data:dictId
  })
 }

@@ -59,7 +54,7 @@ export function refreshCache() {
 // 获取字典选择框列表
 export function optionselect() {
  return request({
-    url: '/dictionary/getList',
+    url: '/dictionary-type',
    method: 'get'
  })
 }
--- a/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dict/data.vue
@@ -19,13 +19,13 @@
               @keyup.enter="handleQuery"
            />
         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
+         <el-form-item label="状态" prop="state">
+            <el-select v-model="queryParams.state" placeholder="数据状态" clearable>
               <el-option
                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
+                  :key="JSON.parse(dict.value)"
                  :label="dict.label"
-                  :value="dict.value"
+                  :value="JSON.parse(dict.value)"
               />
            </el-select>
         </el-form-item>
@@ -96,15 +96,15 @@
         </el-table-column>
         <el-table-column label="字典键值" align="center" prop="dictValue" />
         <el-table-column label="字典排序" align="center" prop="orderNum" />
-         <el-table-column label="状态" align="center" prop="isDeleted">
+         <el-table-column label="状态" align="center" prop="state">
            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
            </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.creationTime) }}</span>
            </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
@@ -161,8 +161,8 @@
                  ></el-option>
               </el-select>
            </el-form-item>
-            <el-form-item label="状态" prop="isDeleted">
-               <el-radio-group v-model="form.isDeleted">
+            <el-form-item label="状态" prop="state">
+               <el-radio-group v-model="form.state">
                  <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
               </el-radio-group>
            </el-form-item>
@@ -217,7 +217,7 @@ const data = reactive({
    pageSize: 10,
    dictName: undefined,
    dictType: undefined,
-    isDeleted: false
+    state: true
  },
  rules: {
    dictLabel: [{ required: true, message: "数据标签不能为空", trigger: "blur" }],
@@ -240,14 +240,14 @@ function getTypes(dictId) {
 /** 查询字典类型列表 */
 function getTypeList() {
  getDictOptionselect().then(response => {
-    typeOptions.value = response.data;
+    typeOptions.value = response.data.items;
  });
 }
 /** 查询字典数据列表 */
 function getList() {
  loading.value = true;
  listData(queryParams.value).then(response => {
-    dataList.value = response.data.data;
+    dataList.value = response.data.items;
    total.value = response.data.total;
    loading.value = false;
  });
@@ -266,7 +266,7 @@ function reset() {
    cssClass: undefined,
    listClass: "default",
    orderNum: 0,
-    isDeleted: false,
+    state: true,
    remark: undefined
  };
  proxy.resetForm("dataRef");
--- a/Yi.RuoYi.Vue3/src/views/system/dict/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/dict/index.vue
@@ -19,18 +19,18 @@
               @keyup.enter="handleQuery"
            />
         </el-form-item>
-         <el-form-item label="状态" prop="isDeleted">
+         <el-form-item label="状态" prop="state">
            <el-select
-               v-model="queryParams.isDeleted"
+               v-model="queryParams.state"
               placeholder="字典状态"
               clearable
               style="width: 240px"
            >
               <el-option
                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
+                  :key="JSON.parse(dict.value)"
                  :label="dict.label"
-                  :value="dict.value"
+                  :value="JSON.parse(dict.value)"
               />
            </el-select>
         </el-form-item>
@@ -112,15 +112,15 @@
               </router-link>
            </template>
         </el-table-column>
-         <el-table-column label="状态" align="center" prop="isDeleted">
+         <el-table-column label="状态" align="center" prop="state">
            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
+               <dict-tag :options="sys_normal_disable" :value="scope.row.state" />
            </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+         <el-table-column label="创建时间" align="center" prop="creationTime" width="180">
            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.creationTime) }}</span>
            </template>
         </el-table-column>
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -158,8 +158,8 @@
            <el-form-item label="字典类型" prop="dictType">
               <el-input v-model="form.dictType" placeholder="请输入字典类型" />
            </el-form-item>
-            <el-form-item label="状态" prop="isDeleted">
-               <el-radio-group v-model="form.isDeleted">
+            <el-form-item label="状态" prop="state">
+               <el-radio-group v-model="form.state">
                  <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
               </el-radio-group>
            </el-form-item>
@@ -202,7 +202,7 @@ const data = reactive({
    pageSize: 10,
    dictName: undefined,
    dictType: undefined,
-    isDeleted: false
+    state: true
  },
  rules: {
    dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
@@ -216,7 +216,7 @@ const { queryParams, form, rules } = toRefs(data);
 function getList() {
  loading.value = true;
  listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    typeList.value = response.data.data;
+    typeList.value = response.data.items;
    total.value = response.data.total;
    loading.value = false;
  });
@@ -228,13 +228,7 @@ function cancel() {
 }
 /** 表单重置 */
 function reset() {
-  form.value = {
-    id: undefined,
-    dictName: undefined,
-    dictType: undefined,
-    isDeleted: false,
-    remark: undefined
-  };
+
  proxy.resetForm("dictRef");
 }
 /** 搜索按钮操作 */