debug

杨泽宇
1 parent 44c5b7bb
Showing 4 changed files with 41 additions and 30 deletions
README.md
src/views/permission/edit.vue
src/views/role/edit.vue
src/views/user/index.vue
@@ -29,9 +29,16 @@ cnlive-community-web-vue 中国网+智慧社区平台
    + test.community.api.cnlive.com
    + test.community.web.cnlive.com
-## 测试账号(超管)
-   * 账号 123
-   * 密码 cmnt123
+## 测试账号
+   * 超级管理员
+      * 账号 123
+      * 密码 cmnt123
+   * 物业管理员
+      * 账号 15810787172
+      * 密码 15810787172
+   * 商务管理员
+      * 账号 15810787171
+      * 密码 15810787171
 ## 发布方式
    + 服务器地址：120.92.119.11
@@ -36,6 +36,13 @@ const rules = reactive({
       trigger: "change",
     },
   ],
+  type: [
+    {
+      required: true,
+      message: "请选择权限类型",
+      trigger: "change",
+    },
+  ],
 });
 /**
  * 数字输入框，值改变，排序值赋给表单数据中priority
@@ -80,14 +87,14 @@ onMounted(() =&gt; {
   form.dataType = useRoute().query.dataType;
   if (form.dataType === "add") {
     form.data.parentId = useRoute().query.id;
-    if(useRoute().query.type.toString() === '1') {
-      form.data.type = '2'
+    if (useRoute().query.type.toString() === "1") {
+      form.data.type = "2";
     }
   } else {
     Object.keys(form.data).map((key) => {
       form.data[key] = useRoute().query[key];
     });
-    form.data.type = form.data.type? form.data.type.toString(): ''
+    form.data.type = form.data.type ? form.data.type.toString() : "";
   }
 });
 </script>
@@ -116,22 +123,22 @@ onMounted(() =&gt; {
         <el-form-item label="权限名称" prop="name" style="width: 100%">
           <el-input
             v-model.trim="form.data.name"
-            placeholder="请填写角色名称"
+            placeholder="请填写权限名称"
             maxlength="15"
           />
         </el-form-item>
-        <el-form-item label="关键字" prop="keyword" style="width: 50%">
+        <el-form-item label="关键字" prop="keyword" style="width: 100%">
           <el-input
             v-model.trim="form.data.keyword"
             placeholder="请填写关键字"
-            maxlength="20"
+            maxlength="200"
           />
         </el-form-item>
-        <el-form-item label="路径" prop="url" style="width: 50%">
+        <el-form-item label="路径" prop="url" style="width: 100%">
           <el-input
             v-model.trim="form.data.url"
             placeholder="请填写路径"
-            maxlength="15"
+            maxlength="200"
           />
         </el-form-item>
         <el-form-item label="排序" prop="priority" style="width: 100%">
@@ -148,7 +155,10 @@ onMounted(() =&gt; {
         <!-- 二级菜单可以创建三级菜单或者按钮 -->
         <!-- 三级菜单只能创建按钮 -->
         <el-form-item label="权限类型" prop="type" style="width: 100%">
-          <el-radio-group v-model="form.data.type" :disabled="form.dataType === 'edit'">
+          <el-radio-group
+            v-model="form.data.type"
+            :disabled="form.dataType === 'edit'"
+          >
             <el-radio label="1" disabled>一级菜单</el-radio>
             <el-radio label="2" :disabled="useRoute().query.type !== '1'"
               >二级菜单</el-radio
@@ -11,7 +11,6 @@ const {
 let form = reactive({
   data: {
     roleName: "",
-    code: "",
     roleDesc: "",
   },
   dataType: "",
@@ -28,13 +27,6 @@ const rules = reactive({
       trigger: "blur",
     },
   ],
-  code: [
-    {
-      required: true,
-      message: "请填写角色代码",
-      trigger: "blur",
-    },
-  ],
 });
 /**
  * 表单重置
@@ -103,13 +95,6 @@ onMounted(() =&gt; {
             maxlength="15"
           />
         </el-form-item>
-        <el-form-item label="角色代码" prop="code" style="width: 100%">
-          <el-input
-            v-model.trim="form.data.code"
-            placeholder="请填写角色代码"
-            maxlength="15"
-          />
-        </el-form-item>
         <el-form-item style="width: 100%">
           <el-button type="primary" @click="submitForm(ruleFormRef)"
             >提交</el-button
@@ -116,7 +116,7 @@ const handleUpdate = async (obj: any, type: string) =&gt; {
       res = await userPwd({
         userId: obj.id,
       });
-    } 
+    }
     if (res?.data) {
       ElMessage({
         type: "success",
@@ -190,7 +190,7 @@ onMounted(() =&gt; {
       </el-table-column>
       <el-table-column prop="roleList" label="角色" align="center">
         <template #default="scope">
-          {{scope.row.roleList.map(i => i.roleName).join(',')}}
+          {{ scope.row.roleList.map((i) => i.roleName).join(",") }}
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="注册时间" align="center">
@@ -222,7 +222,16 @@ onMounted(() =&gt; {
               >角色</router-link
             ></el-button
           >
-          <el-button type="text" @click="handleDelete(scope.row)"
+          <!-- 用户：商务管理员、机构管理员，不允许删除。 -->
+          <el-button
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-show="
+              ![
+                'SUPER_ADMIN',
+                'BUSINESS_ADMIN',
+              ].includes(scope.row.roleList.map(i => i.code).join(','))
+            "
             >删除</el-button
           >
         </template>