字典管理修改

src/api/system/dict.js

@@ -17,16 +17,16 @@ export function add(data) {
 
 export function del(ids) {
   return request({
-    url: 'api/dict/',
-    method: 'delete',
+    url: 'api/dictrionary/delete',
+    method: 'post',
     data: ids
   })
 }
 
 export function edit(data) {
   return request({
-    url: 'api/dict',
-    method: 'put',
+    url: 'api/dictrionary/edit',
+    method: 'post',
     data
   })
 }

src/api/system/dictDetail.js

@@ -36,15 +36,15 @@ export function add(data) {
 
 export function del(id) {
   return request({
-    url: 'api/dictDetail/' + id,
-    method: 'delete'
+    url: 'api/dictrionary/delete',
+    method: 'post'
   })
 }
 
 export function edit(data) {
   return request({
-    url: 'api/dictDetail',
-    method: 'put',
+    url: 'api/dictrionary/edit',
+    method: 'post',
     data
   })
 }

src/components/Crud/crud.js

@@ -139,7 +139,7 @@ function CRUD(options) {
             table.store.states.lazyTreeNodeMap = {}
           }
           crud.page.total = data.totalElements
-          crud.data = data.content
+          crud.data = data.content ? data.content : data
           crud.resetDataStatus()
           // time 毫秒后显示表格
           setTimeout(() => {
@@ -349,7 +349,7 @@ function CRUD(options) {
         if (crud.params[item] === null || crud.params[item] === '') crud.params[item] = undefined
       })
       return {
-        page: crud.page.page - 1,
+        page: crud.page.page,
         size: crud.page.size,
         sort: crud.sort,
         ...crud.query,

src/views/archivesConfig/dict/dictDetail.vue

@@ -12,14 +12,14 @@
       <!--表单组件-->
       <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-          <el-form-item label="字典名称" prop="label">
-            <el-input v-model="form.label" style="width: 370px;" />
+          <el-form-item label="字典名称" prop="dic_name">
+            <el-input v-model="form.dic_name" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="字典代码" prop="value">
-            <el-input v-model="form.value" style="width: 370px;" />
+          <el-form-item label="字典代码" prop="dic_code">
+            <el-input v-model="form.dic_code" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="内容说明">
-            <el-input v-model="form.description" style="width: 370px;" type="textarea" :rows="2" />
+          <el-form-item label="内容说明" prop="dic_explain">
+            <el-input v-model="form.dic_explain" style="width: 370px;" type="textarea" :rows="2" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -30,9 +30,9 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" highlight-current-row style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="label" label="字典名称" />
-        <el-table-column prop="value" label="字典代码" />
-        <el-table-column prop="description" label="内容说明" />
+        <el-table-column prop="dic_name" label="字典名称" />
+        <el-table-column prop="dic_code" label="字典代码" />
+        <el-table-column prop="dic_explain" label="内容说明" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -46,14 +46,14 @@ import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 
-const defaultForm = { id: null, label: null, value: null, description: null, dictSort: 999 }
+const defaultForm = { id: null, dic_name: null, dic_code: null, dic_explain: null }
 
 export default {
   components: { crudOperation, pagination },
   cruds() {
     return [
       CRUD({
-        title: '字典内容', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'],
+        title: '字典内容', url: 'api/dictrionary/findSubsetById', query: { id: '' },
         crudMethod: { ...crudDictDetail },
         optShow: {
           add: false,
@@ -63,7 +63,8 @@ export default {
           download: false,
           group: false
         },
-        queryOnPresenterCreated: false
+        queryOnPresenterCreated: false,
+        debug: true
       })
     ]
   },

src/views/archivesConfig/dict/index.vue

@@ -3,14 +3,14 @@
     <!--表单组件-->
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
-        <el-form-item label="字典名称" prop="name">
-          <el-input v-model="form.name" style="width: 370px;" />
+        <el-form-item label="字典名称" prop="dic_name">
+          <el-input v-model="form.dic_name" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="字典代码" prop="code">
-          <el-input v-model="form.code" style="width: 370px;" />
+        <el-form-item label="字典代码" prop="dic_code">
+          <el-input v-model="form.dic_code" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="内容说明">
-          <el-input v-model="form.description" style="width: 370px;" type="textarea" :rows="2" />
+          <el-input v-model="form.dic_explain" style="width: 370px;" type="textarea" :rows="2" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -24,7 +24,7 @@
         <el-card class="box-card">
           <crudOperation :permission="permission" />
           <!--字典树状结构-->
-          <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" style="height:calc(100vh - 240px);" highlight-current @node-click="handleNodeClick" />
+          <el-tree ref="tree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :default-expand-all="true" :expand-on-click-node="false" style="height:calc(100vh - 240px);" highlight-current @node-click="handleNodeClick" />
         </el-card>
       </el-col>
       <!-- 字典详情列表 -->
@@ -43,7 +43,7 @@ import crudDict from '@/api/system/dict'
 import CRUD, { presenter, header, form } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 
-const defaultForm = { id: null, name: null, code: null, description: null, dictDetails: [] }
+const defaultForm = { id: null, dic_name: null, dic_code: null, dic_explain: null, dictDetails: [] }
 
 export default {
   name: 'Dict',
@@ -51,7 +51,7 @@ export default {
   cruds() {
     return [
       CRUD({
-        title: '字典', url: 'api/dict',
+        title: '字典', url: 'api/dictrionary/menu',
         crudMethod: { ...crudDict },
         optShow: {
           add: true,
@@ -71,10 +71,10 @@ export default {
         { key: 'description', display_name: '描述' }
       ],
       rules: {
-        name: [
+        dic_name: [
           { required: true, message: '请输入字典名称', trigger: 'blur' }
         ],
-        code: [
+        dic_code: [
           { required: true, message: '请输入字典代码', trigger: 'blur' }
         ]
       },
@@ -84,8 +84,8 @@ export default {
         del: ['admin', 'dict:del']
       },
       defaultProps: {
-        children: 'dictDetails',
-        label: (data, node) => { return data.description ? data.description : data.label }
+        children: 'child_menus',
+        label: 'dic_name'
       },
       activeAddBtn: false
     }
@@ -94,28 +94,22 @@ export default {
     // 获取数据前设置好接口地址
     [CRUD.HOOK.beforeRefresh]() {
       if (this.$refs.dictDetail) {
-        this.$refs.dictDetail.query.dictName = ''
+        this.$refs.dictDetail.query.id = ''
       }
       return true
     },
     // 选中字典后，设置字典详情数据
-    handleCurrentChange(val) {
-      if (val) {
-        this.$refs.dictDetail.query.dictName = val.name
-        this.$refs.dictDetail.dictId = val.id
-        this.$refs.dictDetail.crud.toQuery()
-      }
-    },
     handleNodeClick(val) {
       if (val) {
-        if (val.name) {
-          this.$refs.dictDetail.query.dictName = val.name
-          this.$refs.dictDetail.dictId = val.id
-          this.$refs.dictDetail.crud.toQuery()
+        if (val.dic_type === 'true') {
           this.crud.selectionChangeHandler([val])
         } else {
           this.crud.selectionChangeHandler([])
         }
+        this.$refs.dictDetail.query.id = val.id
+        console.log(1)
+        this.$refs.dictDetail.dictId = val.id
+        this.$refs.dictDetail.crud.toQuery()
         this.activeAddBtn = true
       }
     },