xgxt_sd/zhxg_pc
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

保留学籍申请表修改

Browse Source
This commit is contained in:
陈
2025-11-13 17:20:13 +08:00
parent eee7b48ad1
commit 3c1f8b9f5d
3 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/routine/enlistmentReserve/applicationForm.vue
View File

@@ -17,8 +17,8 @@
<td class="input-cell"> <td class="input-cell">
<el-form-item prop="gender" class="form-item-custom"> <el-form-item prop="gender" class="form-item-custom">
<el-select v-model="formData.gender" placeholder="请选择性别" class="basic-input"> <el-select v-model="formData.gender" placeholder="请选择性别" class="basic-input">
<el-option label="男" value="0"></el-option> <el-option label="男" value="1"></el-option>
<el-option label="女" value="1"></el-option> <el-option label="女" value="0"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</td> </td>
@@ -241,8 +241,8 @@
<td class="label">备注</td> <td class="label">备注</td>
<td class="input-cell" colspan="8"> <td class="input-cell" colspan="8">
<span>保留学籍编号：</span> <span>保留学籍编号：</span>
<el-input v-model="formData.reserveNo" readonly class="remark-input" <!-- <el-input v-model="formData.reserveNo" readonly class="remark-input"
style="width: 150px; margin: 0 10px;"></el-input> style="width: 150px; margin: 0 10px;"></el-input> -->
<!-- <span>批文号：</span> <!-- <span>批文号：</span>
<el-input v-model="formData.approvalNo" readonly class="remark-input" <el-input v-model="formData.approvalNo" readonly class="remark-input"
style="width: 150px; margin: 0 10px;"></el-input> style="width: 150px; margin: 0 10px;"></el-input>
@@ -455,6 +455,7 @@ export default {
const year = new Date().getFullYear(); const year = new Date().getFullYear();
const randomNo = Math.floor(Math.random() * 1000000).toString().padStart(6, '0'); const randomNo = Math.floor(Math.random() * 1000000).toString().padStart(6, '0');
this.formData.applyNo = `RY${year}${randomNo}`; this.formData.applyNo = `RY${year}${randomNo}`;
this.formData.reserveNo = `RN${year}${randomNo}`;
} }
this.formData.applyStatus = applyStatus; this.formData.applyStatus = applyStatus;
this.formData.updateTime = new Date().toISOString().split('T')[0]; this.formData.updateTime = new Date().toISOString().split('T')[0];

28
src/views/routine/enlistmentReserve/enlistmentReserveApproval/index.vue
View File

@@ -1,23 +1,23 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="申请表ID" prop="applyId"> <!-- <el-form-item label="申请表ID" prop="applyId">
<el-input v-model="queryParams.applyId" placeholder="请输入申请表ID" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.applyId" placeholder="请输入申请表ID" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item> -->
<el-form-item label="流程实例ID" prop="processInstanceId"> <!-- <el-form-item label="流程实例ID" prop="processInstanceId">
<el-input v-model="queryParams.processInstanceId" placeholder="请输入流程实例ID" clearable <el-input v-model="queryParams.processInstanceId" placeholder="请输入流程实例ID" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item> -->
<el-form-item label="Flowable任务ID" prop="taskId"> <!-- <el-form-item label="Flowable任务ID" prop="taskId">
<el-input v-model="queryParams.taskId" placeholder="请输入Flowable任务ID" clearable <el-input v-model="queryParams.taskId" placeholder="请输入Flowable任务ID" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item> -->
<el-form-item label="审批节点" prop="nodeName"> <el-form-item label="审批节点" prop="nodeName">
<el-input v-model="queryParams.nodeName" placeholder="请输入审批节点" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.nodeName" placeholder="请输入审批节点" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="审批人ID" prop="approverId"> <!-- <el-form-item label="审批人ID" prop="approverId">
<el-input v-model="queryParams.approverId" placeholder="请输入审批人ID" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.approverId" placeholder="请输入审批人ID" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item> -->
<el-form-item label="审批人姓名" prop="approverName"> <el-form-item label="审批人姓名" prop="approverName">
<el-input v-model="queryParams.approverName" placeholder="请输入审批人姓名" clearable <el-input v-model="queryParams.approverName" placeholder="请输入审批人姓名" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
@@ -59,12 +59,14 @@
<el-table v-loading="loading" :data="enlistmentReserveApprovalList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="enlistmentReserveApprovalList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="center" prop="id" /> <!-- <el-table-column label="主键" align="center" prop="id" /> -->
<el-table-column label="申请表ID" align="center" prop="applyId" /> <!-- <el-table-column label="申请表ID" align="center" prop="applyId" /> -->
<el-table-column label="流程实例ID" align="center" prop="processInstanceId" /> <!-- <el-table-column label="流程实例ID" align="center" prop="processInstanceId" /> -->
<el-table-column label="Flowable任务ID" align="center" prop="taskId" /> <!-- <el-table-column label="Flowable任务ID" align="center" prop="taskId" /> -->
<el-table-column label="申请学生" align="center" prop="studentName" />
<el-table-column label="学生学号" align="center" prop="studentNo" />
<el-table-column label="审批节点" align="center" prop="nodeName" /> <el-table-column label="审批节点" align="center" prop="nodeName" />
<el-table-column label="审批人ID" align="center" prop="approverId" /> <!-- <el-table-column label="审批人ID" align="center" prop="approverId" /> -->
<el-table-column label="审批人姓名" align="center" prop="approverName" /> <el-table-column label="审批人姓名" align="center" prop="approverName" />
<el-table-column label="审批意见" align="center" prop="approvalOpinion" /> <el-table-column label="审批意见" align="center" prop="approvalOpinion" />
<el-table-column label="审批结果" align="center" prop="approvalResult" /> <el-table-column label="审批结果" align="center" prop="approvalResult" />

