|
|
@@ -142,7 +142,7 @@
|
|
|
label="姓名"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- width="180"
|
|
|
+ width="190"
|
|
|
align="center"
|
|
|
prop="cardId"
|
|
|
label="身份证号"
|
|
|
@@ -158,13 +158,13 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- width="120"
|
|
|
+ width="190"
|
|
|
align="center"
|
|
|
prop="major"
|
|
|
label="专业"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
- width="160"
|
|
|
+ width="220"
|
|
|
align="center"
|
|
|
prop="classstr"
|
|
|
label="班级"
|
|
|
@@ -357,6 +357,7 @@
|
|
|
<el-form-item label="校区 " prop="school">
|
|
|
<el-select
|
|
|
clearable
|
|
|
+ :disabled="ruleForm.fillStatus == '已填报'"
|
|
|
@change="schoolChange"
|
|
|
v-model="ruleForm.school"
|
|
|
placeholder="请选择校区名称"
|
|
|
@@ -378,7 +379,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="身份证号 :" prop="cardId">
|
|
|
<el-input
|
|
|
- :disabled="dialongTitle!='新增学生信息'"
|
|
|
+ :disabled="dialongTitle != '新增学生信息'"
|
|
|
v-model.trim="ruleForm.cardId"
|
|
|
placeholder="请输入身份证号"
|
|
|
clearable
|
|
|
@@ -643,23 +644,51 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="到站地点 :" prop="arrive">
|
|
|
- <el-select v-model="ruleForm.arrive" placeholder="请选择到站地点">
|
|
|
+ <el-select
|
|
|
+ v-if="ruleForm.trafficMethod == '自驾'"
|
|
|
+ v-model="ruleForm.arrive"
|
|
|
+ placeholder="请选择到站地点"
|
|
|
+ >
|
|
|
+ <el-option label="黄家湖校区" value="黄家湖校区" />
|
|
|
+ <el-option label="墨轩湖校区" value="墨轩湖校区" />
|
|
|
+ </el-select>
|
|
|
+ <el-select
|
|
|
+ v-else-if="ruleForm.trafficMethod == '飞机'"
|
|
|
+ v-model="ruleForm.arrive"
|
|
|
+ placeholder="请选择到站地点"
|
|
|
+ >
|
|
|
+ <el-option label="昌北机场" value="昌北机场" />
|
|
|
+ </el-select>
|
|
|
+ <el-select
|
|
|
+ v-else-if="ruleForm.trafficMethod == '火车'"
|
|
|
+ v-model="ruleForm.arrive"
|
|
|
+ placeholder="请选择到站地点"
|
|
|
+ >
|
|
|
+ <el-option label="南昌火车站" value="南昌火车站" />
|
|
|
+ <el-option label="南昌西站" value="南昌西站" />
|
|
|
+ <el-option label="南昌东站" value="南昌东站" />
|
|
|
+ </el-select>
|
|
|
+ <el-select
|
|
|
+ v-else-if="ruleForm.trafficMethod == '汽车'"
|
|
|
+ v-model="ruleForm.arrive"
|
|
|
+ placeholder="请选择到站地点"
|
|
|
+ >
|
|
|
+ <el-option label="南昌长途汽车西站" value="南昌长途汽车西站" />
|
|
|
+ <el-option label="靖安汽车站" value="靖安汽车站" />
|
|
|
+ </el-select>
|
|
|
+ <el-select
|
|
|
+ v-else
|
|
|
+ v-model="ruleForm.arrive"
|
|
|
+ placeholder="请选择到站地点"
|
|
|
+ >
|
|
|
<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
|
|
|
- v-if="ruleForm.trafficMethod == '自驾'"
|
|
|
- label="黄家湖校区"
|
|
|
- value="黄家湖校区"
|
|
|
- />
|
|
|
- <el-option
|
|
|
- v-if="ruleForm.trafficMethod == '自驾'"
|
|
|
- label="墨轩湖校区"
|
|
|
- value="墨轩湖校区"
|
|
|
- />
|
|
|
+ <el-option label="黄家湖校区" value="黄家湖校区" />
|
|
|
+ <el-option label="墨轩湖校区" value="墨轩湖校区" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
@@ -905,7 +934,7 @@
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">校区 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.school ? ruleForm.school.split(",")[0] : ""
|
|
|
+ ruleForm.school ? ruleForm.school : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="el-form-item">
|
|
|
@@ -951,19 +980,19 @@
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">院系 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.college ? ruleForm.college.split(",")[0] : ""
|
|
|
+ ruleForm.college ? ruleForm.college : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">专业 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.major ? ruleForm.major.split(",")[0] : ""
|
|
|
+ ruleForm.major ? ruleForm.major : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">所属班级 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.classstr ? ruleForm.classstr.split(",")[0] : ""
|
|
|
+ ruleForm.classstr ? ruleForm.classstr : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="el-form-item">
|
|
|
@@ -990,28 +1019,28 @@
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">籍贯 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.oprovince ? ruleForm.oprovince.split(",")[0] : ""
|
|
|
+ ruleForm.oprovince ? ruleForm.oprovince : ""
|
|
|
}}</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.ocity ? ruleForm.ocity.split(",")[0] : ""
|
|
|
+ ruleForm.ocity ? ruleForm.ocity : ""
|
|
|
}}</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.odistrict ? ruleForm.odistrict.split(",")[0] : ""
|
|
|
+ ruleForm.odistrict ? ruleForm.odistrict : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">家庭住址 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.province ? ruleForm.province.split(",")[0] : ""
|
|
|
+ ruleForm.province ? ruleForm.province : ""
|
|
|
}}</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.city ? ruleForm.city.split(",")[0] : ""
|
|
|
+ ruleForm.city ? ruleForm.city : ""
|
|
|
}}</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.district ? ruleForm.district.split(",")[0] : ""
|
|
|
+ ruleForm.district ? ruleForm.district : ""
|
|
|
}}</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.address ? ruleForm.address.split(",")[0] : ""
|
|
|
+ ruleForm.address ? ruleForm.address : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1107,19 +1136,19 @@
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">楼栋 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.build ? ruleForm.build.split(",")[0] : ""
|
|
|
+ ruleForm.build ? ruleForm.build : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">寝室号 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.dormitory ? ruleForm.dormitory.split(",")[0] : ""
|
|
|
+ ruleForm.dormitory ? ruleForm.dormitory : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
<div class="el-form-item">
|
|
|
<span class="title">床位号 :</span>
|
|
|
<span class="title_content">{{
|
|
|
- ruleForm.bed ? ruleForm.bed.split(",")[0] : ""
|
|
|
+ ruleForm.bed ? ruleForm.bed : ""
|
|
|
}}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -1314,7 +1343,7 @@ const router = useRouter();
|
|
|
const store = useCounterStore();
|
|
|
|
|
|
// 为避免解构时失去响应性
|
|
|
-const { name, age, isCollapse, realAge,roleList } = storeToRefs(store);
|
|
|
+const { name, age, isCollapse, realAge, collegeRole } = storeToRefs(store);
|
|
|
|
|
|
// 表格数据
|
|
|
const loading = ref(false);
|
|
|
@@ -1390,13 +1419,24 @@ const ruleForm = reactive({
|
|
|
|
|
|
amountPayable: "", // 应缴金额
|
|
|
payAmount: "", // 实付金额
|
|
|
+
|
|
|
+ fillStatus: "", // 判断有无填报
|
|
|
id: "",
|
|
|
});
|
|
|
const pictureRef = ref();
|
|
|
// 表单验证
|
|
|
const rules = reactive({
|
|
|
admissNum: [{ required: true, message: "录取号不能为空", trigger: "blur" }],
|
|
|
- cardId: [{ required: true, message: "身份证号不能为空", trigger: "blur" }],
|
|
|
+ cardId: [
|
|
|
+ { required: true, message: "身份证号不能为空", trigger: "blur" },
|
|
|
+ {
|
|
|
+ min: 8,
|
|
|
+ max: 20,
|
|
|
+ pattern: /^(?:\d{15}|\d{17}[\dX])$/,
|
|
|
+ message: "身份证号码格式有误，请重新输入",
|
|
|
+ trigger: "blur",
|
|
|
+ },
|
|
|
+ ],
|
|
|
birthday: [{ required: true, message: "出生年月不能为空", trigger: "blur" }],
|
|
|
examNum: [{ required: true, message: "考生号不能为空", trigger: "blur" }],
|
|
|
graduationSchool: [
|
|
|
@@ -1411,7 +1451,16 @@ const rules = reactive({
|
|
|
batchValue: [{ required: true, message: "批次不能为空", trigger: "blur" }],
|
|
|
nationality: [{ required: true, message: "民族不能为空", trigger: "blur" }],
|
|
|
|
|
|
- phone: [{ required: true, message: "手机号码不能为空", trigger: "blur" }],
|
|
|
+ phone: [
|
|
|
+ { required: true, message: "手机号码不能为空", trigger: "blur" },
|
|
|
+ {
|
|
|
+ min: 8,
|
|
|
+ max: 20,
|
|
|
+ pattern: /^1[3-9]\d{9}$/,
|
|
|
+ message: "手机号码格式有误，请重新输入",
|
|
|
+ trigger: "blur",
|
|
|
+ },
|
|
|
+ ],
|
|
|
address: [{ required: true, message: "详情地址不能为空", trigger: "blur" }],
|
|
|
registerOntime: [
|
|
|
{ required: true, message: "按时报到不能为空", trigger: "blur" },
|
|
|
@@ -1462,7 +1511,16 @@ const addfamilysRules = reactive({
|
|
|
name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
|
|
|
familyShip: [{ required: true, message: "称谓不能为空", trigger: "blur" }],
|
|
|
workUnit: [{ required: true, message: "工作单位不能为空", trigger: "blur" }],
|
|
|
- phone: [{ required: true, message: "联系电话不能为空", trigger: "blur" }],
|
|
|
+ phone: [
|
|
|
+ { required: true, message: "联系电话不能为空", trigger: "blur" },
|
|
|
+ {
|
|
|
+ min: 8,
|
|
|
+ max: 20,
|
|
|
+ pattern: /^1[3-9]\d{9}$/,
|
|
|
+ message: "手机号码格式有误，请重新输入",
|
|
|
+ trigger: "blur",
|
|
|
+ },
|
|
|
+ ],
|
|
|
});
|
|
|
// 家庭成员 End
|
|
|
|
|
|
@@ -1476,18 +1534,19 @@ const classstrData = ref([]);
|
|
|
const classstrFormData = ref([]);
|
|
|
|
|
|
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 = {
|
|
|
@@ -1997,7 +2056,7 @@ const submitAddfamilys = lodash.debounce(async (formEl) => {
|
|
|
const addlist = () => {
|
|
|
dialongTitle.value = "新增学生信息";
|
|
|
addDialogVisible.value = true;
|
|
|
- ruleForm.school=null
|
|
|
+ ruleForm.school = null;
|
|
|
ruleForm.picture = null;
|
|
|
ruleForm.admissNum = null;
|
|
|
ruleForm.name = null;
|
|
|
@@ -2046,6 +2105,7 @@ const addlist = () => {
|
|
|
// 车辆信息
|
|
|
ruleForm.carNumber = null;
|
|
|
|
|
|
+ ruleForm.fillStatus = null;
|
|
|
ruleForm.id = null;
|
|
|
};
|
|
|
// 添加账号
|
|
|
@@ -2054,6 +2114,7 @@ const updateS = async (row) => {
|
|
|
dialongTitle.value = "编辑学生信息";
|
|
|
addDialogVisible.value = true;
|
|
|
ruleForm.id = row.id;
|
|
|
+ ruleForm.fillStatus = row.fillStatus;
|
|
|
|
|
|
let data = {
|
|
|
id: row.id, // 当前页
|
|
|
@@ -2254,13 +2315,9 @@ const infoStudent = async (row) => {
|
|
|
ruleForm.sex = resData.sex;
|
|
|
ruleForm.birthday = resData.birthday;
|
|
|
|
|
|
- ruleForm.college = `${resData.college},${resData.collegeId}`;
|
|
|
- majorList(resData.collegeId).then(() => {
|
|
|
- ruleForm.major = `${resData.major},${resData.majorId}`;
|
|
|
- classstrList(resData.majorId).then(() => {
|
|
|
- ruleForm.classstr = `${resData.classstr},${resData.classstrId}`;
|
|
|
- });
|
|
|
- });
|
|
|
+ ruleForm.college = resData.college;
|
|
|
+ ruleForm.major = resData.major;
|
|
|
+ ruleForm.classstr = resData.classstr;
|
|
|
|
|
|
ruleForm.examNum = resData.examNum;
|
|
|
ruleForm.eduSystem = resData.eduSystem;
|
|
|
@@ -2272,21 +2329,13 @@ const infoStudent = async (row) => {
|
|
|
// 填报明细
|
|
|
ruleForm.phone = resData.phone;
|
|
|
|
|
|
- ruleForm.oprovince = `${resData.oprovince},${resData.oprovinceId}`;
|
|
|
- cityList("籍贯").then(() => {
|
|
|
- ruleForm.ocity = `${resData.ocity},${resData.ocityId}`;
|
|
|
- districtList("籍贯").then(() => {
|
|
|
- ruleForm.odistrict = `${resData.odistrict},${resData.odistrictId}`;
|
|
|
- });
|
|
|
- });
|
|
|
+ ruleForm.oprovince = resData.oprovince;
|
|
|
+ ruleForm.ocity = resData.ocity;
|
|
|
+ ruleForm.odistrict = resData.odistrict;
|
|
|
|
|
|
- ruleForm.province = `${resData.province},${resData.provinceId}`;
|
|
|
- cityList().then(() => {
|
|
|
- ruleForm.city = `${resData.city},${resData.cityId}`;
|
|
|
- districtList().then(() => {
|
|
|
- ruleForm.district = `${resData.district},${resData.districtId}`;
|
|
|
- });
|
|
|
- });
|
|
|
+ ruleForm.province = resData.province;
|
|
|
+ ruleForm.city = resData.city;
|
|
|
+ ruleForm.district = resData.district;
|
|
|
ruleForm.address = resData.address;
|
|
|
|
|
|
ruleForm.registerOntime = resData.registerOntime ? 1 : 0; // 按时报到
|
|
|
@@ -2305,24 +2354,10 @@ const infoStudent = async (row) => {
|
|
|
ruleForm.accompanys = resData.avs;
|
|
|
|
|
|
// 宿舍信息
|
|
|
- if (resData.schoolId) {
|
|
|
- ruleForm.school = `${resData.school},${resData.schoolId}`;
|
|
|
- buildList().then(() => {
|
|
|
- if (resData.buildId) {
|
|
|
- ruleForm.build = `${resData.build},${resData.buildId}`;
|
|
|
- dormitoryList().then(() => {
|
|
|
- if (resData.dormitoryId) {
|
|
|
- ruleForm.dormitory = `${resData.dormitory},${resData.dormitoryId}`;
|
|
|
- bedList().then(() => {
|
|
|
- if (resData.bedId) {
|
|
|
- ruleForm.bed = `${resData.bed},${resData.bedId}`;
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
+ ruleForm.build = resData.build;
|
|
|
+ ruleForm.dormitory = resData.dormitory;
|
|
|
+ ruleForm.bed = resData.bed;
|
|
|
+ ruleForm.school = resData.school;
|
|
|
|
|
|
// 缴费信息
|
|
|
ruleForm.amountPayable = resData.amountPayable;
|
|
|
@@ -3076,7 +3111,7 @@ onUnmounted(() => {
|
|
|
.filling_details {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
- .info_content{
|
|
|
+ .info_content {
|
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
|
.el-form-item {
|
hzj18279462576@163.com