Browse Source

选宿舍金额设置新增一个层次查询,学生信息管理、寝室信息管理、床位信息管理、访客信息管理

hzj18279462576@163.com 2 days ago
parent
commit
7625a5c76e

+ 64 - 26
src/views/bed/bed.vue

@@ -134,6 +134,21 @@
               <el-option label="否" value="1" />
               <el-option label="否" value="1" />
             </el-select>
             </el-select>
           </div>
           </div>
+          <div class="condition">
+            <span>年份 :</span>
+            <el-select
+              clearable
+              v-model="searchInput.yearId"
+              placeholder="请选择年份"
+            >
+              <el-option
+                v-for="i in yearData"
+                :key="i.id"
+                :label="i.name"
+                :value="i.id"
+              />
+            </el-select>
+          </div>
           <el-button
           <el-button
             style="margin-left: 20px"
             style="margin-left: 20px"
             color="rgba(38, 151, 255, 1)"
             color="rgba(38, 151, 255, 1)"
@@ -860,6 +875,7 @@ const ruleForm = reactive({
   instructor: "",
   instructor: "",
   remark: "",
   remark: "",
   retentionState: "",
   retentionState: "",
+  yearId: "",
   id: "",
   id: "",
 });
 });
 // 表单验证
 // 表单验证
