|
|
@@ -80,6 +80,17 @@
|
|
|
</el-select>
|
|
|
</div>
|
|
|
<div class="condition">
|
|
|
+ <span>现场报到 :</span>
|
|
|
+ <el-select
|
|
|
+ clearable
|
|
|
+ v-model="searchInput.isRegistered"
|
|
|
+ placeholder="请选择现场报到"
|
|
|
+ >
|
|
|
+ <el-option label="已报到" value="1" />
|
|
|
+ <el-option label="未报到" value="2" />
|
|
|
+ </el-select>
|
|
|
+ </div>
|
|
|
+ <div class="condition">
|
|
|
<span>姓名 :</span>
|
|
|
<el-input
|
|
|
clearable
|
|
|
@@ -271,12 +282,22 @@
|
|
|
<span v-else>{{ row.dormitory }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
+ <el-table-column
|
|
|
+ width="160"
|
|
|
+ align="center"
|
|
|
+ prop="isRegistered"
|
|
|
+ label="现在报到"
|
|
|
+ >
|
|
|
+ <template #default="{ row }">
|
|
|
+ <span v-if="row.isRegistered == 1" style="color: #2279ec">已报到</span>
|
|
|
+ <span v-else>未报到</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
align="center"
|
|
|
label="操作"
|
|
|
fixed="right"
|
|
|
- min-width="180"
|
|
|
+ min-width="230"
|
|
|
>
|
|
|
<template #default="{ row }">
|
|
|
<div class="options">
|
|
|
@@ -298,6 +319,26 @@
|
|
|
@click="deleteS(row)"
|
|
|
>删除</span
|
|
|
>
|
|
|
+ <span
|
|
|
+ class="delete"
|
|
|
+ style="color: #c003a2; margin-left: 15px"
|
|
|
+ v-if="
|
|
|
+ store.BtnRole('studentManagementSetting8') &&
|
|
|
+ row.isRegistered != 1
|
|
|
+ "
|
|
|
+ @click="registerS(row, 1)"
|
|
|
+ >现场报到</span
|
|
|
+ >
|
|
|
+ <span
|
|
|
+ class="delete"
|
|
|
+ style="color: #c003a2; margin-left: 15px"
|
|
|
+ v-if="
|
|
|
+ store.BtnRole('studentManagementSetting8') &&
|
|
|
+ row.isRegistered == 1
|
|
|
+ "
|
|
|
+ @click="registerS(row, 2)"
|
|
|
+ >取消报到</span
|
|
|
+ >
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -421,13 +462,13 @@
|
|
|
clearable
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="毕业中学 :" prop="graduationSchool">
|
|
|
+ <!-- <el-form-item label="毕业中学 :" prop="graduationSchool">
|
|
|
<el-input
|
|
|
v-model.trim="ruleForm.graduationSchool"
|
|
|
placeholder="请输入毕业中学"
|
|
|
clearable
|
|
|
/>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<el-form-item label="政治面貌 :" prop="politicalStatu">
|
|
|
<el-input
|
|
|
v-model.trim="ruleForm.politicalStatu"
|
|
|
@@ -973,10 +1014,10 @@
|
|
|
<span class="title">考生号 :</span>
|
|
|
<span class="title_content">{{ ruleForm.examNum }}</span>
|
|
|
</div>
|
|
|
- <div class="el-form-item" prop="graduationSchool">
|
|
|
+ <!-- <div class="el-form-item" prop="graduationSchool">
|
|
|
<span class="title">毕业中学 :</span>
|
|
|
<span class="title_content">{{ ruleForm.graduationSchool }}</span>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">政治面貌 :</span>
|
|
|
<span class="title_content">{{ ruleForm.politicalStatu }}</span>
|
|
|
@@ -1325,6 +1366,7 @@
|
|
|
class="queding"
|
|
|
type="primary"
|
|
|
@click="projectImportConfirm(buildRef)"
|
|
|
+ :loading="buildImportLoading"
|
|
|
>
|
|
|
确认导入
|
|
|
</el-button>
|
|
|
@@ -1373,8 +1415,9 @@ const searchInput = reactive({
|
|
|
major: "",
|
|
|
classstr: "",
|
|
|
trafficMethod: "",
|
|
|
- fillStatus:"",
|
|
|
+ fillStatus: "",
|
|
|
name: "",
|
|
|
+ isRegistered:"",
|
|
|
}); // 搜索按钮数据
|
|
|
|
|
|
const currentPage = ref(1); // 当前页
|
|
|
@@ -1955,6 +1998,7 @@ const dormitoryChange = async (val) => {
|
|
|
const buildImportVisible = ref(false);
|
|
|
const buildRef = ref();
|
|
|
const buildFile = ref();
|
|
|
+const buildImportLoading = ref(false);
|
|
|
|
|
|
// 获取账户列表
|
|
|
const getList = async () => {
|
|
|
@@ -1967,7 +2011,8 @@ const getList = async () => {
|
|
|
classstrId: searchInput.classstr,
|
|
|
trafficMethod: searchInput.trafficMethod,
|
|
|
name: searchInput.name,
|
|
|
- fillStatus:searchInput.fillStatus
|
|
|
+ fillStatus: searchInput.fillStatus,
|
|
|
+ isRegistered: searchInput.isRegistered,
|
|
|
};
|
|
|
console.log(params);
|
|
|
|
|
|
@@ -2005,7 +2050,8 @@ const resetBtn = lodash.debounce(async () => {
|
|
|
classstrData.value = null;
|
|
|
searchInput.trafficMethod = null;
|
|
|
searchInput.name = null;
|
|
|
- searchInput.fillStatus=null
|
|
|
+ searchInput.fillStatus = null;
|
|
|
+ searchInput.isRegistered = null;
|
|
|
getList();
|
|
|
}, 300);
|
|
|
|
|
|
@@ -2164,10 +2210,10 @@ const updateS = async (row) => {
|
|
|
majorList(resData.collegeId).then(() => {
|
|
|
ruleForm.major = `${resData.major},${resData.majorId}`;
|
|
|
classstrList(resData.majorId).then(() => {
|
|
|
- if(resData.classstr){
|
|
|
+ if (resData.classstr) {
|
|
|
ruleForm.classstr = `${resData.classstr},${resData.classstrId}`;
|
|
|
- }else{
|
|
|
- ruleForm.classstr = null
|
|
|
+ } else {
|
|
|
+ ruleForm.classstr = null;
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
@@ -2182,13 +2228,13 @@ const updateS = async (row) => {
|
|
|
// 填报明细
|
|
|
ruleForm.phone = resData.phone;
|
|
|
|
|
|
- if (ruleForm.oprovince) {
|
|
|
+ if (resData.oprovince) {
|
|
|
ruleForm.oprovince = `${resData.oprovince},${resData.oprovinceId}`;
|
|
|
cityList("籍贯").then(() => {
|
|
|
- if (ruleForm.ocity) {
|
|
|
+ if (resData.ocity) {
|
|
|
ruleForm.ocity = `${resData.ocity},${resData.ocityId}`;
|
|
|
districtList("籍贯").then(() => {
|
|
|
- if (ruleForm.odistrict) {
|
|
|
+ if (resData.odistrict) {
|
|
|
ruleForm.odistrict = `${resData.odistrict},${resData.odistrictId}`;
|
|
|
}
|
|
|
});
|
|
|
@@ -2196,13 +2242,13 @@ const updateS = async (row) => {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- if (ruleForm.province) {
|
|
|
+ if (resData.province) {
|
|
|
ruleForm.province = `${resData.province},${resData.provinceId}`;
|
|
|
cityList().then(() => {
|
|
|
- if (ruleForm.city) {
|
|
|
+ if (resData.city) {
|
|
|
ruleForm.city = `${resData.city},${resData.cityId}`;
|
|
|
districtList().then(() => {
|
|
|
- if (ruleForm.district) {
|
|
|
+ if (resData.district) {
|
|
|
ruleForm.district = `${resData.district},${resData.districtId}`;
|
|
|
}
|
|
|
});
|
|
|
@@ -2271,6 +2317,71 @@ const deleteS = async (row) => {
|
|
|
loading.value = false;
|
|
|
});
|
|
|
};
|
|
|
+const registerS = async (row, flag) => {
|
|
|
+ if (flag == 1) {
|
|
|
+ let data = {
|
|
|
+ id: row.id,
|
|
|
+ isRegistered: flag, //已报到：1，未报到：2，为空默认是未报到
|
|
|
+ };
|
|
|
+ let res = await https.post(
|
|
|
+ "/welcome/api/welcomeStudent/isRegistered",
|
|
|
+ "data",
|
|
|
+ data
|
|
|
+ );
|
|
|
+ if (res.code == 200) {
|
|
|
+ ElMessage({
|
|
|
+ type: "success",
|
|
|
+ showClose: true,
|
|
|
+ message: res.message,
|
|
|
+ center: true,
|
|
|
+ });
|
|
|
+ getList();
|
|
|
+ } else {
|
|
|
+ ElMessage({
|
|
|
+ type: "error",
|
|
|
+ showClose: true,
|
|
|
+ message: res.message,
|
|
|
+ center: true,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ } else if (flag != 1) {
|
|
|
+ ElMessageBox.confirm("是否取消报到?", "提示!!!", {
|
|
|
+ confirmButtonText: "确认",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning",
|
|
|
+ })
|
|
|
+ .then(async () => {
|
|
|
+ let data = {
|
|
|
+ id: row.id,
|
|
|
+ isRegistered: flag, //已报到：1，未报到：2，为空默认是未报到
|
|
|
+ };
|
|
|
+ let res = await https.post(
|
|
|
+ "/welcome/api/welcomeStudent/isRegistered",
|
|
|
+ "data",
|
|
|
+ data
|
|
|
+ );
|
|
|
+ if (res.code == 200) {
|
|
|
+ ElMessage({
|
|
|
+ type: "success",
|
|
|
+ showClose: true,
|
|
|
+ message: res.message,
|
|
|
+ center: true,
|
|
|
+ });
|
|
|
+ getList();
|
|
|
+ } else {
|
|
|
+ ElMessage({
|
|
|
+ type: "error",
|
|
|
+ showClose: true,
|
|
|
+ message: res.message,
|
|
|
+ center: true,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ loading.value = false;
|
|
|
+ });
|
|
|
+ }
|
|
|
+};
|
|
|
const arriveTimeChange = (val) => {
|
|
|
console.log(val);
|
|
|
};
|
|
|
@@ -2626,7 +2737,8 @@ const buildExportbtn = async () => {
|
|
|
classstrId: searchInput.classstr,
|
|
|
trafficMethod: searchInput.trafficMethod,
|
|
|
name: searchInput.name,
|
|
|
- fillStatus:searchInput.fillStatus
|
|
|
+ fillStatus: searchInput.fillStatus,
|
|
|
+ isRegistered: searchInput.isRegistered,
|
|
|
};
|
|
|
let res = await https.getBlob(
|
|
|
"/welcome/api/welcomeStudent/welcomeStudentExport",
|
|
|
@@ -2703,6 +2815,8 @@ const projectImportExceed = (files) => {
|
|
|
};
|
|
|
// 导入项目
|
|
|
const projectImportConfirm = async () => {
|
|
|
+ buildImportLoading.value = true;
|
|
|
+
|
|
|
let data = new FormData();
|
|
|
data.set("file", buildFile.value);
|
|
|
let res = await https.post(
|
|
|
@@ -2713,6 +2827,8 @@ const projectImportConfirm = async () => {
|
|
|
console.log(res, "导入项目");
|
|
|
if (res.code == 200) {
|
|
|
buildImportVisible.value = false;
|
|
|
+
|
|
|
+ buildImportLoading.value = false;
|
|
|
getList();
|
|
|
ElMessage({
|
|
|
type: "success",
|
hzj18279462576@163.com