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