@@ -906,7 +922,7 @@ const submitCheck = lodash.debounce(async (formEl) => {
       let res = await https.post(
       let res = await https.post(
         "/welcome/api/welcomeBed/checkIn",
         "/welcome/api/welcomeBed/checkIn",
         "data",
         "data",
-        data
+        data,
       );
       );
       if (res.code == 200) {
       if (res.code == 200) {
         checkDialogVisible.value = false;
         checkDialogVisible.value = false;
@@ -990,13 +1006,13 @@ const changeBedBuildList = async () => {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcomeBed/changeBuildGroup",
       "/welcome/api/welcomeBed/changeBuildGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   } else if (changeBedTitle.value == "床位对调") {
   } else if (changeBedTitle.value == "床位对调") {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcomeBed/replaceBuildGroup",
       "/welcome/api/welcomeBed/replaceBuildGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   }
   }
   console.log(res, "楼栋数据");
   console.log(res, "楼栋数据");
@@ -1024,13 +1040,13 @@ const changeBedDormitoryList = async () => {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcomeBed/changeDormitoryGroup",
       "/welcome/api/welcomeBed/changeDormitoryGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   } else if (changeBedTitle.value == "床位对调") {
   } else if (changeBedTitle.value == "床位对调") {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcomeBed/replaceDormitoryGroup",
       "/welcome/api/welcomeBed/replaceDormitoryGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   }
   }
   console.log(res, "寝室号数据");
   console.log(res, "寝室号数据");
@@ -1059,13 +1075,13 @@ const changeBedBedList = async () => {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcomeBed/changeBedGroup",
       "/welcome/api/welcomeBed/changeBedGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   } else if (changeBedTitle.value == "床位对调") {
   } else if (changeBedTitle.value == "床位对调") {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcomeBed/replaceBedGroup",
       "/welcome/api/welcomeBed/replaceBedGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   }
   }
 
 
@@ -1110,13 +1126,13 @@ const submitChangeBed = lodash.debounce(async (formEl) => {
         res = await https.post(
         res = await https.post(
           "/welcome/api/welcomeBed/changeBed",
           "/welcome/api/welcomeBed/changeBed",
           "data",
           "data",
-          data
+          data,
         );
         );
       } else if (changeBedTitle.value == "床位对调") {
       } else if (changeBedTitle.value == "床位对调") {
         res = await https.post(
         res = await https.post(
           "/welcome/api/welcomeBed/replaceBed",
           "/welcome/api/welcomeBed/replaceBed",
           "data",
           "data",
-          data
+          data,
         );
         );
       }
       }
 
 
@@ -1148,6 +1164,23 @@ const cancelChangeBed = () => {
   changeBedVisible.value = false;
   changeBedVisible.value = false;
 };
 };
 
 
+// 年份
+const yearData = ref([]);
+const yearList = async () => {
+  let res = await https.get("/welcome/api/systemSetting/yearDatas", "params");
+  console.log(res, "年份数据");
+  if (res.code == 200) {
+    yearData.value = res.data;
+  } else {
+    ElMessage({
+      type: "error",
+      showClose: true,
+      message: res.message,
+      center: true,
+    });
+  }
+};
+
 // 导入
 // 导入
 const buildImportVisible = ref(false);
 const buildImportVisible = ref(false);
 const buildRef = ref();
 const buildRef = ref();
@@ -1195,7 +1228,7 @@ const buildList = async (flag) => {
     // "/welcome/api/welcome-build/buildGroup",
     // "/welcome/api/welcome-build/buildGroup",
     "/welcome/api/welcome-dormitory/saveBedBuildGroup",
     "/welcome/api/welcome-dormitory/saveBedBuildGroup",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "楼栋数据");
   console.log(res, "楼栋数据");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -1221,7 +1254,7 @@ const dormitoryList = async (flag) => {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcome-dormitory/saveBedDormitoryGroup",
       "/welcome/api/welcome-dormitory/saveBedDormitoryGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   } else {
   } else {
     params = {
     params = {
@@ -1231,7 +1264,7 @@ const dormitoryList = async (flag) => {
     res = await https.get(
     res = await https.get(
       "/welcome/api/welcome-dormitory/dormitoryTGroup",
       "/welcome/api/welcome-dormitory/dormitoryTGroup",
       "params",
       "params",
-      params
+      params,
     );
     );
   }
   }
 
 
@@ -1273,7 +1306,7 @@ const majorList = async (flag) => {
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/welcomeOrg/getMajors",
     "/welcome/api/welcomeOrg/getMajors",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "专业数据");
   console.log(res, "专业数据");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -1298,7 +1331,7 @@ const classstrList = async (flag) => {
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/welcomeOrg/getClasss",
     "/welcome/api/welcomeOrg/getClasss",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "班级数据");
   console.log(res, "班级数据");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -1393,7 +1426,7 @@ const dormitoryFormChange = (val) => {
     useCollegeList(val.split(",")[1]).then(() => {
     useCollegeList(val.split(",")[1]).then(() => {
       dormitoryFormData.value.forEach((i) => {
       dormitoryFormData.value.forEach((i) => {
         if (i.id == val.split(",")[1]) {
         if (i.id == val.split(",")[1]) {
-          ruleForm.college = `${i.college.split(',')[0]},${i.collegeId.split(',')[0]}`;
+          ruleForm.college = `${i.college.split(",")[0]},${i.collegeId.split(",")[0]}`;
           collegeFormChange(ruleForm.college);
           collegeFormChange(ruleForm.college);
           ruleForm.sex = i.sex;
           ruleForm.sex = i.sex;
           ruleForm.retentionState = i.retentionState;
           ruleForm.retentionState = i.retentionState;
@@ -1485,12 +1518,13 @@ const getList = async () => {
     majorId: searchInput.majorId,
     majorId: searchInput.majorId,
     classstrId: searchInput.classstrId,
     classstrId: searchInput.classstrId,
     retentionState: searchInput.retentionState,
     retentionState: searchInput.retentionState,
+    yearId: searchInput.yearId,
   };
   };
 
 
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/welcomeBed/queryPageBeds",
     "/welcome/api/welcomeBed/queryPageBeds",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "床位信息");
   console.log(res, "床位信息");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -1528,6 +1562,8 @@ const resetBtn = lodash.debounce(async () => {
   majorData.value = [];
   majorData.value = [];
   searchInput.classstrId = null;
   searchInput.classstrId = null;
   classstrData.value = [];
   classstrData.value = [];
+  searchInput.yearId = null;
+
   getList();
   getList();
 }, 300);
 }, 300);
 
 
@@ -1566,7 +1602,7 @@ const useCollegeList = async (dormitoryId) => {
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/welcome-dormitory/getColleges",
     "/welcome/api/welcome-dormitory/getColleges",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "根据寝室号获取学院");
   console.log(res, "根据寝室号获取学院");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -1658,7 +1694,7 @@ const outDormitory = async (row) => {
       let res = await https.get(
       let res = await https.get(
         "/welcome/api/welcomeBed/checkOutDormitory",
         "/welcome/api/welcomeBed/checkOutDormitory",
         "params",
         "params",
-        data
+        data,
       );
       );
       if (res.code == 200) {
       if (res.code == 200) {
         ElMessage({
         ElMessage({
@@ -1695,7 +1731,7 @@ const deleteS = async (row) => {
       let res = await https.get(
       let res = await https.get(
         "/welcome/api/welcomeBed/deleteBedInfo",
         "/welcome/api/welcomeBed/deleteBedInfo",
         "params",
         "params",
-        data
+        data,
       );
       );
       if (res.code == 200) {
       if (res.code == 200) {
         ElMessage({
         ElMessage({
@@ -1729,7 +1765,7 @@ const retainS = async (row, flag) => {
   let res = await https.post(
   let res = await https.post(
     "/welcome/api/welcomeBed/batchOperationBed",
     "/welcome/api/welcomeBed/batchOperationBed",
     "data",
     "data",
-    data
+    data,
   );
   );
   if (res.code == 200) {
   if (res.code == 200) {
     ElMessage({
     ElMessage({
@@ -1772,7 +1808,7 @@ const batchRetainS = async (title, flag) => {
       let res = await https.post(
       let res = await https.post(
         "/welcome/api/welcomeBed/batchOperationBed",
         "/welcome/api/welcomeBed/batchOperationBed",
         "data",
         "data",
-        data
+        data,
       );
       );
       if (res.code == 200) {
       if (res.code == 200) {
         ElMessage({
         ElMessage({
@@ -1835,7 +1871,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
         let res = await https.post(
         let res = await https.post(
           "/welcome/api/welcomeBed/updateBedInfo",
           "/welcome/api/welcomeBed/updateBedInfo",
           "data",
           "data",
-          data
+          data,
         );
         );
         if (res.code == 200) {
         if (res.code == 200) {
           addDialogVisible.value = false;
           addDialogVisible.value = false;
@@ -1858,7 +1894,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
         let res = await https.post(
         let res = await https.post(
           "/welcome/api/welcomeBed/insertBedInfo",
           "/welcome/api/welcomeBed/insertBedInfo",
           "data",
           "data",
-          data
+          data,
         );
         );
         if (res.code == 200) {
         if (res.code == 200) {
           addDialogVisible.value = false;
           addDialogVisible.value = false;
@@ -1947,11 +1983,12 @@ const buildExportbtn = async () => {
     majorId: searchInput.majorId,
     majorId: searchInput.majorId,
     classstrId: searchInput.classstrId,
     classstrId: searchInput.classstrId,
     retentionState: searchInput.retentionState,
     retentionState: searchInput.retentionState,
+    yearId:searchInput.yearId
   };
   };
   let res = await https.getBlob(
   let res = await https.getBlob(
     "/welcome/api/welcomeBed/welcomeBedExport",
     "/welcome/api/welcomeBed/welcomeBedExport",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "床位信息管理导出");
   console.log(res, "床位信息管理导出");
   let name = `床位信息管理`;
   let name = `床位信息管理`;
@@ -1978,7 +2015,7 @@ const buildImportBtn = () => {
 const templateDown = async () => {
 const templateDown = async () => {
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/welcomeBed/downloadBedExcel",
     "/welcome/api/welcomeBed/downloadBedExcel",
-    "params"
+    "params",
   );
   );
   console.log(res, "模板下载");
   console.log(res, "模板下载");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -2028,7 +2065,7 @@ const projectImportConfirm = async () => {
   let res = await https.post(
   let res = await https.post(
     "/welcome/api/welcomeBed/importBedExcel",
     "/welcome/api/welcomeBed/importBedExcel",
     "data",
     "data",
-    data
+    data,
   );
   );
   console.log(res, "导入项目");
   console.log(res, "导入项目");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -2063,6 +2100,7 @@ onBeforeMount(() => {
   getList();
   getList();
   schoolList();
   schoolList();
   collegeList();
   collegeList();
+  yearList();
 });
 });
 onUnmounted(() => {
 onUnmounted(() => {
   // document.removeEventListener("keyup", Enters);
   // document.removeEventListener("keyup", Enters);

+ 64 - 25
src/views/caller/caller.vue

@@ -55,6 +55,23 @@
               value-format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
             />
             />
           </div>
           </div>
+          <div class="condition">
+            <span>年份 :</span>
+            <el-select
+              clearable
+              v-model="searchInput.yearId"
+              placeholder="请选择年份"
+            >
+              <el-option
+                v-for="i in yearData"
+                :key="i.id"
+                :label="i.name"
+                :value="i.id"
+              />
+            </el-select>
+          </div>
+        </div>
+        <div class="filter">
           <el-button
           <el-button
             style="margin-left: 20px"
             style="margin-left: 20px"
             color="rgba(38, 151, 255, 1)"
             color="rgba(38, 151, 255, 1)"
@@ -64,26 +81,27 @@
             ><span>查询</span>
             ><span>查询</span>
           </el-button>
           </el-button>
           <el-button @click="resetBtn" plain color="rgba(43, 153, 255, 1)">
           <el-button @click="resetBtn" plain color="rgba(43, 153, 255, 1)">
-            重置</el-button>
-        </div>
-        <!-- 按钮列表 -->
-        <div class="gongneng">
-          <el-button
-            v-if="store.BtnRole('visitorManagementSetting1')"
-            type="primary"
-            color="rgba(48, 201, 191, 1)"
-            @click="buildExportbtn"
-            >导出</el-button
-          >
-          <el-button
-            v-if="store.BtnRole('visitorManagementSetting2')"
-            type="primary"
-            style="margin-left: 0"
-            color="rgba(38, 151, 255, 1)"
-            @click="addlist"
-            >新增</el-button
+            重置</el-button
           >
           >
+          <div class="gongneng">
+            <el-button
+              v-if="store.BtnRole('visitorManagementSetting1')"
+              type="primary"
+              color="rgba(48, 201, 191, 1)"
+              @click="buildExportbtn"
+              >导出</el-button
+            >
+            <el-button
+              v-if="store.BtnRole('visitorManagementSetting2')"
+              type="primary"
+              style="margin-left: 0"
+              color="rgba(38, 151, 255, 1)"
+              @click="addlist"
+              >新增</el-button
+            >
+          </div>
         </div>
         </div>
+        <!-- 按钮列表 -->
       </div>
       </div>
       <div class="footer" v-loading="loading">
       <div class="footer" v-loading="loading">
         <el-table
         <el-table
@@ -361,6 +379,7 @@ const searchInput = reactive({
   carNumber: "",
   carNumber: "",
   school: "",
   school: "",
   date: "",
   date: "",
+  yearId:""
 }); // 搜索按钮数据
 }); // 搜索按钮数据
 
 
 const currentPage = ref(1); // 当前页
 const currentPage = ref(1); // 当前页
@@ -431,6 +450,8 @@ const disabledDate = (time) => {
 };
 };
 
 
 const schoolData = ref();
 const schoolData = ref();
+// 年份
+const yearData = ref([]);
 
 
 // 获取账户列表
 // 获取账户列表
 const getList = async () => {
 const getList = async () => {
@@ -443,12 +464,13 @@ const getList = async () => {
     school: searchInput.school,
     school: searchInput.school,
     startTime: searchInput.date ? searchInput.date + " 00:00:00" : "",
     startTime: searchInput.date ? searchInput.date + " 00:00:00" : "",
     endTime: searchInput.date ? searchInput.date + " 23:59:59" : "",
     endTime: searchInput.date ? searchInput.date + " 23:59:59" : "",
+    yearId: searchInput.yearId,
   };
   };
 
 
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/visitor/admin/page",
     "/welcome/api/visitor/admin/page",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "访客信息管理");
   console.log(res, "访客信息管理");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -479,6 +501,20 @@ const schoolList = async () => {
     });
     });
   }
   }
 };
 };
+const yearList = async () => {
+  let res = await https.get("/welcome/api/systemSetting/yearDatas", "params");
+  console.log(res, "年份数据");
+  if (res.code == 200) {
+    yearData.value = res.data;
+  } else {
+    ElMessage({
+      type: "error",
+      showClose: true,
+      message: res.message,
+      center: true,
+    });
+  }
+};
 
 
 // 搜索功能
 // 搜索功能
 const searchBtn = lodash.debounce(async () => {
 const searchBtn = lodash.debounce(async () => {
@@ -488,7 +524,8 @@ const resetBtn = lodash.debounce(async () => {
   searchInput.name = null;
   searchInput.name = null;
   searchInput.carNumber = null;
   searchInput.carNumber = null;
   searchInput.school = null;
   searchInput.school = null;
-  searchInput.date=null;
+  searchInput.date = null;
+  searchInput.yearId = null;
   getList();
   getList();
 }, 300);
 }, 300);
 
 
@@ -535,7 +572,7 @@ const deleteS = async (row) => {
       let res = await https.delete(
       let res = await https.delete(
         "/welcome/api/visitor/admin/batch-del",
         "/welcome/api/visitor/admin/batch-del",
         "data",
         "data",
-        data
+        data,
       );
       );
       if (res.code == 200) {
       if (res.code == 200) {
         ElMessage({
         ElMessage({
@@ -584,7 +621,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
         let res = await https.put(
         let res = await https.put(
           "/welcome/api/visitor/admin/update",
           "/welcome/api/visitor/admin/update",
           "data",
           "data",
-          data
+          data,
         );
         );
         if (res.code == 200) {
         if (res.code == 200) {
           addDialogVisible.value = false;
           addDialogVisible.value = false;
@@ -607,7 +644,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
         let res = await https.post(
         let res = await https.post(
           "/welcome/api/visitor/admin/add",
           "/welcome/api/visitor/admin/add",
           "data",
           "data",
-          data
+          data,
         );
         );
         if (res.code == 200) {
         if (res.code == 200) {
           addDialogVisible.value = false;
           addDialogVisible.value = false;
@@ -672,11 +709,12 @@ const buildExportbtn = async () => {
     school: searchInput.school,
     school: searchInput.school,
     startTime: searchInput.date ? searchInput.date + " 00:00:00" : "",
     startTime: searchInput.date ? searchInput.date + " 00:00:00" : "",
     endTime: searchInput.date ? searchInput.date + " 23:59:59" : "",
     endTime: searchInput.date ? searchInput.date + " 23:59:59" : "",
+    yearId:searchInput.yearId
   };
   };
   let res = await https.getBlob(
   let res = await https.getBlob(
     "/welcome/api/visitor/admin/export",
     "/welcome/api/visitor/admin/export",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "床位信息管理导出");
   console.log(res, "床位信息管理导出");
   let name = `访客信息管理`;
   let name = `访客信息管理`;
@@ -699,6 +737,7 @@ const buildExportbtn = async () => {
 onBeforeMount(() => {
 onBeforeMount(() => {
   getList();
   getList();
   schoolList();
   schoolList();
+  yearList()
 });
 });
 onUnmounted(() => {
 onUnmounted(() => {
   // document.removeEventListener("keyup", Enters);
   // document.removeEventListener("keyup", Enters);
@@ -769,7 +808,7 @@ onUnmounted(() => {
         }
         }
       }
       }
       .gongneng {
       .gongneng {
-        margin: 10px 0;
+        margin: 10px 20px;
         .el-button {
         .el-button {
           color: #fff;
           color: #fff;
           margin-right: 15px;
           margin-right: 15px;

+ 38 - 1
src/views/dormitory/dormitory.vue

@@ -119,7 +119,21 @@
               <el-option label="否" value="1" />
               <el-option label="否" value="1" />
             </el-select>
             </el-select>
           </div>
           </div>
-
+          <div class="condition">
+            <span>年份 :</span>
+            <el-select
+              clearable
+              v-model="searchInput.yearId"
+              placeholder="请选择年份"
+            >
+              <el-option
+                v-for="i in yearData"
+                :key="i.id"
+                :label="i.name"
+                :value="i.id"
+              />
+            </el-select>
+          </div>
           <el-button
           <el-button
             style="margin-left: 20px"
             style="margin-left: 20px"
             color="rgba(38, 151, 255, 1)"
             color="rgba(38, 151, 255, 1)"
@@ -518,6 +532,8 @@ const searchInput = reactive({
   status: null,
   status: null,
   retentionState: null,
   retentionState: null,
   collegeId: null,
   collegeId: null,
+  yearId:null
+
 }); // 搜索按钮数据
 }); // 搜索按钮数据
 
 
 const currentPage = ref(1); // 当前页
 const currentPage = ref(1); // 当前页
@@ -764,6 +780,23 @@ const collegeFormChange = async (val) => {
   // majorList(val.split(",")[1]);
   // majorList(val.split(",")[1]);
 };
 };
 
 
+// 年份
+const yearData = ref([]);
+const yearList = async () => {
+  let res = await https.get("/welcome/api/systemSetting/yearDatas", "params");
+  console.log(res, "年份数据");
+  if (res.code == 200) {
+    yearData.value = res.data;
+  } else {
+    ElMessage({
+      type: "error",
+      showClose: true,
+      message: res.message,
+      center: true,
+    });
+  }
+};
+
 // 获取账户列表
 // 获取账户列表
 const getList = async () => {
 const getList = async () => {
   loading.value = true;
   loading.value = true;
@@ -778,6 +811,7 @@ const getList = async () => {
     status: searchInput.status,
     status: searchInput.status,
     retentionState: searchInput.retentionState,
     retentionState: searchInput.retentionState,
     collegeId: searchInput.collegeId ? searchInput.collegeId : "",
     collegeId: searchInput.collegeId ? searchInput.collegeId : "",
+    yearId: searchInput.yearId,
   };
   };
 
 
   let res = await https.get(
   let res = await https.get(
@@ -816,6 +850,7 @@ const resetBtn = lodash.debounce(async () => {
   buildData.value = null;
   buildData.value = null;
   dormitoryData.value = null;
   dormitoryData.value = null;
   majorData.value = null;
   majorData.value = null;
+  searchInput.yearId = null;
   getList();
   getList();
 }, 300);
 }, 300);
 
 
@@ -1113,6 +1148,7 @@ const buildExportbtn = async () => {
     status: searchInput.status,
     status: searchInput.status,
     collegeId: searchInput.collegeId ? searchInput.collegeId : "",
     collegeId: searchInput.collegeId ? searchInput.collegeId : "",
     retentionState: searchInput.retentionState,
     retentionState: searchInput.retentionState,
+    yearId:searchInput.yearId
   };
   };
   let res = await https.getBlob(
   let res = await https.getBlob(
     "/welcome/api/welcome-dormitory/welcomeDormitoryExport",
     "/welcome/api/welcome-dormitory/welcomeDormitoryExport",
@@ -1229,6 +1265,7 @@ onBeforeMount(() => {
   getList();
   getList();
   schoolList();
   schoolList();
   collegeList();
   collegeList();
+  yearList();
 });
 });
 onUnmounted(() => {
 onUnmounted(() => {
   // document.removeEventListener("keyup", Enters);
   // document.removeEventListener("keyup", Enters);

+ 57 - 19
src/views/moneySetting/moneySetting.vue

@@ -40,6 +40,21 @@
             </el-select>
             </el-select>
           </div>
           </div>
           <div class="condition">
           <div class="condition">
+            <span>年份 :</span>
+            <el-select
+              clearable
+              v-model="searchInput.yearId"
+              placeholder="请选择年份"
+            >
+              <el-option
+                v-for="i in yearData"
+                :key="i.id"
+                :label="i.name"
+                :value="i.id"
+              />
+            </el-select>
+          </div>
+          <div class="condition">
             <span>层次 :</span>
             <span>层次 :</span>
             <el-select
             <el-select
               clearable
               clearable
@@ -332,6 +347,7 @@ const searchInput = reactive({
   college: null,
   college: null,
   major: null,
   major: null,
   eduLevel: null,
   eduLevel: null,
+  yearId: null,
 });
 });
 
 
 const currentPage = ref(1); // 当前页
 const currentPage = ref(1); // 当前页
@@ -372,9 +388,9 @@ const rules = reactive({
   payAmount: [
   payAmount: [
     { required: true, message: "金额不能为空", trigger: "blur" },
     { required: true, message: "金额不能为空", trigger: "blur" },
     {
     {
-        pattern: /^(0|([1-9]\d*)(\.\d{1,2})?)$|^(0\.\d{1,2})$/,
-        message: "金额输入有误,请重新输入",
-        trigger: "blur",
+      pattern: /^(0|([1-9]\d*)(\.\d{1,2})?)$|^(0\.\d{1,2})$/,
+      message: "金额输入有误,请重新输入",
+      trigger: "blur",
     },
     },
   ],
   ],
 });
 });
@@ -389,7 +405,7 @@ const majorFormData = ref([]);
 const buildImportVisible = ref(false);
 const buildImportVisible = ref(false);
 const buildRef = ref();
 const buildRef = ref();
 const buildFile = ref();
 const buildFile = ref();
-const buildImportLoading=ref(false)
+const buildImportLoading = ref(false);
 
 
 const collegeList = async () => {
 const collegeList = async () => {
   collegeData.value = collegeRole.value;
   collegeData.value = collegeRole.value;
@@ -413,7 +429,7 @@ const majorList = async (flag) => {
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/welcomeOrg/getMajors",
     "/welcome/api/welcomeOrg/getMajors",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "专业数据");
   console.log(res, "专业数据");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -453,6 +469,24 @@ const collegeFormChange = async (val) => {
   }
   }
   majorList(ruleForm.college.split(",")[1]);
   majorList(ruleForm.college.split(",")[1]);
 };
 };
+
+// 年份
+const yearData = ref([]);
+const yearList = async () => {
+  let res = await https.get("/welcome/api/systemSetting/yearDatas", "params");
+  console.log(res, "年份数据");
+  if (res.code == 200) {
+    yearData.value = res.data;
+  } else {
+    ElMessage({
+      type: "error",
+      showClose: true,
+      message: res.message,
+      center: true,
+    });
+  }
+};
+
 // 获取账户列表
 // 获取账户列表
 const getList = async () => {
 const getList = async () => {
   loading.value = true;
   loading.value = true;
@@ -462,13 +496,14 @@ const getList = async () => {
     collegeId: searchInput.college,
     collegeId: searchInput.college,
     majorId: searchInput.major,
     majorId: searchInput.major,
     eduLevel: searchInput.eduLevel,
     eduLevel: searchInput.eduLevel,
+    yearId: searchInput.yearId,
   };
   };
   console.log(params);
   console.log(params);
 
 
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/paySetting/getPageDatas",
     "/welcome/api/paySetting/getPageDatas",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "楼栋信息管理");
   console.log(res, "楼栋信息管理");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -495,6 +530,7 @@ const resetBtn = lodash.debounce(async () => {
   searchInput.major = null;
   searchInput.major = null;
   majorData.value = null;
   majorData.value = null;
   searchInput.eduLevel = null;
   searchInput.eduLevel = null;
+  searchInput.yearId = null;
   getList();
   getList();
 }, 300);
 }, 300);
 
 
@@ -538,7 +574,7 @@ const deleteS = async (row) => {
       let res = await https.get(
       let res = await https.get(
         "/welcome/api/paySetting/deletePaySetting",
         "/welcome/api/paySetting/deletePaySetting",
         "params",
         "params",
-        data
+        data,
       );
       );
       if (res.code == 200) {
       if (res.code == 200) {
         ElMessage({
         ElMessage({
@@ -570,11 +606,11 @@ const submitAdd = lodash.debounce(async (formEl) => {
   await formEl.validate(async (valid, fields) => {
   await formEl.validate(async (valid, fields) => {
     if (valid) {
     if (valid) {
       let data = {
       let data = {
-        collegeId: ruleForm.college.split(',')[1],
-        collegeName: ruleForm.college.split(',')[0],
-        majorId: ruleForm.major.split(',')[1],
-        majorName: ruleForm.major.split(',')[0],
-        eduLevel:ruleForm.eduLevel,
+        collegeId: ruleForm.college.split(",")[1],
+        collegeName: ruleForm.college.split(",")[0],
+        majorId: ruleForm.major.split(",")[1],
+        majorName: ruleForm.major.split(",")[0],
+        eduLevel: ruleForm.eduLevel,
         eduSystem: ruleForm.eduSystem,
         eduSystem: ruleForm.eduSystem,
         payAmount: ruleForm.payAmount,
         payAmount: ruleForm.payAmount,
       };
       };
@@ -583,7 +619,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
         let res = await https.post(
         let res = await https.post(
           "/welcome/api/paySetting/updatePaySetting",
           "/welcome/api/paySetting/updatePaySetting",
           "data",
           "data",
-          data
+          data,
         );
         );
         if (res.code == 200) {
         if (res.code == 200) {
           addDialogVisible.value = false;
           addDialogVisible.value = false;
@@ -606,7 +642,7 @@ const submitAdd = lodash.debounce(async (formEl) => {
         let res = await https.post(
         let res = await https.post(
           "/welcome/api/paySetting/insertPaySetting",
           "/welcome/api/paySetting/insertPaySetting",
           "data",
           "data",
-          data
+          data,
         );
         );
         if (res.code == 200) {
         if (res.code == 200) {
           addDialogVisible.value = false;
           addDialogVisible.value = false;
@@ -664,11 +700,12 @@ const buildExportbtn = async () => {
     collegeId: searchInput.college,
     collegeId: searchInput.college,
     majorId: searchInput.major,
     majorId: searchInput.major,
     eduLevel: searchInput.eduLevel,
     eduLevel: searchInput.eduLevel,
+    yearId: searchInput.yearId,
   };
   };
   let res = await https.getBlob(
   let res = await https.getBlob(
     "/welcome/api/paySetting/paySettingExport",
     "/welcome/api/paySetting/paySettingExport",
     "params",
     "params",
-    params
+    params,
   );
   );
   console.log(res, "宿舍金额设置");
   console.log(res, "宿舍金额设置");
   let name = `宿舍金额设置`;
   let name = `宿舍金额设置`;
@@ -695,7 +732,7 @@ const buildImportBtn = () => {
 const templateDown = async () => {
 const templateDown = async () => {
   let res = await https.get(
   let res = await https.get(
     "/welcome/api/paySetting/downloadPaySettingExcel",
     "/welcome/api/paySetting/downloadPaySettingExcel",
-    "params"
+    "params",
   );
   );
   console.log(res, "模板下载");
   console.log(res, "模板下载");
   if (res.code == 200) {
   if (res.code == 200) {
@@ -739,19 +776,19 @@ const projectImportExceed = (files) => {
 };
 };
 // 导入项目
 // 导入项目
 const projectImportConfirm = async () => {
 const projectImportConfirm = async () => {
-  buildImportLoading.value=true;
+  buildImportLoading.value = true;
   let data = new FormData();
   let data = new FormData();
   data.set("file", buildFile.value);
   data.set("file", buildFile.value);
   let res = await https.post(
   let res = await https.post(
     "/welcome/api/paySetting/importPaySettingExcel",
     "/welcome/api/paySetting/importPaySettingExcel",
     "data",
     "data",
-    data
+    data,
   );
   );
   console.log(res, "导入项目");
   console.log(res, "导入项目");
   if (res.code == 200) {
   if (res.code == 200) {
     buildImportVisible.value = false;
     buildImportVisible.value = false;
 
 
-    buildImportLoading.value=false;
+    buildImportLoading.value = false;
     getList();
     getList();
     ElMessage({
     ElMessage({
       type: "success",
       type: "success",
@@ -779,6 +816,7 @@ const cancelProjectImport = () => {
 onBeforeMount(() => {
 onBeforeMount(() => {
   getList();
   getList();
   collegeList();
   collegeList();
+  yearList();
 });
 });
 onUnmounted(() => {
 onUnmounted(() => {
   // document.removeEventListener("keyup", Enters);
   // document.removeEventListener("keyup", Enters);

+ 16 - 0
src/views/student/student.vue

@@ -126,6 +126,18 @@
               />
               />
             </el-select>
             </el-select>
           </div>
           </div>
+          <div class="condition">
+            <span>层次 :</span>
+            <el-select
+              clearable
+              v-model="searchInput.batchValue"
+              placeholder="请选择层次"
+            >
+              <el-option label="本科" value="本科" />
+              <el-option label="专升本" value="专升本" />
+              <el-option label="专科" value="专科" />
+            </el-select>
+          </div>
           <el-button
           <el-button
             style="margin-left: 20px"
             style="margin-left: 20px"
             color="rgba(38, 151, 255, 1)"
             color="rgba(38, 151, 255, 1)"
@@ -282,6 +294,7 @@ const searchInput = reactive({
   collegeId: null,
   collegeId: null,
   classstrId: null,
   classstrId: null,
   yearId: null,
   yearId: null,
+  batchValue:null
 }); // 搜索按钮数据
 }); // 搜索按钮数据
 
 
 const currentPage = ref(1); // 当前页
 const currentPage = ref(1); // 当前页
@@ -535,6 +548,7 @@ const getList = async () => {
     classstrId: searchInput.classstrId,
     classstrId: searchInput.classstrId,
     name: searchInput.name,
     name: searchInput.name,
     yearId: searchInput.yearId,
     yearId: searchInput.yearId,
+    batchValue:searchInput.batchValue
   };
   };
 
 
   let res = await https.get(
   let res = await https.get(
@@ -576,6 +590,7 @@ const resetBtn = lodash.debounce(async () => {
   searchInput.classstrId = null;
   searchInput.classstrId = null;
   classstrData.value = [];
   classstrData.value = [];
   searchInput.yearId=null
   searchInput.yearId=null
+  searchInput.batchValue=null
   getList();
   getList();
 }, 300);
 }, 300);
 
 
@@ -619,6 +634,7 @@ const buildExportbtn = async () => {
     majorId: searchInput.majorId,
     majorId: searchInput.majorId,
     classstrId: searchInput.classstrId,
     classstrId: searchInput.classstrId,
     yearId: searchInput.yearId,
     yearId: searchInput.yearId,
+    batchValue: searchInput.batchValue,
   };
   };
   let res = await https.getBlob(
   let res = await https.getBlob(
     "/welcome/api/welcomeBed/studentAccommodationListExport",
     "/welcome/api/welcomeBed/studentAccommodationListExport",