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

外宿申请-流程表单

Browse Source
This commit is contained in:
962704835@qq.com
2025-12-11 22:02:38 +08:00
parent 8bf7526b7b
commit c16d4701c2
3 changed files with 418 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/views/dormitory/outsideAccommodation/outsideAccommodationApply/applicationForm.vue
View File

@@ -111,7 +111,7 @@
<!-- 佐证附件 --> <!-- 佐证附件 -->
<el-descriptions-item label="佐证附件" required> <el-descriptions-item label="佐证附件" required>
<el-form-item prop="reasonFileList" class="no-label-form-item"> <el-form-item prop="affixId" class="no-label-form-item">
<Affix v-model="form.affixId" @input="handleAffix" @fileUploaded="handleAffix" <Affix v-model="form.affixId" @input="handleAffix" @fileUploaded="handleAffix"
@delete-file="handleDeleteFile" /> @delete-file="handleDeleteFile" />
<div class="el-upload__tip"> <div class="el-upload__tip">
@@ -407,13 +407,7 @@ export default {
promiseDate: [{ required: true, message: '请选择签署日期', trigger: 'change' }], promiseDate: [{ required: true, message: '请选择签署日期', trigger: 'change' }],
studentSignature: [{ required: true, message: '请完成电子签名', trigger: 'change' }], studentSignature: [{ required: true, message: '请完成电子签名', trigger: 'change' }],
studentPromiseSign: [{ required: true, message: '请完成承诺签名', trigger: 'change' }], studentPromiseSign: [{ required: true, message: '请完成承诺签名', trigger: 'change' }],
reasonFileList: [ affixId: [{ required: true, message: '请上传佐证材料', trigger: 'blur' }],
{
required: true,
validator: (r, v, c) =>
this.reasonFileList.length ? c() : c(new Error('请上传佐证附件'))
}
],
parentSignAttachment: [ parentSignAttachment: [
{ {
required: true, required: true,
@@ -462,32 +456,15 @@ export default {
// 回显家长签字附件 // 回显家长签字附件
this.fileList = [{ name: fileName, url: this.baseUrl + this.form.parentSignAttachment }] this.fileList = [{ name: fileName, url: this.baseUrl + this.form.parentSignAttachment }]
// 处理审批意见列表，添加意见类型 // 处理审批意见列表，添加意见类型
// if (this.form?.enlistmentReserveApprovalList) {
// // 定义意见类型数组（与索引对应：0=辅导员，1=学务，2=二级学院，3=学籍管理科，4=教务处主管领导）
// const opinionTypes = [
// "辅导员意见",
// "学务意见",
// "二级学院意见",
// "学籍管理科意见",
// "教务处主管领导意见"
// ];
// // 遍历审批列表，为每条数据添加 opinionType 字段
// this.formData.enlistmentReserveApprovalList.forEach((item, index) => {
// // 只处理前5条数据（超出部分不添加，或可根据实际需求调整）
// if (index < opinionTypes.length) {
// item.opinionType = opinionTypes[index];
// } else {
// // 若超过5条，可设置默认值或不设置
// item.opinionType = "其他意见";
// }
// });
// }
this.loading = false this.loading = false
}) })
} else { } else {
// 若 id 为空，可做清空处理 // 若 id 为空，可做清空处理
this.currentId = null; this.currentId = null;
this.resetForm() // 延迟执行重置，确保 formRef 已挂载
this.$nextTick(() => {
this.resetForm()
})
this.getUser() this.getUser()
} }
} }
@@ -792,7 +769,10 @@ export default {
// 重置表单 // 重置表单
resetForm() { resetForm() {
this.$refs.formRef.resetFields() // 先判断 formRef 是否存在，再调用 resetFields
if (this.$refs.formRef) {
this.$refs.formRef.resetFields()
}
this.reasonFileList = [] this.reasonFileList = []
this.fileList = [] this.fileList = []
this.form.affixId = "" this.form.affixId = ""
@@ -997,8 +977,8 @@ export default {
const currentYear = now.getFullYear(); const currentYear = now.getFullYear();
// 计算次年（当前年+1） // 计算次年（当前年+1）
const nextYear = currentYear + 1; const nextYear = currentYear + 1;
// 生成次年8月31日（月份从0开始，8月对应9） // 8月对应的索引是7（0=1月，1=2月...7=8月）
const endDate = new Date(nextYear, 8, 31); const endDate = new Date(nextYear, 7, 31); // 次年8月31日
// 格式化为 yyyy-MM-dd（适配 el-date-picker 的 value-format） // 格式化为 yyyy-MM-dd（适配 el-date-picker 的 value-format）
return this.formatDate(endDate); return this.formatDate(endDate);
}, },

67
src/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply.vue
View File

@@ -1,8 +1,8 @@
<!-- 详细外宿申请表 --> <!-- 详细外宿申请表 -->
<template> <template>
<div class="application-form-container" v-loading="loading"> <div class="application-form-container" v-loading="loading" :style="isShwo ? 'width: 70%' : ''">
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix" v-if="isShwo">
<span class="el-icon-document">外宿申请详情</span> <span class="el-icon-document">外宿申请详情</span>
<el-button style="float: right;margin-left: 10px;" size="mini" type="danger" @click="goBack">关闭</el-button> <el-button style="float: right;margin-left: 10px;" size="mini" type="danger" @click="goBack">关闭</el-button>
<el-button v-print="printobj" style="float: right" size="mini" type="success">打印</el-button> <el-button v-print="printobj" style="float: right" size="mini" type="success">打印</el-button>
@@ -168,13 +168,36 @@
</div> </div>
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4"> <el-descriptions-item span="4" v-for="item in renderData.outsideAccommodationApprovals">
<template slot="label"> 辅导员意见 </template> <template slot="label"> {{ item.opinionType }} </template>
{{ renderData.reserveNo }} <div>{{ item.approvalOpinion }}</div>
<div style="padding: 0 20px;">
<div style="display: flex;justify-content: flex-end;align-items: center;">
<div style="margin-right: 10px;">
<span>
审批结果：
<el-tag v-if="item.approvalResult == 1" type="success">通过</el-tag>
<el-tag v-else type="danger">驳回</el-tag>
</span>
</div>
<div
style="display: flex;justify-content: center;align-items: center;min-width: 130px;text-align: left;">
<div>审批人： </div>
<div>
<!-- <el-image style="width: 100px; height: 50px; margin-left: 10px; border: 1px solid #eee"
:src="baseUrl + renderData.studentPromiseSign"
:preview-src-list="[baseUrl + renderData.studentPromiseSign]">
</el-image> -->
{{ item.approverName }}
</div>
</div>
<div style="margin-left: 10px;">日期： {{ item.approvalTime }}</div>
</div>
</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> 保留学籍时间和编号 </template> <template slot="label"> 申请编号 </template>
{{ renderData.reserveNo }} {{ renderData.applyNo }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
@@ -194,6 +217,10 @@ export default {
formData: { formData: {
type: Object, // 正确的对象类型声明 type: Object, // 正确的对象类型声明
default: () => ({}) // 函数返回空对象（避免所有实例共享同一个对象） default: () => ({}) // 函数返回空对象（避免所有实例共享同一个对象）
},
isShwo: {
type: Boolean,
default: true
} }
}, },
data() { data() {
@@ -228,9 +255,28 @@ export default {
renderData() { renderData() {
// 规则：有接口数据（detailData有内容）则用detailData，否则用props的formData // 规则：有接口数据（detailData有内容）则用detailData，否则用props的formData
// Object.keys(this.detailData).length > 0 表示detailData非空 // Object.keys(this.detailData).length > 0 表示detailData非空
return Object.keys(this.detailData).length > 0 let data = Object.keys(this.detailData).length > 0 ? this.detailData : this.formData
? this.detailData // 处理外宿审批意见列表，添加意见类型
: this.formData; if (data?.outsideAccommodationApprovals) {
// 定义外宿审批意见类型数组（与索引严格对应）
const opinionTypes = [
"辅导员意见",
"学工处意见",
"二级学院书记意见",
"学校领导意见"
];
// 遍历审批列表，为每条数据添加 opinionType 字段
data.outsideAccommodationApprovals.forEach((item, index) => {
// 前4条数据按索引匹配意见类型，超出部分设为默认值
if (index < opinionTypes.length) {
item.opinionType = opinionTypes[index];
} else {
// 超出4条时的兜底值
item.opinionType = "其他审批意见";
}
});
}
return data
} }
}, },
watch: { watch: {
@@ -281,7 +327,6 @@ export default {
<style scoped> <style scoped>
/* @import url(); 引入css类 */ /* @import url(); 引入css类 */
.application-form-container { .application-form-container {
width: 70%;
margin: auto; margin: auto;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;

666
src/views/flowable/task/todo/detail/index.vue
View File

@@ -13,7 +13,8 @@
<el-col :span="16" :offset="4"> <el-col :span="16" :offset="4">
<div class=""> <div class="">
<!-- 考勤表单 --> <!-- 考勤表单 -->
<el-descriptions v-if="leaveForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%"> <el-descriptions v-if="leaveForm" class="margin-top" title="" :column="2" size="medium" border
style="width: 100%">
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 学号 </template> <template slot="label"> 学号 </template>
{{ form.stuNo }} {{ form.stuNo }}
@@ -94,7 +95,8 @@
</el-descriptions> </el-descriptions>
<!-- 处分表单 --> <!-- 处分表单 -->
<el-descriptions v-if="disposalForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%"> <el-descriptions v-if="disposalForm" class="margin-top" title="" :column="2" size="medium" border
style="width: 100%">
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 学号 </template> <template slot="label"> 学号 </template>
{{ form.stuNo }} {{ form.stuNo }}
@@ -170,7 +172,8 @@
</el-descriptions> </el-descriptions>
<!-- 解除处分表单 --> <!-- 解除处分表单 -->
<el-descriptions v-if="relieveForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%"> <el-descriptions v-if="relieveForm" class="margin-top" title="" :column="2" size="medium" border
style="width: 100%">
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 学号 </template> <template slot="label"> 学号 </template>
{{ form.stuNo }} {{ form.stuNo }}
@@ -238,7 +241,8 @@
</el-descriptions> </el-descriptions>
<!-- 休学申请表单 --> <!-- 休学申请表单 -->
<el-descriptions v-if="quitSchoolForm" class="margin-top" title="" :column="3" size="medium" border style="width: 100%"> <el-descriptions v-if="quitSchoolForm" class="margin-top" title="" :column="3" size="medium" border
style="width: 100%">
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 学号 </template> <template slot="label"> 学号 </template>
{{ form.stuNo }} {{ form.stuNo }}
@@ -314,7 +318,8 @@
<el-descriptions-item span="3"> <el-descriptions-item span="3">
<template slot="label"> 签名 </template> <template slot="label"> 签名 </template>
<img v-if="form.applySignature" :src="baseUrl + form.applySignature" width="200px" height="200px" class="avatar"> <img v-if="form.applySignature" :src="baseUrl + form.applySignature" width="200px" height="200px"
class="avatar">
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="3"> <el-descriptions-item span="3">
@@ -335,7 +340,8 @@
<!-- 给予退学 --> <!-- 给予退学 -->
<!-- 入伍保留学籍表单 --> <!-- 入伍保留学籍表单 -->
<el-descriptions v-if="enlistmentReserveForm" title="" :column="4" size="medium" border style="width: 100%"> <el-descriptions v-if="enlistmentReserveForm" title="" :column="4" size="medium" border
style="width: 100%">
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 姓名 </template> <template slot="label"> 姓名 </template>
{{ form.studentName }} {{ form.studentName }}
@@ -386,7 +392,7 @@
<template slot="label"> 申请原因 </template> <template slot="label"> 申请原因 </template>
<div style="padding-top: 10px;"> <div style="padding-top: 10px;">
{{ form.applyReason }} {{ form.applyReason }}
</div> </div>
<div style="padding: 20px;"> <div style="padding: 20px;">
<div style="display: flex;justify-content: flex-end;align-items: center;"> <div style="display: flex;justify-content: flex-end;align-items: center;">
<div style="padding: 0 10px;">申请人： {{ form.studentName }}</div> <div style="padding: 0 10px;">申请人： {{ form.studentName }}</div>
@@ -395,7 +401,7 @@
</div> </div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4" v-for="item in form.enlistmentReserveApprovalList" > <el-descriptions-item span="4" v-for="item in form.enlistmentReserveApprovalList">
<template slot="label"> {{ item.opinionType }} </template> <template slot="label"> {{ item.opinionType }} </template>
<div style="padding-top: 10px;"> <div style="padding-top: 10px;">
{{ item.approvalOpinion || "暂无意见" }} {{ item.approvalOpinion || "暂无意见" }}
@@ -424,28 +430,23 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<!-- 外宿申请表单 -->
<div v-if="outsideAccommodationForm"><detailApply :formData="form" :isShwo="false"></detailApply></div>
<!-- 退伍复学表单 --> <!-- 退伍复学表单 -->
<el-descriptions v-if="basicForm" class="margin-top" title="退伍复学申请表" :column="4" size="medium" border
style="width: 100%; ">
<el-descriptions <el-descriptions-item>
v-if="basicForm"
class="margin-top"
title="退伍复学申请表"
:column="4"
size="medium"
border
style="width: 100%; "
>
<el-descriptions-item>
<template slot="label"> 姓名 </template> <template slot="label"> 姓名 </template>
{{ form.stName }} {{ form.stName }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 性别 </template> <template slot="label"> 性别 </template>
{{form.sex}} {{ form.sex }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 民族 </template> <template slot="label"> 民族 </template>
<!-- {{ form.nation }} --> <!-- {{ form.nation }} -->
<dict-tag :options="dict.type.rt_nation" :value="form.nations" /> <dict-tag :options="dict.type.rt_nation" :value="form.nations" />
@@ -464,182 +465,197 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 专业 </template> <template slot="label"> 专业 </template>
{{ form.majors }} {{ form.majors }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> 联系电话 </template> <template slot="label"> 联系电话 </template>
{{ form.datab }} {{ form.datab }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> 申请理由 </template> <template slot="label"> 申请理由 </template>
<div style="padding-top: 10px; line-height: 1.8;"> <div style="padding-top: 10px; line-height: 1.8;">
<p class="reason-text">本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }} 日退役，退役后申请复学。</p> <p class="reason-text">本人于 {{ form.rwTime | formatDate }} 应征入伍，于 {{ form.dataa | formatDate }}
<p class="reason-text" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否</p> 日退役，退役后申请复学。</p>
<p class="reason-text" v-else>是否申请转专业：（）是 （×）否</p> <p class="reason-text" v-if="form.conversion == 'Y'">是否申请转专业：（√）是 （）否</p>
<p class="reason-text" v-else>是否申请转专业：（）是 （×）否</p>
<p v-if="form.conversion === 'Y'" class="reason-text" style="color: red;">
原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ? form.maList[0].oldmajor : '' }}__
申请转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
</p>
<!-- 附件预览区域 --> <p v-if="form.conversion === 'Y'" class="reason-text" style="color: red;">
<div style="margin: 10px 0; display: flex; gap: 10px; flex-wrap: wrap;"> 原年级和专业:__{{ form.maList.length > 0 ? form.maList[0].oldgrade : '' }}__{{ form.maList.length > 0 ?
<image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof" :width="240" :height="160" /> form.maList[0].oldmajor : '' }}__
<image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard" :width="240" :height="160" /> 申请转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
<image-preview v-if="form.maList.length > 0 && form.maList[0].material" :src="form.maList[0].material" :width="240" :height="160" /> </p>
</div>
<!-- 申请人信息 --> <!-- 附件预览区域 -->
<div class="applicant-info right-align" style="padding: 20px 0 0 0;"> <div style="margin: 10px 0; display: flex; gap: 10px; flex-wrap: wrap;">
<span>申请人：</span> <image-preview v-if="form.maList.length > 0 && form.maList[0].proof" :src="form.maList[0].proof"
{{ form.stName }} :width="240" :height="160" />
<span class="date-label" style="margin-left: 10px;">日期：</span> <image-preview v-if="form.maList.length > 0 && form.maList[0].idcard" :src="form.maList[0].idcard"
{{ form.times | formatDate }} :width="240" :height="160" />
</div> <image-preview v-if="form.maList.length > 0 && form.maList[0].material"
:src="form.maList[0].material" :width="240" :height="160" />
</div> </div>
</el-descriptions-item>
<!-- 招生与就业处意见（仅转专业时显示） --> <!-- 申请人信息 -->
<el-descriptions-item span="4" v-if="form.conversion === 'Y'"> <div class="applicant-info right-align" style="padding: 20px 0 0 0;">
<template slot="label"> 招生与就业处意见 </template> <span>申请人：</span>
<div style="padding-top: 10px; line-height: 1.8;"> {{ form.stName }}
<p class="reason-text" style="color: red;"> <span class="date-label" style="margin-left: 10px;">日期：</span>
符合转专业条件，拟同意转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__ {{ form.times | formatDate }}
</p>
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
<span>审批结果：</span>
<el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled style="width: 100px; margin: 0 5px;">
<el-option label="重新审核" value="0"></el-option>
<el-option label="通过" value="1"></el-option>
<el-option label="退回" value="2"></el-option>
<el-option label="驳回" value="3"></el-option>
</el-select>
<span class="date-label">签名：</span>
{{ form.zsIdea || '无' }}
<span class="date-label" style="margin-left: 10px;">日期：</span>
{{ form.zsTime | formatDate }}
</div>
</div> </div>
</el-descriptions-item> </div>
</el-descriptions-item>
<!-- 辅导员意见 --> <!-- 招生与就业处意见（仅转专业时显示） -->
<el-descriptions-item span="4"> <el-descriptions-item span="4" v-if="form.conversion === 'Y'">
<template slot="label"> 辅导员意见 </template> <template slot="label"> 招生与就业处意见 </template>
<div style="padding-top: 10px; line-height: 1.8;"> <div style="padding-top: 10px; line-height: 1.8;">
{{ form.fdIdea || '暂无意见' }} <p class="reason-text" style="color: red;">
<div class="signature-area right-align" style="padding: 10px 0 0 0;"> 符合转专业条件，拟同意转入年级和专业：__{{ saveGradeName }}__{{ saveClassName }}__
<span>审批结果：</span> </p>
<el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;"> <div class="signature-area right-align" style="padding: 10px 0 0 0;">
<el-option label="重新审核" value="0"></el-option> <span>审批结果：</span>
<el-option label="通过" value="1"></el-option> <el-select v-model="form.zsStatus" placeholder="" class="short-select" disabled
<el-option label="退回" value="2"></el-option> style="width: 100px; margin: 0 5px;">
<el-option label="驳回" value="3"></el-option> <el-option label="重新审核" value="0"></el-option>
</el-select> <el-option label="通过" value="1"></el-option>
<span class="date-label">签名：</span> <el-option label="退回" value="2"></el-option>
{{ form.fdQm || '无' }} <el-option label="驳回" value="3"></el-option>
<span class="date-label" style="margin-left: 10px;">日期：</span> </el-select>
{{ form.fdTime | formatDate }} <span class="date-label">签名：</span>
</div> {{ form.zsIdea || '无' }}
<span class="date-label" style="margin-left: 10px;">日期：</span>
{{ form.zsTime | formatDate }}
</div> </div>
</el-descriptions-item> </div>
</el-descriptions-item>
<!-- 学务意见 --> <!-- 辅导员意见 -->
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> 学务意见 </template> <template slot="label"> 辅导员意见 </template>
<div style="padding-top: 10px; line-height: 1.8;"> <div style="padding-top: 10px; line-height: 1.8;">
{{ form.xwIdea || '暂无意见' }} {{ form.fdIdea || '暂无意见' }}
<div class="signature-area right-align" style="padding: 10px 0 0 0;"> <div class="signature-area right-align" style="padding: 10px 0 0 0;">
<span>审批结果：</span> <span>审批结果：</span>
<el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;"> <el-select v-model="form.fdStatus" placeholder="待审核" class="short-select" disabled
<el-option label="重新审核" value="0"></el-option> style="width: 100px; margin: 0 5px;">
<el-option label="通过" value="1"></el-option> <el-option label="重新审核" value="0"></el-option>
<el-option label="退回" value="2"></el-option> <el-option label="通过" value="1"></el-option>
<el-option label="驳回" value="3"></el-option> <el-option label="退回" value="2"></el-option>
</el-select> <el-option label="驳回" value="3"></el-option>
<span class="date-label">签名：</span> </el-select>
{{ form.xwQm || '无' }} <span class="date-label">签名：</span>
<span class="date-label" style="margin-left: 10px;">日期：</span> {{ form.fdQm || '无' }}
{{ form.xwTime | formatDate }} <span class="date-label" style="margin-left: 10px;">日期：</span>
</div> {{ form.fdTime | formatDate }}
</div> </div>
</el-descriptions-item> </div>
</el-descriptions-item>
<!-- 二级学院意见 --> <!-- 学务意见 -->
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> 二级学院意见 </template> <template slot="label"> 学务意见 </template>
<div style="padding-top: 10px; line-height: 1.8;"> <div style="padding-top: 10px; line-height: 1.8;">
{{ form.twoIdea || '暂无意见' }} {{ form.xwIdea || '暂无意见' }}
<div class="signature-area right-align" style="padding: 10px 0 0 0;"> <div class="signature-area right-align" style="padding: 10px 0 0 0;">
<span>审批结果：</span> <span>审批结果：</span>
<el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;"> <el-select v-model="form.xwStatus" placeholder="待审核" class="short-select" disabled
<el-option label="重新审核" value="0"></el-option> style="width: 100px; margin: 0 5px;">
<el-option label="通过" value="1"></el-option> <el-option label="重新审核" value="0"></el-option>
<el-option label="退回" value="2"></el-option> <el-option label="通过" value="1"></el-option>
<el-option label="驳回" value="3"></el-option> <el-option label="退回" value="2"></el-option>
</el-select> <el-option label="驳回" value="3"></el-option>
<span class="date-label">签名：</span> </el-select>
{{ form.erQm || '无' }} <span class="date-label">签名：</span>
<span class="date-label" style="margin-left: 10px;">日期：</span> {{ form.xwQm || '无' }}
{{ form.twoTime | formatDate }} <span class="date-label" style="margin-left: 10px;">日期：</span>
</div> {{ form.xwTime | formatDate }}
</div> </div>
</el-descriptions-item> </div>
</el-descriptions-item>
<!-- 学籍管理科意见 --> <!-- 二级学院意见 -->
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> 学籍管理科意见 </template> <template slot="label"> 二级学院意见 </template>
<div style="padding-top: 10px; line-height: 1.8;"> <div style="padding-top: 10px; line-height: 1.8;">
{{ form.xjIdea || '暂无意见' }} {{ form.twoIdea || '暂无意见' }}
<div class="signature-area right-align" style="padding: 10px 0 0 0;"> <div class="signature-area right-align" style="padding: 10px 0 0 0;">
<span>审批结果：</span> <span>审批结果：</span>
<el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;"> <el-select v-model="form.twoStatus" placeholder="待审核" class="short-select" disabled
<el-option label="重新审核" value="0"></el-option> style="width: 100px; margin: 0 5px;">
<el-option label="通过" value="1"></el-option> <el-option label="重新审核" value="0"></el-option>
<el-option label="退回" value="2"></el-option> <el-option label="通过" value="1"></el-option>
<el-option label="驳回" value="3"></el-option> <el-option label="退回" value="2"></el-option>
</el-select> <el-option label="驳回" value="3"></el-option>
<span class="date-label">签名：</span> </el-select>
{{ form.xjQm || '无' }} <span class="date-label">签名：</span>
<span class="date-label" style="margin-left: 10px;">日期：</span> {{ form.erQm || '无' }}
{{ form.xjTime | formatDate }} <span class="date-label" style="margin-left: 10px;">日期：</span>
</div> {{ form.twoTime | formatDate }}
</div> </div>
</el-descriptions-item> </div>
</el-descriptions-item>
<!-- 教务处主管领导意见 --> <!-- 学籍管理科意见 -->
<el-descriptions-item span="4"> <el-descriptions-item span="4">
<template slot="label"> 教务处主管领导意见 </template> <template slot="label"> 学籍管理科意见 </template>
<div style="padding-top: 10px; line-height: 1.8;"> <div style="padding-top: 10px; line-height: 1.8;">
{{ form.jwIdea || '暂无意见' }} {{ form.xjIdea || '暂无意见' }}
<div class="signature-area right-align" style="padding: 10px 0 0 0;"> <div class="signature-area right-align" style="padding: 10px 0 0 0;">
<span>审批结果：</span> <span>审批结果：</span>
<el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled style="width: 100px; margin: 0 5px;"> <el-select v-model="form.xjglStatus" placeholder="待审核" class="short-select" disabled
<el-option label="重新审核" value="0"></el-option> style="width: 100px; margin: 0 5px;">
<el-option label="通过" value="1"></el-option> <el-option label="重新审核" value="0"></el-option>
<el-option label="退回" value="2"></el-option> <el-option label="通过" value="1"></el-option>
<el-option label="驳回" value="3"></el-option> <el-option label="退回" value="2"></el-option>
</el-select> <el-option label="驳回" value="3"></el-option>
<span class="date-label">签名：</span> </el-select>
{{ form.jwQm || '无' }} <span class="date-label">签名：</span>
<span class="date-label" style="margin-left: 10px;">日期：</span> {{ form.xjQm || '无' }}
{{ form.jwTime | formatDate }} <span class="date-label" style="margin-left: 10px;">日期：</span>
</div> {{ form.xjTime | formatDate }}
</div> </div>
</el-descriptions-item> </div>
</el-descriptions-item>
<!-- 教务处主管领导意见 -->
<el-descriptions-item span="4">
<template slot="label"> 教务处主管领导意见 </template>
<div style="padding-top: 10px; line-height: 1.8;">
{{ form.jwIdea || '暂无意见' }}
<div class="signature-area right-align" style="padding: 10px 0 0 0;">
<span>审批结果：</span>
<el-select v-model="form.jwStatus" placeholder="待审核" class="short-select" disabled
style="width: 100px; margin: 0 5px;">
<el-option label="重新审核" value="0"></el-option>
<el-option label="通过" value="1"></el-option>
<el-option label="退回" value="2"></el-option>
<el-option label="驳回" value="3"></el-option>
</el-select>
<span class="date-label">签名：</span>
{{ form.jwQm || '无' }}
<span class="date-label" style="margin-left: 10px;">日期：</span>
{{ form.jwTime | formatDate }}
</div>
</div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
<div style="margin-left: 15%; margin-bottom: 20px; font-size: 14px; margin-top: 20px"> <div style="margin-left: 15%; margin-bottom: 20px; font-size: 14px; margin-top: 20px">
<el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini" @click="handleComplete">同意 </el-button> <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
@click="handleComplete">同意
</el-button>
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>--> <!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>-->
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>--> <!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->
<!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>--> <!-- <el-button icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>-->
<el-button v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button> <el-button v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini"
@click="handleReturn">退回</el-button>
<!-- <el-button icon="el-icon-circle-close" type="danger" v-if="rejectBtn" size="mini" @click="handleReject">驳回</el-button> --> <!-- <el-button icon="el-icon-circle-close" type="danger" v-if="rejectBtn" size="mini" @click="handleReject">驳回</el-button> -->
<el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button> <el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini"
@click="handleReject">驳回</el-button>
</div> </div>
</el-col> </el-col>
</el-tab-pane> </el-tab-pane>
@@ -649,7 +665,8 @@
<el-col :span="16" :offset="4" v-loading="loading" style="min-height: 500px;"> <el-col :span="16" :offset="4" v-loading="loading" style="min-height: 500px;">
<div class="block"> <div class="block">
<el-timeline> <el-timeline>
<el-timeline-item v-for="(item, index) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)" :color="setColor(item.finishTime)"> <el-timeline-item v-for="(item, index) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
:color="setColor(item.finishTime)">
<p style="font-weight: 700">{{ item.taskName }}</p> <p style="font-weight: 700">{{ item.taskName }}</p>
<el-card :body-style="{ padding: '10px' }"> <el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border> <el-descriptions class="margin-top" :column="1" size="small" border>
@@ -691,7 +708,8 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!--审批任务--> <!--审批任务-->
<el-dialog :title="completeTitle" class="certificate-service" :visible.sync="completeOpen" width="60%" append-to-body> <el-dialog :title="completeTitle" class="certificate-service" :visible.sync="completeOpen" width="60%"
append-to-body>
<!-- 处分决定书 --> <!-- 处分决定书 -->
<el-card v-if="showLetterService"> <el-card v-if="showLetterService">
<div class="flex justify-center items-center min-h-screen"> <div class="flex justify-center items-center min-h-screen">
@@ -700,7 +718,9 @@
<p class="mb-4 text-zinc-600 dark:text-zinc-300">{{ form.stuName }}同学:</p> <p class="mb-4 text-zinc-600 dark:text-zinc-300">{{ form.stuName }}同学:</p>
<p class="mb-4 text-zinc-600 dark:text-zinc-300 desc">{{ form.letterService }}</p> <p class="mb-4 text-zinc-600 dark:text-zinc-300 desc">{{ form.letterService }}</p>
<div class="stamp"> <div class="stamp">
<img src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg" alt="Stamp"> <img
src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg"
alt="Stamp">
<!-- <img src="https://placehold.co/100x100" alt="Stamp" /> --> <!-- <img src="https://placehold.co/100x100" alt="Stamp" /> -->
<div> <div>
<div>学生工作处</div> <div>学生工作处</div>
@@ -718,10 +738,14 @@
<div id="quitSchool" class="certificate"> <div id="quitSchool" class="certificate">
<h1>休学证明</h1> <h1>休学证明</h1>
<h4>桂水电院 {{ form.quitYear }} 休字第 {{ form.quitNumber }}号</h4> <h4>桂水电院 {{ form.quitYear }} 休字第 {{ form.quitNumber }}号</h4>
<p>{{ form.stuName }},{{ form.gender }},{{ form.mz }},{{ form.birthday }}出生,{{ form.jg }}人,{{ form.className }}学生,学号:{{ form.stuNo }}.该生于个人原因-{{ form.reasonApplying }},申请休学.经学校研究,同意休学,时间从{{ form.quitStartTime }}至{{ form.quitEndTime }}.</p> <p>{{ form.stuName }},{{ form.gender }},{{ form.mz }},{{ form.birthday }}出生,{{ form.jg }}人,{{ form.className
}}学生,学号:{{ form.stuNo }}.该生于个人原因-{{ form.reasonApplying }},申请休学.经学校研究,同意休学,时间从{{ form.quitStartTime }}至{{
form.quitEndTime }}.</p>
<p>抄送:教务处、财务处、{{ form.departmentName }}</p> <p>抄送:教务处、财务处、{{ form.departmentName }}</p>
<div class="stamp"> <div class="stamp">
<img src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg" alt="Stamp"> <img
src="https://gss0.baidu.com/7Po3dSag_xI4khGko9WTAnF6hhy/zhidao/wh%3D450%2C600/sign=debd0a4bb2fd5266a77e34109e28bb1d/8d5494eef01f3a297283d36e9d25bc315d607cc2.jpg"
alt="Stamp">
<div> <div>
<span>学生工作处</span> <span>学生工作处</span>
<span>{{ form.quitStartTime }}</span> <span>{{ form.quitStartTime }}</span>
@@ -747,8 +771,10 @@
<!-- <el-form-item label="违纪时间" prop="violationDate" v-if="dispositionServiceShow" :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]"> <!-- <el-form-item label="违纪时间" prop="violationDate" v-if="dispositionServiceShow" :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]">
<el-date-picker clearable v-model="taskForm.violationDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择违纪日期"> </el-date-picker> <el-date-picker clearable v-model="taskForm.violationDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择违纪日期"> </el-date-picker>
</el-form-item> --> </el-form-item> -->
<el-form-item v-if="dispositionServiceShow" label="处分时间" prop="disciplinaryDate" :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]"> <el-form-item v-if="dispositionServiceShow" label="处分时间" prop="disciplinaryDate"
<el-date-picker v-model="taskForm.disciplinaryDate" clearable type="date" value-format="yyyy-MM-dd" placeholder="请选择违纪日期" /> :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]">
<el-date-picker v-model="taskForm.disciplinaryDate" clearable type="date" value-format="yyyy-MM-dd"
placeholder="请选择违纪日期" />
</el-form-item> </el-form-item>
<!-- 解除表单 --> <!-- 解除表单 -->
@@ -760,7 +786,8 @@
</el-form-item> </el-form-item>
<!-- 处分/解除处分 --> <!-- 处分/解除处分 -->
<el-form-item v-if="dispositionServiceShow || relieveServiceShow" label="处分材料" prop="dispositionServiceContent"> <el-form-item v-if="dispositionServiceShow || relieveServiceShow" label="处分材料"
prop="dispositionServiceContent">
<file-upload v-model="taskForm.dispositionServiceContent" :disabled="true" /> <file-upload v-model="taskForm.dispositionServiceContent" :disabled="true" />
</el-form-item> </el-form-item>
@@ -788,19 +815,22 @@
<el-form-item v-if="quitSchoolGLKSHShow" label="休学类别" prop="quitCategory"> <el-form-item v-if="quitSchoolGLKSHShow" label="休学类别" prop="quitCategory">
<el-select v-model="taskForm.quitCategory" placeholder="请选择休学类别"> <el-select v-model="taskForm.quitCategory" placeholder="请选择休学类别">
<el-option v-for="dict in dict.type.rt_transaction_type" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.rt_transaction_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="quitSchoolGLKSHShow" label="休学类型" prop="quitType"> <el-form-item v-if="quitSchoolGLKSHShow" label="休学类型" prop="quitType">
<el-select v-model="taskForm.quitType" placeholder="请选择休学类型"> <el-select v-model="taskForm.quitType" placeholder="请选择休学类型">
<el-option v-for="dict in dict.type.rt_quit_types" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.rt_quit_types" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="quitSchoolGLKSHShow" label="休学年份" prop="quitYear"> <el-form-item v-if="quitSchoolGLKSHShow" label="休学年份" prop="quitYear">
<el-select v-model="taskForm.quitYear" clearable placeholder="请退学年份"> <el-select v-model="taskForm.quitYear" clearable placeholder="请退学年份">
<el-option v-for="dict in dict.type.sys_teacher_kpi_filling_year" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.sys_teacher_kpi_filling_year" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -809,7 +839,8 @@
</el-form-item> </el-form-item>
<!-- 入伍保留学籍申请表单 --> <!-- 入伍保留学籍申请表单 -->
<el-form-item v-if="enlistmentReserveForm || outsideAccommodationForm || basicForm" label="审批意见" prop="approvalOpinion"> <el-form-item v-if="enlistmentReserveForm || outsideAccommodationForm || basicForm" label="审批意见"
prop="approvalOpinion">
<el-input type="textarea" :rows="3" v-model="taskForm.variables.approvalOpinion" placeholder="请输入审批意见" /> <el-input type="textarea" :rows="3" v-model="taskForm.variables.approvalOpinion" placeholder="请输入审批意见" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -823,7 +854,8 @@
<el-form ref="taskForm" :model="taskForm" label-width="80px"> <el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="退回节点" prop="targetKey"> <el-form-item label="退回节点" prop="targetKey">
<el-radio-group v-model="taskForm.targetKey"> <el-radio-group v-model="taskForm.targetKey">
<el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }} </el-radio-button> <el-radio-button v-for="item in returnTaskList" :key="item.id" :label="item.id">{{ item.name }}
</el-radio-button>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]"> <el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
@@ -855,7 +887,7 @@
import { flowXmlAndNode, getProcessVariables } from '@/api/flowable/definition' import { flowXmlAndNode, getProcessVariables } from '@/api/flowable/definition'
import { flowRecord } from '@/api/flowable/finished' import { flowRecord } from '@/api/flowable/finished'
import { complete, delegate, flowTaskForm, getNextFlowNode, rejectTask, returnList, returnTask } from '@/api/flowable/todo' import { complete, delegate, flowTaskForm, getNextFlowNode, rejectTask, returnList, returnTask } from '@/api/flowable/todo'
import { getDisciplinaryApplicationByProcInsId, getStuInfo, updateDisciplinaryApplication} from '@/api/routine/disciplinaryApplication' import { getDisciplinaryApplicationByProcInsId, getStuInfo, updateDisciplinaryApplication } from '@/api/routine/disciplinaryApplication'
import { getLeaveApplicationByProcInsId, getStuInfoByStuId } from '@/api/routine/leaveApplication' import { getLeaveApplicationByProcInsId, getStuInfoByStuId } from '@/api/routine/leaveApplication'
import { getStuDisciplinaryRelieveByProcInsId, updateRelieve } from '@/api/routine/relieve' import { getStuDisciplinaryRelieveByProcInsId, updateRelieve } from '@/api/routine/relieve'
import { getRtStuQuitSchoolByProcInsId, updateRtStuQuitSchool } from '@/api/routine/rtStuQuitSchool' import { getRtStuQuitSchoolByProcInsId, updateRtStuQuitSchool } from '@/api/routine/rtStuQuitSchool'
@@ -872,7 +904,8 @@ import { insertOrUpdateByStuAndApprover } from "@/api/routine/enlistmentReserve/
import { getUserProfile } from '@/api/system/user' // 获取当前登录用户 import { getUserProfile } from '@/api/system/user' // 获取当前登录用户
import { updateStudent } from '@/api/stuCQS/basedata/student' import { updateStudent } from '@/api/stuCQS/basedata/student'
import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply"; import { getOutsideAccommodationApplyByProcessInstanceId } from "@/api/dormitory/outsideAccommodation/outsideAccommodationApply";
import { listBasic, getBasic, delBasic, addBasic, updateBasic, getStname,getProcessId } from "@/api/routine/basic"; import { listBasic, getBasic, delBasic, addBasic, updateBasic, getStname, getProcessId } from "@/api/routine/basic";
import detailApply from "@/views/dormitory/outsideAccommodation/outsideAccommodationApply/components/detailApply" // 外宿申请表详细
export default { export default {
name: 'Record', name: 'Record',
@@ -883,6 +916,7 @@ export default {
FlowUser, FlowUser,
FlowRole, FlowRole,
pdf, pdf,
detailApply
}, },
props: {}, props: {},
data() { data() {
@@ -1053,7 +1087,7 @@ export default {
} else if (this.category == 'outsideAccommodation') { } else if (this.category == 'outsideAccommodation') {
this.outsideAccommodationForm = true this.outsideAccommodationForm = true
this.getOutsideAccommodation(this.taskForm.procInsId) this.getOutsideAccommodation(this.taskForm.procInsId)
}else if (this.category == '退伍复学') { } else if (this.category == '退伍复学') {
this.basicForm = true this.basicForm = true
this.getBasicApplication(this.startUser) this.getBasicApplication(this.startUser)
} }
@@ -1132,8 +1166,6 @@ export default {
}); });
} }
}) })
}, },
// 请求 外宿申请表单数据 // 请求 外宿申请表单数据
getOutsideAccommodation(procInsId) { getOutsideAccommodation(procInsId) {
@@ -1144,12 +1176,12 @@ export default {
// 退伍复学申请表单数据 // 退伍复学申请表单数据
getBasicApplication(startUser) { getBasicApplication(startUser) {
let newName = this.startUser.replace(/-/g, ""); let newName = this.startUser.replace(/-/g, "");
getStname(newName).then((res) => { getStname(newName).then((res) => {
// console.log("后端返回原始数据：",res.data); // console.log("后端返回原始数据：",res.data);
this.form = res.data this.form = res.data
}); });
}, },
getStuInfo(stuNo) { getStuInfo(stuNo) {
getStuInfo(stuNo).then((res) => { getStuInfo(stuNo).then((res) => {
@@ -1302,7 +1334,7 @@ export default {
this.form.dispositionService = this.taskForm.dispositionServiceContent this.form.dispositionService = this.taskForm.dispositionServiceContent
this.form.penaltyNumber = this.taskForm.penaltyNumber this.form.penaltyNumber = this.taskForm.penaltyNumber
this.form.violationDate = this.taskForm.violationDate this.form.violationDate = this.taskForm.violationDate
this.form.disciplinaryDate=this.taskForm.disciplinaryDate this.form.disciplinaryDate = this.taskForm.disciplinaryDate
this.editDisciplinaryApplication() this.editDisciplinaryApplication()
} else if ((this.taskName == '学务干事审批归档' || this.taskName == '学生教育管理科审批归档') && this.category == 'relieve') { } else if ((this.taskName == '学务干事审批归档' || this.taskName == '学生教育管理科审批归档') && this.category == 'relieve') {
this.form.relieveService = this.taskForm.dispositionServiceContent this.form.relieveService = this.taskForm.dispositionServiceContent
@@ -1326,7 +1358,7 @@ export default {
this.updateRtStuQuitSchool() this.updateRtStuQuitSchool()
} else if (this.category == 'enlistmentReserve') { // 是应征入伍保留学籍申请，才执行 } else if (this.category == 'enlistmentReserve') { // 是应征入伍保留学籍申请，才执行
if (this.taskName == '教务处主管领导审批') { // (最后一个领导审核完成之后，修改学生学籍状态, status：07是入伍保留学籍) if (this.taskName == '教务处主管领导审批') { // (最后一个领导审核完成之后，修改学生学籍状态, status：07是入伍保留学籍)
updateStudent({stuId: this.form.studentId, status: '07'}).then(response => {}) updateStudent({ stuId: this.form.studentId, status: '07' }).then(response => { })
} }
this.$modal.msgSuccess(response.msg) this.$modal.msgSuccess(response.msg)
} else if (this.category == "退伍复学") { } else if (this.category == "退伍复学") {
@@ -1468,8 +1500,8 @@ export default {
editDisciplinaryApplication() { editDisciplinaryApplication() {
this.form.penaltyStatus = '0' this.form.penaltyStatus = '0'
this.form.letterService = this.taskForm.letterServiceContent this.form.letterService = this.taskForm.letterServiceContent
this.form.violationDate=this.taskForm.violationDate this.form.violationDate = this.taskForm.violationDate
this.form.disciplinaryDate=this.taskForm.disciplinaryDate this.form.disciplinaryDate = this.taskForm.disciplinaryDate
updateDisciplinaryApplication(this.form).then((response) => { updateDisciplinaryApplication(this.form).then((response) => {
this.$modal.msgSuccess(response.msg) this.$modal.msgSuccess(response.msg)
}) })
@@ -1489,7 +1521,7 @@ export default {
this.taskForm.delegateTaskShow = true this.taskForm.delegateTaskShow = true
this.taskForm.defaultTaskShow = false this.taskForm.defaultTaskShow = false
}, },
handleAssign() {}, handleAssign() { },
/** 返回页面 */ /** 返回页面 */
goBack() { goBack() {
// 关闭当前标签页并返回上个页面 // 关闭当前标签页并返回上个页面
@@ -1617,7 +1649,7 @@ export default {
}) })
} }
this.$modal.msgSuccess(res.msg) this.$modal.msgSuccess(res.msg)
this.$modal.closeLoading() this.$modal.closeLoading()
@@ -1638,7 +1670,7 @@ export default {
if (this.category == 'enlistmentReserve') { if (this.category == 'enlistmentReserve') {
// 取原审批列表的副本（避免直接修改原表单数据导致重复push） // 取原审批列表的副本（避免直接修改原表单数据导致重复push）
const approvalList = [...this.form.enlistmentReserveApprovalList] const approvalList = [...this.form.enlistmentReserveApprovalList]
// 判断approvalList中是否已存在"学生申请"项，仅不存在时才push // 判断approvalList中是否已存在"学生申请"项，仅不存在时才push
const hasStudentApply = approvalList.some(record => record.nodeName === "学生申请") const hasStudentApply = approvalList.some(record => record.nodeName === "学生申请")
if (!hasStudentApply) { if (!hasStudentApply) {
@@ -1651,7 +1683,7 @@ export default {
}) })
} }
else if (this.category == "退伍复学") { else if (this.category == "退伍复学") {
// updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {}) // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
var stNameData = '' var stNameData = ''
let newName = this.startUser.replace(/-/g, ""); let newName = this.startUser.replace(/-/g, "");
@@ -1758,7 +1790,7 @@ export default {
}) })
}, },
/** 提交退回任务 */ /** 提交退回任务 */
taskReturn() { taskReturn() {
this.$refs['taskForm'].validate((valid) => { this.$refs['taskForm'].validate((valid) => {
if (valid) { if (valid) {
this.$modal.loading('正在努力加载中,请稍等...') this.$modal.loading('正在努力加载中,请稍等...')
@@ -1769,107 +1801,107 @@ export default {
this.taskReturnApproval("退回") this.taskReturnApproval("退回")
} }
else if (this.category == "退伍复学") { else if (this.category == "退伍复学") {
// updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {}) // updateBasic({stuId:this.form.stuId,fdStatus:"1",fdIdea:this.taskForm.comment}).then(response => {})
var stNameData = '' var stNameData = ''
let newName = this.startUser.replace(/-/g, ""); let newName = this.startUser.replace(/-/g, "");
// 异步请求的回调内处理后续逻辑 // 异步请求的回调内处理后续逻辑
getStname(newName).then(response => { getStname(newName).then(response => {
stNameData = response.data; stNameData = response.data;
console.log(stNameData) console.log(stNameData)
console.log("stNameData.id:", stNameData.id); console.log("stNameData.id:", stNameData.id);
// 招生与就业处 // 招生与就业处
if (this.taskName == "招生与就业处") { if (this.taskName == "招生与就业处") {
const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName); const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : ""; const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
updateBasic({ updateBasic({
id: stNameData.id, id: stNameData.id,
zsStatus: "2", zsStatus: "2",
// zsIdea: this.taskForm.comment, // zsIdea: this.taskForm.comment,
zsTime: new Date(), zsTime: new Date(),
// zsIdea：字段缺失改为zsIdea字段 // zsIdea：字段缺失改为zsIdea字段
zsIdea: assigneeName zsIdea: assigneeName
}).then(response => { }).then(response => {
// this.$modal.msgSuccess(response.msg) // this.$modal.msgSuccess(response.msg)
}) })
} }
// 辅导员审核信息 // 辅导员审核信息
else if (this.taskName == "辅导员审核") { else if (this.taskName == "辅导员审核") {
const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName); const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : ""; const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
// 辅导员审核信息 // 辅导员审核信息
updateBasic({ updateBasic({
id: stNameData.id, id: stNameData.id,
fdStatus: "2", fdStatus: "2",
fdIdea: this.taskForm.comment, fdIdea: this.taskForm.comment,
fdTime: new Date(), fdTime: new Date(),
fdQm: assigneeName fdQm: assigneeName
}).then(response => { }).then(response => {
// this.$modal.msgSuccess(response.msg) // this.$modal.msgSuccess(response.msg)
}) })
} }
// 学务审核 // 学务审核
else if (this.taskName == "学务审核") { else if (this.taskName == "学务审核") {
const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName); const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : ""; const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
updateBasic({ updateBasic({
id: stNameData.id, id: stNameData.id,
xwStatus: "2", xwStatus: "2",
xwIdea: this.taskForm.comment, xwIdea: this.taskForm.comment,
xwTime: new Date(), xwTime: new Date(),
xwQm: assigneeName xwQm: assigneeName
}).then(response => { }).then(response => {
// this.$modal.msgSuccess(response.msg) // this.$modal.msgSuccess(response.msg)
}) })
} }
// 二级学院审核 // 二级学院审核
else if (this.taskName == "二级学院审核") { else if (this.taskName == "二级学院审核") {
const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName); const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : ""; const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
updateBasic({ updateBasic({
id: stNameData.id, id: stNameData.id,
twoStatus: "2", twoStatus: "2",
twoIdea: this.taskForm.comment, twoIdea: this.taskForm.comment,
twoTime: new Date(), twoTime: new Date(),
erQm: assigneeName erQm: assigneeName
}).then(response => { }).then(response => {
// this.$modal.msgSuccess(response.msg) // this.$modal.msgSuccess(response.msg)
}) })
} }
// 学籍管理 // 学籍管理
else if (this.taskName == "学籍管理") { else if (this.taskName == "学籍管理") {
const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName); const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : ""; const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
updateBasic({ updateBasic({
id: stNameData.id, id: stNameData.id,
xjglStatus: "2", xjglStatus: "2",
xjIdea: this.taskForm.comment, xjIdea: this.taskForm.comment,
xjTime: new Date(), xjTime: new Date(),
xjQm: assigneeName xjQm: assigneeName
}).then(response => { }).then(response => {
// this.$modal.msgSuccess(response.msg) // this.$modal.msgSuccess(response.msg)
}) })
} }
// 教务处主管 // 教务处主管
else if (this.taskName == "教务处主管") { else if (this.taskName == "教务处主管") {
const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName); const currentFlowItem = this.flowRecordList.find(item => item.taskName === this.taskName);
const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : ""; const assigneeName = currentFlowItem ? currentFlowItem.assigneeName : "";
updateBasic({ updateBasic({
id: stNameData.id, id: stNameData.id,
jwStatus: "2", jwStatus: "2",
jwIdea: this.taskForm.comment, jwIdea: this.taskForm.comment,
jwTime: new Date(), jwTime: new Date(),
jwQm: assigneeName jwQm: assigneeName
}).then(response => { }).then(response => {
// this.$modal.msgSuccess(response.msg) // this.$modal.msgSuccess(response.msg)
})
}
}) })
} }
})
}
this.$modal.msgSuccess(res.msg) this.$modal.msgSuccess(res.msg)
this.$modal.closeLoading() this.$modal.closeLoading()
@@ -1877,7 +1909,7 @@ export default {
}) })
} }
}) })
}, },
/** 取消回退任务按钮 */ /** 取消回退任务按钮 */
cancelTask() { cancelTask() {
@@ -1936,24 +1968,24 @@ export default {
}, },
// 初始化入伍保留学籍申请审核意见参数 // 初始化入伍保留学籍申请审核意见参数
initApproval() { initApproval() {
// 初始化或完善 variables 对象，确保 approvalOpinion（入伍保留学籍申请审核意见） 存在 // 初始化或完善 variables 对象，确保 approvalOpinion（入伍保留学籍申请审核意见） 存在
if (this.taskForm.variables == null) { if (this.taskForm.variables == null) {
// 情况1：variables 为 null → 初始化完整结构（包含原有 variables 嵌套和 approvalOpinion） // 情况1：variables 为 null → 初始化完整结构（包含原有 variables 嵌套和 approvalOpinion）
this.taskForm.variables = { this.taskForm.variables = {
variables: {}, // 保留原有的嵌套 variables 结构（后端可能依赖） variables: {}, // 保留原有的嵌套 variables 结构（后端可能依赖）
approvalOpinion: '', // 初始化审批意见为空白 approvalOpinion: '', // 初始化审批意见为空白
approvalResult: '', // 审批状态 approvalResult: '', // 审批状态
targetNodeName: '' // 审批节点 targetNodeName: '' // 审批节点
}
} else {
// 情况2：variables 已存在 → 保留原有字段，补充 approvalOpinion（无则添加，有则保留原值）
this.taskForm.variables = {
...this.taskForm.variables, // 展开原有所有字段（如 variables、其他自定义字段）
approvalOpinion: this.taskForm.variables.approvalOpinion || '', // 兜底：若原有未定义则设为空白
approvalResult: this.taskForm.variables.approvalResult || '',
targetNodeName: this.taskForm.variables.targetNodeName || ''
}
} }
} else {
// 情况2：variables 已存在 → 保留原有字段，补充 approvalOpinion（无则添加，有则保留原值）
this.taskForm.variables = {
...this.taskForm.variables, // 展开原有所有字段（如 variables、其他自定义字段）
approvalOpinion: this.taskForm.variables.approvalOpinion || '', // 兜底：若原有未定义则设为空白
approvalResult: this.taskForm.variables.approvalResult || '',
targetNodeName: this.taskForm.variables.targetNodeName || ''
}
}
}, },
// 退回或驳回的时候生成入伍保留学籍申请审核 // 退回或驳回的时候生成入伍保留学籍申请审核
taskReturnApproval(text) { taskReturnApproval(text) {
@@ -2023,7 +2055,7 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
} }
.el-tag + .el-tag { .el-tag+.el-tag {
margin-left: 10px; margin-left: 10px;
} }
@@ -2061,7 +2093,8 @@ export default {
.stamp { .stamp {
text-align: right; text-align: right;
& > div {
&>div {
margin-top: -70px; margin-top: -70px;
margin-right: 25px; margin-right: 25px;
} }
@@ -2072,6 +2105,7 @@ export default {
} }
} }
} }
.certificate { .certificate {
padding: 0 50px; padding: 0 50px;
@@ -2103,7 +2137,7 @@ export default {
letter-spacing: 3px; letter-spacing: 3px;
align-items: flex-end; align-items: flex-end;
& > div { &>div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-right: 28px; margin-right: 28px;