diff --git a/src/views/routine/dis/basic/index.vue b/src/views/routine/dis/basic/index.vue index 191cc41..bbfdad1 100644 --- a/src/views/routine/dis/basic/index.vue +++ b/src/views/routine/dis/basic/index.vue @@ -66,7 +66,7 @@ - + @@ -80,10 +80,10 @@ - @@ -214,7 +214,8 @@ export default { { required: true, message: '请选择是否专业转换', trigger: 'blur' }, ], reason13: [ - { required: true, message: '请输入手机号', trigger: 'blur' }, + { required: true, message: '请输入联系电话', trigger: 'blur' }, + { pattern: /^1[3-9]\d{9}$/, message: '请输入有效的手机号码', trigger: 'blur' } ], } @@ -222,9 +223,21 @@ export default { }, created() { this.getList(); + this.showData() }, methods: { + // 修改数据 + showData() { + if (this.$route.query.id != undefined) { + console.log(this.$route.query.id) + getBasic(this.$route.query.id).then((response) => { + this.form = response.data + // this.active = response.data.status + 1; + }) + } + }, + // 填写学号时自动获取其他信息 changeGet() { this.form.stuId = this.form.stId ? this.form.stId : this.$route.query.stId diff --git a/src/views/routine/dis/formData.vue b/src/views/routine/dis/formData.vue index 97316fa..ea09f2c 100644 --- a/src/views/routine/dis/formData.vue +++ b/src/views/routine/dis/formData.vue @@ -75,8 +75,9 @@ value-format="yyyy-MM-dd" class="date-picker"> 日退役,退役后申请复学。

-

是否申请转专业:()是 ()否 - +

是否申请转专业:(√)是 ()否 +

+

是否申请转专业:()是 (×)否

原年级和专业:__ {{ form.maList.length > 0 ? form.maList[0].oldgrade : '暂无数据' }} @@ -106,13 +107,15 @@ - - + 招生与
就业处
意见

符合转专业条件,拟同意转入年级和专业: + __{{ form.maList.length > 0 ? form.maList[0].newgrade : '暂无数据' }} + __ + {{ form.maList.length > 0 ? form.maList[0].newmajor : '暂无数据' }}__

审批结果: diff --git a/src/views/routine/dis/mate/index.vue b/src/views/routine/dis/mate/index.vue index 2d4b952..6c7d385 100644 --- a/src/views/routine/dis/mate/index.vue +++ b/src/views/routine/dis/mate/index.vue @@ -72,10 +72,10 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+
+
@@ -224,7 +262,8 @@ import { getUserProfile } from '@/api/system/user' // 获取 export default { name: "Basic", - dicts: ['sys_user_sex'], + dicts: ['sys_yes_no', 'sys_user_sex', 'rt_filling_college', 'sys_commit_status', 'sys_teacher_kpi_filling_year', 'rt_nation', 'rt_classes'], + data() { return { // 遮罩层 @@ -273,6 +312,46 @@ export default { form: {}, // 表单校验 rules: { + reason1: [ + { required: true, message: '学号不能为空', trigger: 'blur' }, + ], + reason2: [ + { required: true, message: '姓名不能为空', trigger: 'blur' }, + ], + reason3: [ + { required: true, message: '辅导员不能为空', trigger: 'blur' }, + ], + reason4: [ + { required: true, message: '请选择性别', trigger: 'blur' }, + ], + reason5: [ + { required: true, message: '请选择民族', trigger: 'blur' }, + ], + reason6: [ + { required: true, message: '请输入班级', trigger: 'blur' }, + ], + reason7: [ + { required: true, message: '请输入专业', trigger: 'blur' }, + ], + reason8: [ + { required: true, message: '请输入年级', trigger: 'blur' }, + ], + reason9: [ + { required: true, message: '请选择学院', trigger: 'blur' }, + ], + reason10: [ + { required: true, message: '请填写原因', trigger: 'blur' }, + ], + reason11: [ + { required: true, message: '请选择时间', trigger: 'blur' }, + ], + reason12: [ + { required: true, message: '请选择是否专业转换', trigger: 'blur' }, + ], + reason13: [ + { required: true, message: '请输入联系电话', trigger: 'blur' }, + { pattern: /^1[3-9]\d{9}$/, message: '请输入有效的手机号码', trigger: 'blur' } + ], } }; }, @@ -281,6 +360,17 @@ export default { this.getUser() }, methods: { + // 跳转到表单页面 + handledetail(row) { + this.$router.push({ + path: '/routine/dis/dis', + query: { + id: row.id, + + }, + // }); + }) + }, // 获取当前登录信息 getUser() { @@ -386,27 +476,6 @@ export default { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); - // this.form.stId - this.dataform = { - id: null, - stId: this.form.stId, - times: null, - college: null, - oldgrade: null, - oldmajor: null, - newgrade: null, - newmajor: null, - proof: null, - idcard: null, - material: null, - data1: null, - data2: null - }; - addMate(this.dataform).then(response => { - - this.open = false; - this.getList(); - }); }); } else { addBasic(this.form).then(response => { @@ -459,3 +528,30 @@ export default { } }; + \ No newline at end of file