35
src/views/routine/enlistmentReserve/index.vue
View File

@@ -9,19 +9,19 @@
<el-option v-for="dict in dict.type.rt_nation" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.rt_nation" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="年级" prop="grade"> <!-- <el-form-item label="年级" prop="grade">
<el-select v-model="queryParams.grade" placeholder="请选择年级" clearable> <el-select v-model="queryParams.grade" placeholder="请选择年级" clearable>
<el-option v-for="dict in dict.type.rt_grade" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.rt_grade" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="学号" prop="studentNo"> <el-form-item label="学号" prop="studentNo">
<el-input v-model="queryParams.studentNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.studentNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="班级" prop="className"> <!-- <el-form-item label="班级" prop="className">
<el-select v-model="queryParams.className" placeholder="请选择班级" clearable> <el-select v-model="queryParams.className" placeholder="请选择班级" clearable>
<el-option v-for="dict in dict.type.rt_classes" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.rt_classes" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="专业名称" prop="major"> <!-- <el-form-item label="专业名称" prop="major">
<el-input v-model="queryParams.major" placeholder="请输入专业名称" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.major" placeholder="请输入专业名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item> --> </el-form-item> -->
@@ -69,35 +69,40 @@
<el-table-column label="申请编号" align="center" prop="applyNo" /> <el-table-column label="申请编号" align="center" prop="applyNo" />
<el-table-column label="姓名" align="center" prop="studentName" /> <el-table-column label="姓名" align="center" prop="studentName" />
<el-table-column label="辅导员姓名" align="center" prop="teacherName" /> <el-table-column label="辅导员姓名" align="center" prop="teacherName" />
<el-table-column label="性别" align="center" prop="gender" /> <el-table-column label="性别" align="center" prop="gender">
<template slot-scope="scope">
<span v-if="scope.row.gender == 1">男</span>
<span v-else>女</span>
</template>
</el-table-column>
<el-table-column label="民族" align="center" prop="nation"> <el-table-column label="民族" align="center" prop="nation">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.rt_nation" :value="scope.row.nation" /> <dict-tag :options="dict.type.rt_nation" :value="scope.row.nation" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="年级" align="center" prop="grade"> <el-table-column label="年级" align="center" prop="grade">
<template slot-scope="scope">
<dict-tag :options="dict.type.rt_grade" :value="scope.row.grade" />
</template>
</el-table-column> </el-table-column>
<el-table-column label="学号" align="center" prop="studentNo" /> <el-table-column label="学号" align="center" prop="studentNo" />
<el-table-column label="班级" align="center" prop="className"> <el-table-column label="班级" align="center" prop="className">
<template slot-scope="scope">
<dict-tag :options="dict.type.rt_classes" :value="scope.row.className" />
</template>
</el-table-column> </el-table-column>
<el-table-column label="专业名称" align="center" prop="major" /> <el-table-column label="专业名称" align="center" prop="major" />
<el-table-column label="家庭地址" align="center" prop="familyAddress" /> <el-table-column label="家庭地址" align="center" prop="familyAddress" />
<el-table-column label="家长联系电话" align="center" prop="parentPhone" /> <el-table-column label="家长电话" align="center" prop="parentPhone" />
<el-table-column label="申请理由" align="center" prop="applyReason" /> <el-table-column label="申请理由" align="center" prop="applyReason" />
<el-table-column label="申请状态" align="center" prop="applyStatus" /> <el-table-column label="申请状态" align="center" prop="applyStatus">
<template slot-scope="scope">
<el-tag v-if="scope.row.applyStatus == 0" type="info">待提交</el-tag>
<el-tag v-if="scope.row.applyStatus == 1">审核中</el-tag>
<el-tag v-if="scope.row.applyStatus == 2" type="success">审核通过</el-tag>
</template>
</el-table-column>
<el-table-column label="保留学籍编号" align="center" prop="reserveNo" /> <el-table-column label="保留学籍编号" align="center" prop="reserveNo" />
<el-table-column label="保留学籍开始日期" align="center" prop="reserveStartDate" width="180"> <el-table-column label="保留学籍开始日期" align="center" prop="reserveStartDate" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.reserveStartDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.reserveStartDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="保留学籍结束日期" align="center" prop="reserveEndDate" width="180"> <el-table-column label="保留学籍结束日期" align="center" prop="reserveEndDate" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.reserveEndDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.reserveEndDate, '{y}-{m}-{d}') }}</span>
</template> </template>