Kaynağa Gözat

去掉菜单和角色里的状态字段

xusl 1 yıl önce
ebeveyn
işleme
65cddd1a50

+ 1 - 4
backend/src/main/java/com/jiayue/ssi/controller/SysRoleController.java

@@ -136,10 +136,7 @@ public class SysRoleController {
                 return ResponseVO.fail("角色状态不能为空!");
             }
             if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role))) {
-                return ResponseVO.fail("新增角色'" + role.getRoleName() + "'失败,角色权限已存在");
-            }
-            if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role))) {
-                return ResponseVO.fail("新增角色'" + role.getRoleName() + "'失败,角色名称已存在");
+                return ResponseVO.fail("新增角色'" + role.getRoleName() + "'失败,"+role.getRoleKey()+"字符标识已存在!");
             }
             role.setCreateBy(SecurityContextUtil.getSysUser().getUsername());
             int i = roleService.insertRole(role);

+ 32 - 32
ui/src/views/sysManager/roleManager/index.vue

@@ -24,21 +24,21 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择角色状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="item in statusOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="状态" prop="status">-->
+<!--        <el-select-->
+<!--          v-model="queryParams.status"-->
+<!--          placeholder="请选择角色状态"-->
+<!--          clearable-->
+<!--          style="width: 240px"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="item in statusOptions"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item>
         <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>
@@ -102,7 +102,7 @@
         <vxe-table-column field="roleType" title="类型" :formatter="typeFormat"/>
         <vxe-table-column field="roleKey" title="字符标识"/>
         <vxe-table-column field="roleSort" title="显示顺序"/>
-        <vxe-table-column field="status" title="状态" :formatter="statusFormat"/>
+<!--        <vxe-table-column field="status" title="状态" :formatter="statusFormat"/>-->
       </vxe-table>
       <vxe-pager
         v-show="showTable"
@@ -156,22 +156,22 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态">
-          <el-select
-            v-model="form.status"
-            placeholder="请选择用户状态"
-            clearable
-            style="width: 240px"
-            :disabled="edit"
-          >
-            <el-option
-              v-for="item in statusOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="状态">-->
+<!--          <el-select-->
+<!--            v-model="form.status"-->
+<!--            placeholder="请选择用户状态"-->
+<!--            clearable-->
+<!--            style="width: 240px"-->
+<!--            :disabled="edit"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item in statusOptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="菜单权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>

+ 4 - 4
ui/src/views/sysManager/sysMenu/index.vue

@@ -54,7 +54,7 @@
       <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
       <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column prop="status" label="状态" width="80" :formatter="statusFormat"/>
+<!--      <el-table-column prop="status" label="状态" width="80" :formatter="statusFormat"/>-->
       <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -212,7 +212,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.menuType != 'F'">
+          <el-col :span="12" v-if="form.menuType != 'F'" v-show="false">
             <el-form-item prop="visible">
               <span slot="label">
                 <el-tooltip content="选择隐藏则路由将不会出现在侧边栏,但仍然可以访问" placement="top">
@@ -229,8 +229,8 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-if="form.menuType != 'F'">
-            <el-form-item prop="status">
+          <el-col :span="12" v-if="form.menuType != 'F'" v-show="false">
+            <el-form-item prop="status" >
               <span slot="label">
                 <el-tooltip content="选择停用则路由将不会出现在侧边栏,也不能被访问" placement="top">
                 <i class="el-icon-question"></i>