修改bug

src/views/bed/bed.vue

@@ -268,7 +268,7 @@
           <el-table-column
             align="center"
             prop="cardNum"
-            width="140"
+            width="180"
             label="录取号"
           />
           <el-table-column
@@ -497,7 +497,10 @@
             @change="majorFormChange"
             v-model="ruleForm.major"
             clearable
-            :disabled="!store.BtnRole('bedManagementSetting15') && dialongTitle == '编辑床位信息'"
+            :disabled="
+              !store.BtnRole('bedManagementSetting15') &&
+              dialongTitle == '编辑床位信息'
+            "
             placeholder="请选择专业"
           >
             <el-option
@@ -511,7 +514,10 @@
         <el-form-item label="所属班级 :" prop="">
           <el-select
             clearable
-            :disabled="!store.BtnRole('bedManagementSetting16') && dialongTitle == '编辑床位信息'"
+            :disabled="
+              !store.BtnRole('bedManagementSetting16') &&
+              dialongTitle == '编辑床位信息'
+            "
             v-model="ruleForm.classstr"
             placeholder="请选择所属班级"
           >
@@ -523,7 +529,10 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="dialongTitle == '编辑床位信息'" label="是否入住 :">
+        <el-form-item
+          v-if="dialongTitle == '编辑床位信息' && ruleForm.isCheck == 1"
+          label="是否入住 :"
+        >
           <el-switch
             disabled
             :active-value="1"
@@ -531,18 +540,26 @@
             v-model="ruleForm.isCheck"
           />
         </el-form-item>
-        <el-form-item label="录取号 :">
+        <el-form-item
+          v-if="dialongTitle == '编辑床位信息' && ruleForm.cardNum"
+          label="录取号 :"
+        >
           <el-input
             v-model.trim="ruleForm.cardNum"
             placeholder="请输入录取号"
             clearable
+            disabled
           />
         </el-form-item>
-        <el-form-item label="姓名 :">
+        <el-form-item
+          v-if="dialongTitle == '编辑床位信息' && ruleForm.name"
+          label="姓名 :"
+        >
           <el-input
             v-model.trim="ruleForm.name"
             placeholder="请输入姓名"
             clearable
+            disabled
           />
         </el-form-item>
         <el-form-item label="辅导员 :" prop="">
@@ -550,7 +567,10 @@
             v-model.trim="ruleForm.instructor"
             placeholder="请输入辅导员"
             clearable
-            :disabled="!store.BtnRole('bedManagementSetting17') && dialongTitle == '编辑床位信息'"
+            :disabled="
+              !store.BtnRole('bedManagementSetting17') &&
+              dialongTitle == '编辑床位信息'
+            "
           />
         </el-form-item>
         <el-form-item label="备注 :">
@@ -1363,7 +1383,7 @@ const buildFormChange = async (val) => {
   dormitoryList({
     schoolId: ruleForm.school.split(",")[1],
     buildId: val.split(",")[1],
-    accountId:sessionStorage.getItem("accountId"),
+    accountId: sessionStorage.getItem("accountId"),
   });
 };
 const dormitoryFormChange = (val) => {
@@ -1547,7 +1567,7 @@ const updateS = (row) => {
     dormitoryList({
       schoolId: row.schoolId,
       buildId: row.buildId,
-      accountId:sessionStorage.getItem("accountId"),
+      accountId: sessionStorage.getItem("accountId"),
     }).then(() => {
       ruleForm.dormitory = `${row.dormitory},${row.dormitoryId}`;
     });

src/views/role/role.vue

@@ -96,6 +96,22 @@
                     >编辑</span
                   >
                 </div>
+                <div v-else-if="row.id == 11">
+                  <span
+                    class="edit"
+                    v-if="store.BtnRole('roleManagementSetting2')"
+                    @click="updateS(row)"
+                    >编辑</span
+                  >
+                </div>
+                <div v-else-if="row.id == 12">
+                  <span
+                    class="edit"
+                    v-if="store.BtnRole('roleManagementSetting2')"
+                    @click="updateS(row)"
+                    >编辑</span
+                  >
+                </div>
                 <div v-else>
                   <span
                     class="edit"
@@ -129,6 +145,22 @@
                     >编辑</span
                   >
                 </div>
+                <div v-else-if="row.id == 11">
+                  <span
+                    class="edit"
+                    v-if="store.BtnRole('roleManagementSetting2')"
+                    @click="updateS(row)"
+                    >编辑</span
+                  >
+                </div>
+                <div v-else-if="row.id == 12">
+                  <span
+                    class="edit"
+                    v-if="store.BtnRole('roleManagementSetting2')"
+                    @click="updateS(row)"
+                    >编辑</span
+                  >
+                </div>
                 <div v-else>
                   <span
                     class="edit"
@@ -162,6 +194,22 @@
                     >编辑</span
                   >
                 </div>
+                <div v-else-if="row.id == 11">
+                  <span
+                    class="edit"
+                    v-if="store.BtnRole('roleManagementSetting2')"
+                    @click="updateS(row)"
+                    >编辑</span
+                  >
+                </div>
+                <div v-else-if="row.id == 12">
+                  <span
+                    class="edit"
+                    v-if="store.BtnRole('roleManagementSetting2')"
+                    @click="updateS(row)"
+                    >编辑</span
+                  >
+                </div>
                 <div v-else>
                   <span
                     class="edit"
@@ -212,6 +260,7 @@
         <span>角色名称 : &nbsp;&nbsp;</span>
         <el-input
           :clearable="true"
+          :disabled="addRolesTitle=='编辑角色'"
           v-model="addRoles.roleName"
           class="w-50 m-2"
           style="width: 450px"

src/views/user/user.vue

@@ -159,6 +159,8 @@
                 <div v-if="row.id == 1"></div>
                 <div v-else-if="row.roleId == 10"></div>
                 <div v-else-if="row.roleId == 2"></div>
+                <div v-else-if="row.roleId == 11"></div>
+                <div v-else-if="row.roleId == 12"></div>
                 <div v-else>
                   <span
                     v-if="store.BtnRole('accountManagementSetting2')"
@@ -437,7 +439,7 @@ const roleList = async () => {
       if (roleId.value == 1) {
         return i.id != 1;
       } else if (roleId.value == 2) {
-        return i.id != 1 && i.id != 10 && i.id != 2;
+        return i.id != 1 && i.id != 10 && i.id != 2 && i.id != 11 && i.id != 12;
       } else if (roleId.value == 10) {
         return i.id != 1 && i.id != 10;
       } else {