修改bug

src/views/bed/bed.vue

@@ -412,6 +412,7 @@
       >
         <el-form-item label="校区名称 :" prop="school">
           <el-select
+            :disabled="dialongTitle == '编辑床位信息'"
             @change="schoolFormChange"
             v-model="ruleForm.school"
             placeholder="请选择校区名称"
@@ -428,6 +429,7 @@
         <el-form-item label="楼栋名称 :" prop="build">
           <el-select
             clearable
+            :disabled="dialongTitle == '编辑床位信息'"
             @change="buildFormChange"
             v-model="ruleForm.build"
             placeholder="请选择楼栋名称"
@@ -443,6 +445,7 @@
         <el-form-item label="寝室号 :" prop="dormitory">
           <el-select
             clearable
+            :disabled="dialongTitle == '编辑床位信息'"
             v-model="ruleForm.dormitory"
             @change="dormitoryFormChange"
             placeholder="请选择寝室号"
@@ -837,7 +840,7 @@ const ruleForm = reactive({
   name: "",
   instructor: "",
   remark: "",
-  retentionState:"",
+  retentionState: "",
   id: "",
 });
 // 表单验证
@@ -1165,9 +1168,11 @@ const schoolList = async () => {
 const buildList = async (flag) => {
   let params = {
     schoolId: flag ? flag : searchInput.schoolId,
+    accountId: sessionStorage.getItem("accountId"),
   };
   let res = await https.get(
-    "/welcome/api/welcome-build/buildGroup",
+    // "/welcome/api/welcome-build/buildGroup",
+    "/welcome/api/welcome-dormitory/saveBedDormitoryGroup",
     "params",
     params
   );
@@ -1431,7 +1436,7 @@ const majorFormChange = async (val) => {
 const getList = async () => {
   loading.value = true;
   let params = {
-    accountId:sessionStorage.getItem("accountId"),
+    accountId: sessionStorage.getItem("accountId"),
     currentPage: currentPage.value, // 当前页
     pageCount: pageSize.value, // 一页数据条数
     schoolId: searchInput.schoolId,
@@ -1496,21 +1501,21 @@ const addlist = () => {
   ruleForm.number = null;
   ruleForm.school = null;
   ruleForm.build = null;
-  buildFormData.value=null
+  buildFormData.value = null;
   ruleForm.dormitory = null;
-  dormitoryFormData.value=null
+  dormitoryFormData.value = null;
   ruleForm.sex = null;
   ruleForm.college = null;
   ruleForm.major = null;
-  majorFormData.value=null
+  majorFormData.value = null;
   ruleForm.classstr = null;
-  classstrFormData.value=null;
+  classstrFormData.value = null;
   ruleForm.isCheck = null;
   ruleForm.cardNum = null;
   ruleForm.name = null;
   ruleForm.instructor = null;
   ruleForm.remark = null;
-  ruleForm.retentionState=1;
+  ruleForm.retentionState = 1;
   ruleForm.id = null;
 };
 // 添加账号
@@ -1564,7 +1569,7 @@ const updateS = (row) => {
       }
     });
   }
-  ruleForm.retentionState=row.retentionState
+  ruleForm.retentionState = row.retentionState;
   ruleForm.isCheck = row.isCheck;
   ruleForm.cardNum = row.cardNum;
   ruleForm.name = row.name;
@@ -1743,7 +1748,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
         instructor: ruleForm.instructor,
         remark: ruleForm.remark,
         number: ruleForm.number,
-        retentionState:ruleForm.retentionState,
+        retentionState: ruleForm.retentionState,
         grade: dayjs().year(),
       };
       if (ruleForm.college) {
@@ -1817,15 +1822,15 @@ const cancelAdd = () => {
   ruleForm.number = null;
   ruleForm.school = null;
   ruleForm.build = null;
-  buildFormData.value=null
+  buildFormData.value = null;
   ruleForm.dormitory = null;
-  dormitoryFormData.value=null
+  dormitoryFormData.value = null;
   ruleForm.sex = null;
   ruleForm.college = null;
   ruleForm.major = null;
-  majorFormData.value=null
+  majorFormData.value = null;
   ruleForm.classstr = null;
-  classstrFormData.value=null;
+  classstrFormData.value = null;
   ruleForm.isCheck = null;
   ruleForm.cardNum = null;
   ruleForm.name = null;
@@ -1865,6 +1870,7 @@ const handleCurrentChange = (value) => {
 // 楼栋导出
 const buildExportbtn = async () => {
   let params = {
+    accountId: sessionStorage.getItem("accountId"),
     schoolId: searchInput.schoolId,
     buildId: searchInput.buildId,
     dormitoryId: searchInput.dormitoryId,

src/views/dormitory/dormitory.vue

@@ -98,7 +98,7 @@
           <div class="condition">
             <span>入住情况 :</span>
             <el-select
-            clearable
+              clearable
               v-model="searchInput.status"
               placeholder="请选择入住情况"
             >
@@ -110,7 +110,7 @@
           <div class="condition">
             <span>是否保留 :</span>
             <el-select
-            clearable
+              clearable
               v-model="searchInput.retentionState"
               placeholder="请选择是否保留"
             >
@@ -134,14 +134,14 @@
         <!-- 按钮列表 -->
         <div class="gongneng">
           <el-button
-          v-if="store.BtnRole('dormitoryManagementSetting1')"
+            v-if="store.BtnRole('dormitoryManagementSetting1')"
             type="primary"
             color="rgba(38, 151, 255, 1)"
             @click="buildImportBtn"
             >导入</el-button
           >
           <el-button
-          v-if="store.BtnRole('dormitoryManagementSetting2')"
+            v-if="store.BtnRole('dormitoryManagementSetting2')"
             type="primary"
             style="margin-left: 0"
             color="rgba(48, 201, 191, 1)"
@@ -149,7 +149,7 @@
             >导出</el-button
           >
           <el-button
-          v-if="store.BtnRole('dormitoryManagementSetting3')"
+            v-if="store.BtnRole('dormitoryManagementSetting3')"
             type="primary"
             style="margin-left: 0"
             color="rgba(38, 151, 255, 1)"
@@ -157,7 +157,7 @@
             >新增</el-button
           >
           <el-button
-          v-if="store.BtnRole('dormitoryManagementSetting4')"
+            v-if="store.BtnRole('dormitoryManagementSetting4')"
             type="primary"
             style="margin-left: 0"
             color="rgba(38, 151, 255, 1)"
@@ -165,7 +165,7 @@
             >批量保留</el-button
           >
           <el-button
-          v-if="store.BtnRole('dormitoryManagementSetting5')"
+            v-if="store.BtnRole('dormitoryManagementSetting5')"
             type="primary"
             style="margin-left: 0"
             color="rgba(38, 151, 255, 1)"
@@ -258,10 +258,36 @@
           >
             <template #default="{ row }">
               <div class="options">
-                <span class="open" v-if="row.retentionState == 1 && store.BtnRole('dormitoryManagementSetting6')" @click="retainS(row, 2)">保留</span>
-                <span class="open" v-if="row.retentionState == 2 && store.BtnRole('dormitoryManagementSetting7')" @click="retainS(row, 1)">开放</span>
-                <span class="edit" v-if="store.BtnRole('dormitoryManagementSetting8')" @click="updateS(row)">编辑</span>
-                <span class="delete" v-if="store.BtnRole('dormitoryManagementSetting9')" @click="deleteS(row)">删除</span>
+                <span
+                  class="open"
+                  v-if="
+                    row.retentionState == 1 &&
+                    store.BtnRole('dormitoryManagementSetting6')
+                  "
+                  @click="retainS(row, 2)"
+                  >保留</span
+                >
+                <span
+                  class="open"
+                  v-if="
+                    row.retentionState == 2 &&
+                    store.BtnRole('dormitoryManagementSetting7')
+                  "
+                  @click="retainS(row, 1)"
+                  >开放</span
+                >
+                <span
+                  class="edit"
+                  v-if="store.BtnRole('dormitoryManagementSetting8')"
+                  @click="updateS(row)"
+                  >编辑</span
+                >
+                <span
+                  class="delete"
+                  v-if="store.BtnRole('dormitoryManagementSetting9')"
+                  @click="deleteS(row)"
+                  >删除</span
+                >
               </div>
             </template>
           </el-table-column>
@@ -307,6 +333,7 @@
       >
         <el-form-item label="校区名称 :" prop="school">
           <el-select
+            :disabled="dialongTitle == '编辑寝室信息'"
             @change="schoolFormChange"
             v-model="ruleForm.school"
             clearable
@@ -322,6 +349,7 @@
         </el-form-item>
         <el-form-item label="楼栋名称 :" prop="build">
           <el-select
+          :disabled="dialongTitle == '编辑寝室信息'"
             clearable
             v-model="ruleForm.build"
             placeholder="请选择楼栋名称"
@@ -344,7 +372,11 @@
           />
         </el-form-item>
         <el-form-item label="寝室性别 :" prop="sex">
-          <el-select disabled v-model="ruleForm.sex" placeholder="请选择寝室性别">
+          <el-select
+            disabled
+            v-model="ruleForm.sex"
+            placeholder="请选择寝室性别"
+          >
             <el-option label="男" value="男" />
             <el-option label="女" value="女" />
           </el-select>
@@ -477,7 +509,7 @@ const router = useRouter();
 const store = useCounterStore();
 
 // 为避免解构时失去响应性
-const { name, age, isCollapse, realAge,collegeRole } = storeToRefs(store);
+const { name, age, isCollapse, realAge, collegeRole } = storeToRefs(store);
 
 // 表格数据
 const loading = ref(false);
@@ -635,7 +667,7 @@ const majorList = async (flag) => {
   }
 };
 const collegeList = async () => {
-  collegeData.value=collegeRole.value
+  collegeData.value = collegeRole.value;
   // let res = await https.get("/welcome/api/welcomeOrg/getColleges", "params");
   // console.log(res, "学院数据");
   // if (res.code == 200) {
@@ -673,24 +705,24 @@ const buildChange = async (val) => {
   }
   dormitoryList();
 };
-const buildFormChange=(val)=>{
+const buildFormChange = (val) => {
   console.log(val);
   // 选择楼栋时判断是性别
-  if(val){
-    buildFormData.value.forEach(i=>{
-    if(i.id==val.split(',')[1]){
-      ruleForm.sex=i.sex
-    }
-  })
-  }else{
-    ruleForm.sex=null
+  if (val) {
+    buildFormData.value.forEach((i) => {
+      if (i.id == val.split(",")[1]) {
+        ruleForm.sex = i.sex;
+      }
+    });
+  } else {
+    ruleForm.sex = null;
   }
-}
+};
 
 const schoolFormChange = async (val) => {
   console.log(val);
   ruleForm.build = null;
-  ruleForm.sex=null
+  ruleForm.sex = null;
   if (!val) {
     buildFormData.value = null;
     return;
@@ -726,7 +758,7 @@ const collegeFormChange = async (val) => {
 const getList = async () => {
   loading.value = true;
   let params = {
-    accountId:sessionStorage.getItem("accountId"),
+    accountId: sessionStorage.getItem("accountId"),
     currentPage: currentPage.value, // 当前页
     pageCount: pageSize.value, // 一页数据条数
     schoolId: searchInput.schoolId,
@@ -889,7 +921,7 @@ const batchRetainS = async (title, flag) => {
       message: "至少选择一条数据",
       center: true,
     });
-    return
+    return;
   }
   ElMessageBox.confirm(`是否${title}数据?`, "提示!!!", {
     confirmButtonText: "确认",
@@ -1041,13 +1073,14 @@ const handleCurrentChange = (value) => {
 // 楼栋导出
 const buildExportbtn = async () => {
   let params = {
+    accountId: sessionStorage.getItem("accountId"),
     schoolId: searchInput.schoolId,
     buildId: searchInput.buildId,
     dormitoryId: searchInput.dormitoryId,
     sex: searchInput.sex,
     status: searchInput.status,
     collegeId: searchInput.collegeId ? searchInput.collegeId : "",
-    retentionState:searchInput.retentionState
+    retentionState: searchInput.retentionState,
   };
   let res = await https.getBlob(
     "/welcome/api/welcome-dormitory/welcomeDormitoryExport",

src/views/quarterage/quarterage.vue

@@ -177,7 +177,7 @@ const router = useRouter();
 const store = useCounterStore();
 
 // 为避免解构时失去响应性
-const { name, age, isCollapse, realAge } = storeToRefs(store);
+const { name, age, isCollapse, realAge,collegeRole } = storeToRefs(store);
 
 const activeName = ref("first");
 
@@ -196,6 +196,7 @@ const searchInput = reactive({
 const collegeData = ref([]);
 
 const collegeList = async () => {
+  // collegeData.value = collegeRole.value;
   let res = await https.get("/welcome/api/welcomeOrg/getColleges", "params");
   console.log(res, "学院数据");
   if (res.code == 200) {

src/views/student/student.vue

@@ -249,7 +249,7 @@ const router = useRouter();
 const store = useCounterStore();
 
 // 为避免解构时失去响应性
-const { name, age, isCollapse, realAge } = storeToRefs(store);
+const { name, age, isCollapse, realAge,collegeRole } = storeToRefs(store);
 
 // 表格数据
 const loading = ref(false);
@@ -337,7 +337,8 @@ const buildList = async (flag) => {
     schoolId: searchInput.schoolId,
   };
   let res = await https.get(
-    "/welcome/api/welcome-build/buildGroup",
+    // "/welcome/api/welcome-build/buildGroup",
+    "/welcome/api/welcome-dormitory/saveBedDormitoryGroup",
     "params",
     params
   );
@@ -376,18 +377,19 @@ const dormitoryList = async (flag) => {
   }
 };
 const collegeList = async () => {
-  let res = await https.get("/welcome/api/welcomeOrg/getColleges", "params");
-  console.log(res, "学院数据");
-  if (res.code == 200) {
-    collegeData.value = res.data;
-  } else {
-    ElMessage({
-      type: "error",
-      showClose: true,
-      message: res.message,
-      center: true,
-    });
-  }
+  collegeData.value = collegeRole.value;
+  // let res = await https.get("/welcome/api/welcomeOrg/getColleges", "params");
+  // console.log(res, "学院数据");
+  // if (res.code == 200) {
+  //   collegeData.value = res.data;
+  // } else {
+  //   ElMessage({
+  //     type: "error",
+  //     showClose: true,
+  //     message: res.message,
+  //     center: true,
+  //   });
+  // }
 };
 const majorList = async (flag) => {
   let params = {
@@ -489,6 +491,7 @@ const majorChange = async (val) => {
 const getList = async () => {
   loading.value = true;
   let params = {
+    accountId: sessionStorage.getItem("accountId"),
     currentPage: currentPage.value, // 当前页
     pageCount: pageSize.value, // 一页数据条数
     schoolId: searchInput.schoolId,
@@ -572,6 +575,7 @@ const handleCurrentChange = (value) => {
 // 楼栋导出
 const buildExportbtn = async () => {
   let params = {
+    accountId: sessionStorage.getItem("accountId"),
     schoolId: searchInput.schoolId,
     buildId: searchInput.buildId,
     dormitoryId: searchInput.dormitoryId,