hzj18279462576@163.com преди 11 месеца
родител
ревизия
5061976750
променени са 5 файла, в които са добавени 12 реда и са изтрити 15 реда
  1. 3 3
      src/views/bed/bed.vue
  2. 1 1
      src/views/caller/caller.vue
  3. 3 3
      src/views/role/role.vue
  4. 1 1
      src/views/student/student.vue
  5. 4 7
      src/views/system/system.vue

+ 3 - 3
src/views/bed/bed.vue

@@ -293,7 +293,7 @@
             align="center"
             label="操作"
             fixed="right"
-            width="400"
+            width="300"
           >
             <template #default="{ row }">
               <div class="options">
@@ -335,7 +335,7 @@
                   @click="outDormitory(row)"
                   >退宿</span
                 >
-                <span
+                <!-- <span
                   v-if="
                     row.isCheck == 1 &&
                     row.retentionState == 1 &&
@@ -354,7 +354,7 @@
                   class="open"
                   @click="changeBedClick(row, '床位对调')"
                   >床位对调</span
-                >
+                > -->
                 <span
                   class="edit"
                   v-if="store.BtnRole('bedManagementSetting14')"

+ 1 - 1
src/views/caller/caller.vue

@@ -141,7 +141,7 @@
           <el-table-column
             align="center"
             prop="carNumber"
-            width="100"
+            width="120"
             label="车牌号"
           />
           <el-table-column

+ 3 - 3
src/views/role/role.vue

@@ -79,7 +79,7 @@
           <el-table-column align="center" label="操作" fixed="right">
             <template #default="{ row }">
               <div class="options" >
-                <span class="edit"  v-if="store.BtnRole('roleManagementSetting2')" @click="updateS(row)">编辑</span>
+                <span class="edit"  v-if="store.BtnRole('roleManagementSetting2') && row.id!=1" @click="updateS(row)">编辑</span>
                 <span class="delete" v-if="store.BtnRole('roleManagementSetting3') && (row.id!=1 && row.id!=2 && row.id!=3 && row.id!=4)" @click="deleteS(row)">删除</span>
               </div>
             </template>
@@ -533,8 +533,8 @@ const addRolesList5 = reactive({
         { name: "开放", id: 7 },
         { name: "入住", id: 8 },
         { name: "退宿", id: 9 },
-        { name: "换床", id: 10 },
-        { name: "床位对调", id: 11 },
+        // { name: "换床", id: 10 },
+        // { name: "床位对调", id: 11 },
         { name: "删除", id: 12 },
         { name: "查看页面", id: 13 },
         { name: "编辑", id: 14 },

+ 1 - 1
src/views/student/student.vue

@@ -189,7 +189,7 @@
           <el-table-column
             align="center"
             prop="college"
-            width="140"
+            width="160"
             label="所属学院"
           />
           <el-table-column align="center" prop="major" width="220" label="专业">

+ 4 - 7
src/views/system/system.vue

@@ -53,14 +53,11 @@
           :disabled="updateShow"
         >
           <el-option label="全部" value="全部" />
-          <el-option label="学费" value="学费" />
-          <el-option label="住宿费" value="住宿费" />
           <el-option label="预收教材费" value="预收教材费" />
-          <el-option label="保险费" value="保险费" />
           <el-option label="体检费" value="体检费" />
-          <el-option label="军训服装费" value="军训服装费" />
-          <el-option label="生活用品费" value="生活用品费" />
           <el-option label="空调租赁使用费" value="空调租赁使用费" />
+          <el-option label="自主定价民办学历教育学费" value="自主定价民办学历教育学费" />
+          <el-option label="自主定价民办学历教育住宿费" value="学费" />
         </el-select>
         <el-input
           :disabled="updateShow"
@@ -387,7 +384,7 @@
           style="margin-left: 15px"
         />
       </li>
-      <li>
+      <!-- <li>
         <div class="warning_title">未缴费车牌预约:</div>
         <el-input
           v-model="params.carOrder"
@@ -397,7 +394,7 @@
           :disabled="updateShow"
           style="margin-left: 15px"
         />
-      </li>
+      </li> -->
     </ul>
     <ul
       style="margin: 15px 0"