hyf %!s(int64=3) %!d(string=hai) anos
pai
achega
cb0d291412

+ 3 - 2
src/views/system/role/components/Role.vue

@@ -12,13 +12,14 @@
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="formData.roleName" />
         </el-form-item>
+
         <el-form-item label="角色描述" prop="roleDesc">
           <el-input v-model="formData.roleDesc" />
         </el-form-item>
       </el-form>
 
       <div class="btn-group">
-        <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
         <el-button class="cancel-btn" @click="dialogVisible = false">取消</el-button>
       </div>
     </div>
@@ -30,7 +31,7 @@ import { ACTION_ADD, ACTION_UPDATE } from '@/utils/actionType'
 import { getRoleById, createRole, updateRole } from '@/api/system/roleApi'
 
 export default {
-
+  name: 'Role',
   props: {
     title: {
       type: String,

+ 0 - 0
src/views/system/setting/appCat/appCat.vue → src/views/system/setting/appCat/components/AppCat.vue


+ 5 - 5
src/views/system/setting/appCat/index.vue

@@ -7,9 +7,9 @@
         </div>
       </el-col>
       <el-col :span="12" class="right">
-        <el-input v-model="conditions.keywords" style="width: 200px;" class="filter-item" prefix-icon="el-icon-search" placeholder="请输入内容" @keyup.enter.native="getData" />
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="getData">查询</el-button>
-        <el-button type="primary" @click="handleAdd">添加</el-button>
+        <el-input v-model="conditions.keywords" style="width: 200px;" class="filter-item" prefix-icon="el-icon-search" size="mini" placeholder="请输入内容" @keyup.enter.native="getData" />
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" size="mini" @click="getData">查询</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加</el-button>
       </el-col>
     </el-row>
     <el-table v-loading="listLoading" :data="dataList" fit style="width: 100%">
@@ -30,7 +30,7 @@
       <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
         <template v-slot="{row}">
           <el-button size="mini" @click="handleEdit(row)">修改</el-button>
-          <el-button v-if="row.isFixed != 1" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
+          <el-button v-if="row.isFixed !== 1" size="mini" type="danger" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import AppCat from './appCat'
+import AppCat from './components/AppCat.vue'
 import { getAppCatByPage, deleteAppCatById } from '@/api/system/appCatApi'
 import Pagination from '@/components/Pagination'
 

+ 1 - 0
src/views/system/setting/checklistCat/components/ChecklistCat.vue

@@ -26,6 +26,7 @@ import { ACTION_ADD, ACTION_UPDATE } from '@/utils/actionType'
 import { getChecklistCatById, createChecklistCat, updateChecklistCat } from '@/api/system/checklistCatApi'
 
 export default {
+  name: 'ChecklistCatList',
   props: {
     title: {
       type: String,

+ 4 - 13
src/views/system/setting/groupCat/index.vue

@@ -7,21 +7,12 @@
         </div>
       </el-col>
       <el-col :span="12" class="right">
-        <el-input
-          v-model="conditions.keywords"
-          style="width: 200px;"
-          class="filter-item"
-          prefix-icon="el-icon-search"
-          placeholder="请输入内容"
-          size="mini"
-          @keyup.enter.native="getData"
-        />
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" size="mini" icon="el-icon-search" @click="getData">
-          查询
-        </el-button>
+        <el-input v-model="conditions.keywords" style="width: 200px;" class="filter-item" prefix-icon="el-icon-search" placeholder="请输入内容" size="mini" @keyup.enter.native="getData" />
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" size="mini" icon="el-icon-search" @click="getData">查询</el-button>
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加</el-button>
       </el-col>
     </el-row>
+
     <el-row class="content-body">
       <el-table v-loading="listLoading" :data="dataList" fit size="mini" style="width: 100%">
         <el-table-column type="index" align="center" label="序号" width="80" />
@@ -55,9 +46,9 @@
 </template>
 
 <script>
-import Pagination from '@/components/Pagination'
 import GroupCat from './components/GroupCat.vue'
 import { deleteGroupCatById, getGroupCatByPage } from '@/api/system/groupCatApi'
+import Pagination from '@/components/Pagination'
 
 export default {
   name: 'GroupCatIndex',

+ 0 - 0
src/views/system/setting/msgCat/msgCat.vue → src/views/system/setting/msgCat/components/MsgCat.vue


+ 6 - 13
src/views/system/setting/msgCat/index.vue

@@ -5,19 +5,12 @@
         <div class="content-title">消息类别</div>
       </el-col>
       <el-col :span="12" class="right">
-        <el-input
-          v-model="conditions.keywords"
-          style="width: 200px;"
-          class="filter-item"
-          prefix-icon="el-icon-search"
-          placeholder="请输入内容"
-          @keyup.enter.native="getData"
-        />
-        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="getData">查询</el-button>
-        <el-button type="primary" @click="handleAdd">添加</el-button>
+        <el-input v-model="conditions.keywords" style="width: 200px;" class="filter-item" prefix-icon="el-icon-search" size="mini" placeholder="请输入内容" @keyup.enter.native="getData" />
+        <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" size="mini" @click="getData">查询</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加</el-button>
       </el-col>
     </el-row>
-    <el-table v-loading="listLoading" :data="dataList" fit style="width: 100%">
+    <el-table v-loading="listLoading" :data="dataList" fit size="mini" style="width: 100%">
       <el-table-column type="index" align="center" label="序号" width="80" />
 
       <el-table-column label="类别名称" align="center" header-align="center" width="250">
@@ -61,11 +54,11 @@
 
 <script>
 import Pagination from '@/components/Pagination'
-import MsgCat from './msgCat'
+import MsgCat from './components/MsgCat.vue'
 import { deleteMsgCatById, getMsgCatByPage } from '@/api/system/msgCatApi'
 
 export default {
-  name: 'Index',
+  name: 'MsgCatList',
   components: {
     Pagination,
     MsgCat

+ 1 - 0
src/views/system/setting/taskCat/components/TaskCat.vue

@@ -27,6 +27,7 @@
 import { ACTION_ADD, ACTION_UPDATE } from '@/utils/actionType'
 import { getTaskCatById, createTaskCat, updateTaskCat } from '@/api/system/taskCatApi'
 export default {
+  name: 'TaskCatList',
   props: {
     title: {
       type: String,