修改

src/api/dictManage.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function createItem(data) {
   return request({
-    url: '/mall-integral-obtain/commend/add',
+    url: '/system/dict/type/add',
     method: 'post',
     data
   })
@@ -10,7 +10,7 @@ export function createItem(data) {
 
 export function updateItem(data) {
   return request({
-    url: '/mall-integral-obtain/commend/edit',
+    url: '/system/dict/type/edit',
     method: 'post',
     data
   })
@@ -18,24 +18,52 @@ export function updateItem(data) {
 
 export function list(query) {
   return request({
-    url: '/mall-integral-obtain/commend/page',
+    url: '/system/dict/type/list',
     method: 'get',
     params:query
   })
 }
 
-export function state(query) {
+export function deleteitem(query) {
   return request({
-    url: '/mall-integral-obtain/commend/modify/status',
+    url: '/system/dict/type/remove',
     method: 'post',
     params:query
   })
 }
 
-export function types(query) {
+export function optionSelect(data) {
   return request({
-    url: '/mall-integral-obtain/commend/types',
+    url: '/system/dict/type/optionselect',
     method: 'get',
+    data
+  })
+}
+export function dataList(query) {
+  return request({
+    url: '/system/dict/data/list',
+    method: 'get',
+    params:query
+  })
+}
+export function dataAdd(data) {
+  return request({
+    url: '/system/dict/data/add',
+    method: 'post',
+    data
+  })
+}
+export function dataEdit(data) {
+  return request({
+    url: '/system/dict/data/edit',
+    method: 'post',
+    data
+  })
+}
+export function dataRemove(query) {
+  return request({
+    url: '/system/dict/data/remove',
+    method: 'post',
     params:query
   })
 }
@@ -43,3 +71,5 @@ export function types(query) {
 
 
 
+
+

src/views/dictManage/dictDataList.vue

@@ -3,19 +3,19 @@
 
         <!-- 查询和其他操作 -->
         <div class="filter-container">
-            <el-select v-model="listQuery.nameId" clearable placeholder="字典名称" class="filter-item" style="width: 200px">
-                <el-option :key="item.type" v-for="item in dictNameList" :label="item.name" :value="item.type">
+            <el-select @change="changeDictType" v-model="listQuery.dictType" clearable placeholder="字典名称" class="filter-item" style="width: 200px">
+                <el-option :key="item.dictType" v-for="item in dictNameList" :label="item.dictName" :value="item.dictType">
                 </el-option>
             </el-select>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入字典标签"
-                v-model="listQuery.tag"></el-input>
-                <el-select v-model="listQuery.type" clearable placeholder="状态" class="filter-item" style="width: 200px">
+                v-model="listQuery.dictLabel"></el-input>
+                <el-select v-model="listQuery.status" clearable placeholder="状态" class="filter-item" style="width: 200px">
                 <el-option :key="item.type" v-for="item in typeList" :label="item.name" :value="item.type">
                 </el-option>
             </el-select>
             <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
             <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
-            <!-- <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button> -->
+            <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button>
 
         </div>
 
@@ -23,18 +23,18 @@
         <el-table size="small" :data="list" v-loading="listLoading" @selection-change="handleSelectionChange"
             element-loading-text="正在查询中。。。" border fit highlight-current-row>
             <el-table-column type="selection" width="55px"> </el-table-column>
-            <el-table-column align="center" min-width="60px" label="字典编码" prop="code">
+            <el-table-column align="center" min-width="60px" label="字典编码" prop="dictCode">
             </el-table-column>
-            <el-table-column align="center" min-width="100px" label="字典标签" prop="tag">
+            <el-table-column align="center" min-width="100px" label="字典标签" prop="dictLabel">
             </el-table-column>
-            <el-table-column align="center" min-width="60px" label="字典键值" prop="value">
+            <el-table-column align="center" min-width="60px" label="字典键值" prop="dictValue">
             </el-table-column>
-            <el-table-column align="center" min-width="60px" label="字典排序" prop="sort">
+            <el-table-column align="center" min-width="60px" label="字典排序" prop="dictSort">
             </el-table-column>
             <el-table-column align="center" min-width="100px" label="状态">
             <template slot-scope="scope">
-                <el-tag v-if="scope.row.status == 1">{{ scope.row.statusName }}</el-tag>
-                <el-tag v-else>{{ scope.row.statusName }}</el-tag>
+                <el-tag v-if="scope.row.status == '0'">正常</el-tag>
+                <el-tag v-else>停用</el-tag>
             </template>
         </el-table-column>
         <el-table-column align="center" min-width="200px" label="备注" prop="remark">
@@ -65,26 +65,26 @@
         width="40%"
       >
         <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="80px" style='width: 700px; margin-left:50px;'>
-            <el-form-item  label="字典类型" prop="type">
-              <el-input disabled style="width: 300px" v-model="dataForm.type"></el-input>
+            <el-form-item  label="字典类型" prop="dictType">
+              <el-input disabled style="width: 300px" v-model="dataForm.dictType"></el-input>
             </el-form-item>
-            <el-form-item  label="字典标签" prop="tag">
-              <el-input style="width: 300px" v-model="dataForm.tag"></el-input>
+            <el-form-item  label="字典标签" prop="dictLabel">
+              <el-input style="width: 300px" v-model="dataForm.dictLabel"></el-input>
             </el-form-item>
-            <el-form-item  label="字典键值" prop="value">
-              <el-input style="width: 300px" v-model="dataForm.value"></el-input>
+            <el-form-item  label="字典键值" prop="dictValue">
+              <el-input style="width: 300px" v-model="dataForm.dictValue"></el-input>
             </el-form-item>
-            <el-form-item label="显示排序" prop="sort">
+            <el-form-item label="显示排序" prop="dictSort">
                 <el-input-number
                   :precision="0"
                   :step="1"
-                  v-model="dataForm.sort"
+                  v-model="dataForm.dictSort"
                 ></el-input-number>
               </el-form-item>
             <el-form-item  label="状态">
                 <el-radio-group v-model="dataForm.status">
-                    <el-radio :label="1">正常</el-radio>
-                    <el-radio :label="0">停用</el-radio>
+                    <el-radio :label="'0'">正常</el-radio>
+                    <el-radio :label="'1'">停用</el-radio>
                 </el-radio-group>
             </el-form-item>
             <el-form-item  label="备注">
@@ -120,7 +120,7 @@
 </style>
   
 <script>
-import { listNews, createNews, updateNews, deleteNews, deleteAllNews } from "@/api/newsCenter";
+import { dataList, dataAdd, dataEdit, dataRemove, optionSelect } from "@/api/dictManage";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -129,41 +129,19 @@ export default {
     directives: { waves },
     data() {
         return {
-            id: undefined,
-            dictNameList: [
-                {
-                    id:1,
-                    type: 'sys_user_sex',
-                    name: "用户性别",
-                },
-                {
-                    id:2,
-                    type: 'sys_normal_disable',
-                    name: "系统开关",
-                },
-            ],
+            dictType:'',
+            dictNameList: [],
             typeList: [
                 {
-                    type: 1,
+                    type: '0',
                     name: "正常",
                 },
                 {
-                    type: 0,
+                    type: '1',
                     name: "停用",
                 },
             ],
             list: [
-                {
-                    type:'sys_user_sex',
-                    code: 1,
-                    tag: '男',
-                    value: 0,
-                    sort:1,
-                    status:0,
-                    statusName:'正常',
-                    remark:'性别男',
-                    createTime:'2023-6-22',
-                },
             ],
             delarr: [],
             multipleSelection: [],
@@ -172,16 +150,16 @@ export default {
             listQuery: {
                 page: 1,
                 limit: 10,
-                nameId: '',
-                tag: '',
+                dictType: '',
+                dictLabel: '',
                 status: '',
             },
             dataForm: {
-                type: undefined,
-                tag: undefined,
-                value: undefined,
-                sort: undefined,
-                status: 1,
+                dictType: undefined,
+                dictLabel: undefined,
+                dictValue: undefined,
+                dictSort: undefined,
+                status: '0',
                 remark: undefined,
             },
             dialogFormVisible: false,
@@ -192,30 +170,42 @@ export default {
             },
             imageUrl: undefined,
             rules: {
-                tag: [{ required: true, message: "字典标签不能为空", trigger: "blur" }],
-                value: [{ required: true, message: "字典键值不能为空", trigger: "blur" }],
-                sort: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
+                dictLabel: [{ required: true, message: "字典标签不能为空", trigger: "blur" }],
+                dictValue: [{ required: true, message: "字典键值不能为空", trigger: "blur" }],
+                dictSort: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
             },
         }
     },
     created() {
-        this.id = this.$route.params.id
-        // this.getList();
+        this.dictType = this.$route.params.id;
+        this.getOptionSelect();
     },
     methods: {
-
+        changeDictType(val){
+            this.dictType = val;
+            this.listQuery.dictType = val;
+            this.getList();
+        },
+        getOptionSelect(){
+            optionSelect().then(response => {
+                this.dictNameList = response.data.data;
+                this.listQuery.dictType = this.dictType;
+                this.getList();
+            }).catch(() => {})
+        },
         resetForm() {
             this.dataForm = {
-                type: undefined,
-                tag: undefined,
-                value: undefined,
-                sort: undefined,
-                status: 1,
+                dictType: undefined,
+                dictLabel: undefined,
+                dictValue: undefined,
+                dictSort: undefined,
+                status: '0',
                 remark: undefined,
             };
         },
         handleCreate() {
             this.resetForm();
+            this.dataForm.dictType = this.dictType;
             this.dialogFormVisible = true;
             this.dialogStatus = "create";
             this.$nextTick(() => {
@@ -225,7 +215,7 @@ export default {
         createData() {
             this.$refs["dataForm"].validate((valid) => {
                 if (valid) {
-                    createNews(this.dataForm)
+                    dataAdd(this.dataForm)
                         .then(() => {
                             this.getList();
                             this.dialogFormVisible = false;
@@ -243,7 +233,7 @@ export default {
         },
         getList() {
             this.listLoading = true
-            listNews(this.listQuery).then(response => {
+            dataList(this.listQuery).then(response => {
                 this.list = response.data.data.items
                 this.total = response.data.data.total
                 this.listLoading = false
@@ -281,7 +271,7 @@ export default {
         updateData() {
             this.$refs['dataForm'].validate((valid) => {
                 if (valid) {
-                    updateNews(this.dataForm).then(() => {
+                    dataEdit(this.dataForm).then(() => {
                         this.dialogFormVisible = false
                         this.$notify({
                             title: '成功',
@@ -303,7 +293,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                deleteNews(row).then(response => {
+                dataRemove({ dictCodes:row.dictCode}).then(response => {
                     this.$notify({
                         title: '成功',
                         message: '删除成功',
@@ -329,10 +319,10 @@ export default {
 
                     if (length > 0) {
                         for (let i = 0; i < length; i++) {
-                            this.delarr.push(this.multipleSelection[i].id);
+                            this.delarr.push(this.multipleSelection[i].dictCode);
                         }
-                        const newsIds = this.delarr.join(",");
-                        deleteAllNews({ newsId: newsIds })
+                        const  dictCodes = this.delarr.join(",");
+                        dataRemove({  dictCodes:  dictCodes })
                             .then(() => {
                                 this.$notify({
                                     title: "成功",

src/views/dictManage/dictList.vue

@@ -3,37 +3,23 @@
   
       <!-- 查询和其他操作 -->
       <div class="filter-container">
-        <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入字典名称" v-model="listQuery.name"></el-input>
-        <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入字典类型" v-model="listQuery.type"></el-input>
+        <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入字典名称" v-model="listQuery.dictName"></el-input>
+        <el-input clearable class="filter-item" style="width: 200px;" placeholder="请输入字典类型" v-model="listQuery.dictType"></el-input>
         <el-select v-model="listQuery.status" clearable placeholder="字典状态" class="filter-item" style="width: 200px">
             <el-option :key="item.type" v-for="item in typeList" :label="item.name" :value="item.type">
             </el-option>
         </el-select>
-      <el-date-picker
-        clearable
-        class="filter-item"
-        style="width: 250px"
-        v-model="listQuery.dateRange"
-        type="daterange"
-        unlink-panels
-        range-separator="~"
-        value-format="yyyy-MM-dd"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      >
-      </el-date-picker>
         <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
         <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
-        <!-- <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button> -->
-  
+        <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button>
       </div>
   
       <!-- 查询结果 -->
       <el-table
         size="small"
         :data="list"
-        v-loading="listLoading"
         @selection-change="handleSelectionChange"
+        v-loading="listLoading"
         element-loading-text="正在查询中。。。"
         border
         fit
@@ -43,25 +29,25 @@
         <el-table-column type="index" label="序号" header-align="center" align="center">
         </el-table-column>
   
-        <el-table-column align="center" min-width="100px" label="字典名称" prop="name">
+        <el-table-column align="center" min-width="100px" label="字典名称" prop="dictName">
         </el-table-column>
-        <el-table-column align="center" min-width="100px" label="字典类型">
+        <el-table-column align="center" min-width="150px" label="字典类型">
             <template slot-scope="scope">
-                <router-link :to="{name: 'dictDataList', params: { id: scope.row.id }}">
-                    <div style="color: #337ab7;cursor: pointer;">{{ scope.row.type }}</div>
+                <router-link :to="{name: 'dictDataList', params: { id: scope.row.dictType }}">
+                    <div style="color: #337ab7;cursor: pointer;">{{ scope.row.dictType }}</div>
                 </router-link>
             </template>
         </el-table-column>
         <el-table-column align="center" min-width="100px" label="状态">
             <template slot-scope="scope">
-                <el-tag v-if="scope.row.status == 1">{{ scope.row.statusName }}</el-tag>
-                <el-tag v-else>{{ scope.row.statusName }}</el-tag>
+                <el-tag v-if="scope.row.status === '1'">停用</el-tag>
+                <el-tag v-else>正常</el-tag>
             </template>
             
         </el-table-column>
         <el-table-column align="center" min-width="200px" label="备注" prop="remark">
         </el-table-column>
-        <el-table-column align="center" min-width="100px" label="创建时间" prop="createTime">
+        <el-table-column align="center" min-width="150px" label="创建时间" prop="createTime">
         </el-table-column>
         <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -91,16 +77,16 @@
         width="40%"
       >
         <el-form :rules="rules" ref="dataForm" :model="dataForm" status-icon label-position="left" label-width="80px" style='width: 700px; margin-left:50px;'>
-            <el-form-item  label="字典名称" prop="name">
-              <el-input style="width: 300px" v-model="dataForm.name"></el-input>
+            <el-form-item  label="字典名称" prop="dictName">
+              <el-input style="width: 300px" v-model="dataForm.dictName"></el-input>
             </el-form-item>
-            <el-form-item  label="字典类型" prop="type">
-              <el-input style="width: 300px" v-model="dataForm.type"></el-input>
+            <el-form-item  label="字典类型" prop="dictType">
+              <el-input style="width: 300px" v-model="dataForm.dictType"></el-input>
             </el-form-item>
             <el-form-item  label="状态">
                 <el-radio-group v-model="dataForm.status">
-                    <el-radio :label="1">正常</el-radio>
-                    <el-radio :label="0">停用</el-radio>
+                    <el-radio :label="'0'">正常</el-radio>
+                    <el-radio :label="'1'">停用</el-radio>
                 </el-radio-group>
             </el-form-item>
             <el-form-item  label="备注">
@@ -134,7 +120,7 @@
   </style>
   
   <script>
-    import {listNews, createNews, updateNews, deleteNews, deleteAllNews } from "@/api/newsCenter";
+    import { list, createItem, updateItem, deleteitem } from "@/api/dictManage";
     import waves from "@/directive/waves"; // 水波纹指令
     import Tinymce from '@/components/Tinymce'
   
@@ -145,25 +131,16 @@
       return {
         typeList: [
         {
-          type: 1,
+          type: "0",
           name: "正常",
         },
         {
-          type: 0,
+          type: "1",
           name: "停用",
         },
       ],
         list: [
-          {
-            id:1,
-            name:'用户性别',
-            type:'sys_user_sex',
-            status:0,
-            statusName:'正常',
-            remark:'用户性别列表',
-            createTime:'2023-6-22',
-            
-          },
+          
         ],
         delarr: [],
         multipleSelection: [],
@@ -172,14 +149,13 @@
         listQuery: {
           page: 1,
           limit: 10,
-          name: '',
-          type: '',
+          dictName: '',
+          dictType: '',
           status: '',
-          dateRange: '',
         },
         dataForm: {
-          name: undefined,
-          type: undefined,
+          dictName: undefined,
+          dictType: undefined,
           status: 1,
           remark: undefined,
         },
@@ -191,13 +167,13 @@
         },
         imageUrl: undefined,
         rules: {
-          name: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
-          type: [{ required: true, message: "字典类型不能为空", trigger: "blur" }],
+          dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
+          dictType: [{ required: true, message: "字典类型不能为空", trigger: "blur" }],
         },
       }
     },
     created() {
-        // this.getList();
+        this.getList();
     },
     methods: {
         handleDictData(row){
@@ -205,8 +181,8 @@
         },
       resetForm() {
         this.dataForm = {
-            name: undefined,
-            type: undefined,
+            dictName: undefined,
+            dictType: undefined,
             status: 1,
             remark: undefined,
         };
@@ -222,7 +198,7 @@
       createData() {
         this.$refs["dataForm"].validate((valid) => {
           if (valid) {
-            createNews(this.dataForm)
+            createItem(this.dataForm)
                   .then(() => {
                     this.getList();
                     this.dialogFormVisible = false;
@@ -240,7 +216,7 @@
       },
       getList() {
         this.listLoading = true
-        listNews(this.listQuery).then(response => {
+        list(this.listQuery).then(response => {
           this.list = response.data.data.items
           this.total = response.data.data.total
           this.listLoading = false
@@ -278,7 +254,7 @@
       updateData() {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            updateNews(this.dataForm).then(() => {
+            updateItem(this.dataForm).then(() => {
                 this.dialogFormVisible = false
                 this.$notify({
                   title: '成功',
@@ -300,15 +276,14 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          deleteNews(row).then(response => {
+          deleteitem({dictIds:row.dictId}).then(response => {
             this.$notify({
               title: '成功',
               message: '删除成功',
               type: 'success',
               duration: 2000
             })
-            const index = this.list.indexOf(row)
-            this.list.splice(index, 1)
+            this.getList()
           })
         }).catch(() => {
   
@@ -316,43 +291,43 @@
   
       },
       delAll() {
-        this.$confirm("确认删除吗?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            const length = this.multipleSelection.length;
-  
-            if (length > 0) {
-              for (let i = 0; i < length; i++) {
-                this.delarr.push(this.multipleSelection[i].id);
-              }
-              const newsIds = this.delarr.join(",");
-              deleteAllNews({ newsId: newsIds })
+            this.$confirm("确认删除吗?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
                 .then(() => {
-                  this.$notify({
-                    title: "成功",
-                    message: "删除成功",
-                    type: "success",
-                    duration: 2000,
-                  });
-                  this.getList();
+                    const length = this.multipleSelection.length;
+
+                    if (length > 0) {
+                        for (let i = 0; i < length; i++) {
+                            this.delarr.push(this.multipleSelection[i].dictId);
+                        }
+                        const dictIds = this.delarr.join(",");
+                        deleteitem({ dictIds: dictIds })
+                            .then(() => {
+                                this.$notify({
+                                    title: "成功",
+                                    message: "删除成功",
+                                    type: "success",
+                                    duration: 2000,
+                                });
+                                this.getList();
+                            })
+                            .catch(() => { });
+                    } else {
+                        this.$notify({
+                            title: "警告提示",
+                            message: "请选择要删除的信息！",
+                            type: "warning",
+                        });
+                    }
                 })
-                .catch(() => {});
-            } else {
-              this.$notify({
-                title: "警告提示",
-                message: "请选择要删除的信息！",
-                type: "warning",
-              });
-            }
-          })
-          .catch(() => {});
-      },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
+                .catch(() => { });
+        },
+        handleSelectionChange(val) {
+            this.multipleSelection = val;
+        },
     }
   }
   </script>