代码格式修改

This commit is contained in:
2025-10-18 17:13:04 +08:00
parent b9224ed8bb
commit 81017eb280
837 changed files with 102784 additions and 98409 deletions

View File

@@ -7,13 +7,13 @@
<el-tag>任务节点:{{ taskName }}</el-tag>
<el-button style="float: right" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
<!--表单信息-->
<el-tab-pane label="表单信息" name="1">
<el-col :span="16" :offset="4">
<div class="">
<!-- 退学 -->
<el-descriptions class="margin-top" title="" :column="3" size="medium" border style="width: 100%" v-if="disqualificationForm">
<el-descriptions v-if="disqualificationForm" class="margin-top" title="" :column="3" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -64,7 +64,7 @@
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label"> 附件上传 </template>
<Affix v-model="form.attachmentUpload" :disabled="true"></Affix>
<Affix v-model="form.attachmentUpload" :disabled="true" />
</el-descriptions-item>
<el-descriptions-item span="3">
<template slot="label"> 辅导员联系情况 </template>
@@ -107,8 +107,8 @@
<!-- <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="handleDelegate">签收</el-button>-->
<el-button icon="el-icon-refresh-left" type="warning" v-if="rejectBtn" 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 v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
<el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
</div>
</el-col>
</el-tab-pane>
@@ -123,28 +123,28 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>办理人</template>
<template slot="label"><i class="el-icon-user" />办理人</template>
{{ item.assigneeName }}
<el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
</el-descriptions-item>
<el-descriptions-item v-if="item.candidate" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>候选办理</template>
<template slot="label"><i class="el-icon-user" />候选办理</template>
{{ item.candidate }}
</el-descriptions-item>
<el-descriptions-item label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>接收时间</template>
<template slot="label"><i class="el-icon-date" />接收时间</template>
{{ item.createTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>处理时间</template>
<template slot="label"><i class="el-icon-date" />处理时间</template>
{{ item.finishTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.duration" label-class-name="my-label">
<template slot="label"><i class="el-icon-time"></i>耗时</template>
<template slot="label"><i class="el-icon-time" />耗时</template>
{{ item.duration }}
</el-descriptions-item>
<el-descriptions-item v-if="item.comment" label-class-name="my-label">
<template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
<template slot="label"><i class="el-icon-tickets" />处理意见</template>
{{ item.comment.comment }}
</el-descriptions-item>
</el-descriptions>
@@ -156,40 +156,40 @@
</el-tab-pane>
<!--流程图-->
<el-tab-pane label="流程图" name="3">
<flow :flowData="flowData" />
<flow :flow-data="flowData" />
</el-tab-pane>
</el-tabs>
<!--审批任务-->
<el-dialog :title="completeTitle" class="certificate-service" :visible.sync="completeOpen" width="60%" append-to-body>
<el-button @click="fileUpload" type="danger">下载退学下文</el-button>
<el-button type="danger" @click="fileUpload">下载退学下文</el-button>
<el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="130px">
<el-form-item prop="targetKey">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
<flow-user v-if="checkSendUser" :check-type="checkType" @handleUserSelect="handleUserSelect" />
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect" />
</el-form-item>
<!-- 退学表单学生教育管理科审核归档 -->
<el-form-item label="退学文号" prop="reentryNumber" v-if="dropOutGLKSHGDShow">
<el-form-item v-if="dropOutGLKSHGDShow" label="退学文号" prop="reentryNumber">
<el-input v-model="taskForm.reentryNumber" placeholder="请输入退学文号" />
</el-form-item>
<el-form-item label="注销类型" prop="disqualificatioType" v-if="dropOutGLKSHGDShow">
<el-form-item v-if="dropOutGLKSHGDShow" label="注销类型" prop="disqualificatioType">
<el-select v-model="taskForm.disqualificatioType" placeholder="请选择注销类型">
<el-option v-for="dict in dict.type.rt_logout_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="退学年份" prop="reentryYear" v-if="dropOutGLKSHGDShow">
<el-select clearable v-model="taskForm.reentryYear" placeholder="请选择退学年份">
<el-form-item v-if="dropOutGLKSHGDShow" label="退学年份" prop="reentryYear">
<el-select v-model="taskForm.reentryYear" 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-select>
</el-form-item>
<el-form-item label="退学下文" v-if="dropOutGLKSHGDShow" prop="ihandlingSuggestion">
<el-form-item v-if="dropOutGLKSHGDShow" label="退学下文" prop="ihandlingSuggestion">
<file-upload v-model="taskForm.ihandlingSuggestion" :disabled="true" />
</el-form-item>
<el-form-item label="备注" prop="remark" v-if="dropOutGLKSHGDShow">
<el-form-item v-if="dropOutGLKSHGDShow" label="备注" prop="remark">
<el-input v-model="taskForm.remark" placeholder="请输入备注" type="textarea" rows="3" />
</el-form-item>
</el-form>
@@ -207,7 +207,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -219,7 +219,7 @@
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -240,7 +240,7 @@ import FlowRole from '@/components/flow/Role'
import FlowUser from '@/components/flow/User'
import Parser from '@/components/parser/Parser'
import download from '@/plugins/download'
import { checkRole } from '@/utils/permission'; // 权限判断函数
import { checkRole } from '@/utils/permission' // 权限判断函数
import flow from '@/views/flowable/task/todo/detail/flow'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import pdf from 'vue-pdf'

View File

@@ -7,13 +7,13 @@
<el-tag>任务节点:{{ taskName }}</el-tag>
<el-button style="float: right" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
<!--表单信息-->
<el-tab-pane label="表单信息" name="1">
<el-col :span="16" :offset="4">
<div class="">
<!-- 退学 -->
<el-descriptions class="margin-top" title="" :column="3" size="medium" border style="width: 100%" v-if="dropOutForm">
<el-descriptions v-if="dropOutForm" class="margin-top" title="" :column="3" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -76,7 +76,7 @@
<el-descriptions-item span="3">
<template slot="label"> 附件上传 </template>
<Affix v-model="form.attachmentUpload" :disabled="true"></Affix>
<Affix v-model="form.attachmentUpload" :disabled="true" />
</el-descriptions-item>
<el-descriptions-item span="3">
@@ -86,7 +86,7 @@
<el-descriptions-item span="3">
<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 span="3">
@@ -129,8 +129,8 @@
<!-- <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="handleDelegate">签收</el-button>-->
<el-button icon="el-icon-refresh-left" type="warning" v-if="rejectBtn" 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 v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
<el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
</div>
</el-col>
</el-tab-pane>
@@ -145,28 +145,28 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>办理人</template>
<template slot="label"><i class="el-icon-user" />办理人</template>
{{ item.assigneeName }}
<el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
</el-descriptions-item>
<el-descriptions-item v-if="item.candidate" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>候选办理</template>
<template slot="label"><i class="el-icon-user" />候选办理</template>
{{ item.candidate }}
</el-descriptions-item>
<el-descriptions-item label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>接收时间</template>
<template slot="label"><i class="el-icon-date" />接收时间</template>
{{ item.createTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>处理时间</template>
<template slot="label"><i class="el-icon-date" />处理时间</template>
{{ item.finishTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.duration" label-class-name="my-label">
<template slot="label"><i class="el-icon-time"></i>耗时</template>
<template slot="label"><i class="el-icon-time" />耗时</template>
{{ item.duration }}
</el-descriptions-item>
<el-descriptions-item v-if="item.comment" label-class-name="my-label">
<template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
<template slot="label"><i class="el-icon-tickets" />处理意见</template>
{{ item.comment.comment }}
</el-descriptions-item>
</el-descriptions>
@@ -178,44 +178,44 @@
</el-tab-pane>
<!--流程图-->
<el-tab-pane label="流程图" name="3">
<flow :flowData="flowData" />
<flow :flow-data="flowData" />
</el-tab-pane>
</el-tabs>
<!--审批任务-->
<el-dialog :title="completeTitle" class="certificate-service" :visible.sync="completeOpen" width="60%" append-to-body>
<el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="130px">
<el-form-item prop="targetKey">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
<flow-user v-if="checkSendUser" :check-type="checkType" @handleUserSelect="handleUserSelect" />
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect" />
</el-form-item>
<!-- 退学辅导员表单 -->
<el-form-item label="辅导员联系情况" prop="ideologicalEducation" v-if="dropOutShow">
<el-form-item v-if="dropOutShow" label="辅导员联系情况" prop="ideologicalEducation">
<el-input v-model="taskForm.ideologicalEducation" placeholder="请输入辅导员联系情况" type="textarea" rows="4" />
</el-form-item>
<el-form-item label="在校时间说明 " prop="instructionSchoolHours" v-if="dropOutShow">
<el-form-item v-if="dropOutShow" label="在校时间说明 " prop="instructionSchoolHours">
<el-input v-model="taskForm.instructionSchoolHours" placeholder="在校时间说明" type="textarea" rows="1" />
</el-form-item>
<!-- 退学表单:学生教育管理科审核 -->
<el-form-item label="退学文号" prop="quitNumber" v-if="dropOutGLKSHShow">
<el-form-item v-if="dropOutGLKSHShow" label="退学文号" prop="quitNumber">
<el-input v-model="taskForm.quitNumber" placeholder="请输入退学文号" />
</el-form-item>
<el-form-item label="退学类别" prop="dropOutCategory" v-if="dropOutGLKSHShow">
<el-form-item v-if="dropOutGLKSHShow" label="退学类别" prop="dropOutCategory">
<el-select v-model="taskForm.dropOutCategory" placeholder="请选择退学类别">
<el-option v-for="dict in dict.type.rt_logout_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="退学年份" prop="quitYear" v-if="dropOutGLKSHShow">
<el-select clearable v-model="taskForm.quitYear" placeholder="请退学年份">
<el-form-item v-if="dropOutGLKSHShow" label="退学年份" prop="quitYear">
<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-select>
</el-form-item>
<el-form-item label="备注" prop="remark" v-if="dropOutGLKSHShow">
<el-form-item v-if="dropOutGLKSHShow" label="备注" prop="remark">
<el-input v-model="taskForm.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
@@ -233,7 +233,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -245,7 +245,7 @@
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -266,7 +266,7 @@ import FlowRole from '@/components/flow/Role'
import FlowUser from '@/components/flow/User'
import Parser from '@/components/parser/Parser'
import download from '@/plugins/download'
import { checkRole } from '@/utils/permission'; // 权限判断函数
import { checkRole } from '@/utils/permission' // 权限判断函数
import flow from '@/views/flowable/task/todo/detail/flow'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import pdf from 'vue-pdf'

View File

@@ -1,13 +1,13 @@
<template>
<div>
<flow-view :flowData="flowData"/>
<flow-view :flow-data="flowData" />
</div>
</template>
<script>
import FlowView from './flowview'
export default {
name: "Flow",
name: 'Flow',
components: {
FlowView
},
@@ -18,7 +18,7 @@ export default {
},
},
data() {
return {};
return {}
}
};
}
</script>

View File

@@ -3,23 +3,26 @@
<el-button type="success"
size="small"
icon="el-icon-zoom-in"
@click="zoomViewport(true)">放大</el-button>
@click="zoomViewport(true)"
>放大</el-button>
<el-button type="warning"
size="small"
icon="el-icon-zoom-out"
@click="zoomViewport(false)">缩小</el-button>
@click="zoomViewport(false)"
>缩小</el-button>
<el-button type="info"
size="small"
icon="el-icon-rank"
@click="fitViewport">适中</el-button>
<div class="canvas" ref="flowCanvas"></div>
@click="fitViewport"
>适中</el-button>
<div ref="flowCanvas" class="canvas" />
</div>
</template>
<script>
import { CustomViewer as BpmnViewer } from "@/components/customBpmn";
import { CustomViewer as BpmnViewer } from '@/components/customBpmn'
export default {
name: "FlowView",
name: 'FlowView',
props: {
flowData: {
type: Object,
@@ -29,19 +32,19 @@ export default {
data() {
return {
bpmnViewer: null
};
}
},
watch: {
flowData: {
handler(newVal) {
if (Object.keys(newVal).length > 0) {
// 生成实例
this.bpmnViewer && this.bpmnViewer.destroy();
this.bpmnViewer && this.bpmnViewer.destroy()
this.bpmnViewer = new BpmnViewer({
container: this.$refs.flowCanvas,
height: 'calc(100vh - 200px)',
});
this.loadFlowCanvas(newVal);
})
this.loadFlowCanvas(newVal)
}
},
immediate: true, // 立即生效
@@ -55,7 +58,7 @@ export default {
async loadFlowCanvas(flowData) {
const self = this
try {
await self.bpmnViewer.importXML(flowData.xmlData);
await self.bpmnViewer.importXML(flowData.xmlData)
self.fitViewport()
if (flowData.nodeData !==undefined && flowData.nodeData.length > 0 ) {
self.fillColor(flowData.nodeData)
@@ -67,12 +70,12 @@ export default {
// 设置高亮颜色的class
setNodeColor(nodeCodes, colorClass, canvas) {
for (let i = 0; i < nodeCodes.length; i++) {
canvas.addMarker(nodeCodes[i], colorClass);
canvas.addMarker(nodeCodes[i], colorClass)
}
},
// 让图能自适应屏幕
fitViewport() {
this.zoom = this.bpmnViewer.get('canvas').zoom("fit-viewport", "auto")
this.zoom = this.bpmnViewer.get('canvas').zoom('fit-viewport', 'auto')
},
// 放大缩小
zoomViewport(zoomIn = true) {
@@ -153,7 +156,7 @@ export default {
})
},
}
};
}
</script>
<style lang="scss">
.bjs-powered-by {

View File

@@ -7,13 +7,13 @@
<el-tag>任务节点:{{ taskName }}</el-tag>
<el-button style="float: right" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
<!--表单信息-->
<el-tab-pane label="表单信息" name="1">
<el-col :span="16" :offset="4">
<div class="">
<!-- 考勤表单 -->
<el-descriptions class="margin-top" title="" :column="2" size="medium" border style="width: 100%" v-if="leaveForm">
<el-descriptions v-if="leaveForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -94,7 +94,7 @@
</el-descriptions>
<!-- 处分表单 -->
<el-descriptions class="margin-top" title="" :column="2" size="medium" border style="width: 100%" v-if="disposalForm">
<el-descriptions v-if="disposalForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -149,7 +149,7 @@
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label"> 违纪材料 </template>
<Affix v-model="form.evidenceUpload" :disabled="true"></Affix>
<Affix v-model="form.evidenceUpload" :disabled="true" />
</el-descriptions-item>
<el-descriptions-item span="2">
<template slot="label"> 处分建议 </template>
@@ -170,7 +170,7 @@
</el-descriptions>
<!-- 解除处分表单 -->
<el-descriptions class="margin-top" title="" :column="2" size="medium" border style="width: 100%" v-if="relieveForm">
<el-descriptions v-if="relieveForm" class="margin-top" title="" :column="2" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -238,7 +238,7 @@
</el-descriptions>
<!-- 休学申请表单 -->
<el-descriptions class="margin-top" title="" :column="3" size="medium" border style="width: 100%" v-if="quitSchoolForm">
<el-descriptions v-if="quitSchoolForm" class="margin-top" title="" :column="3" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -292,7 +292,7 @@
{{ form.jg }}
</el-descriptions-item>
<el-descriptions-item >
<el-descriptions-item>
<template slot="label"> 休学类型 </template>
{{ quitSchoolTypeMethodFormat(form) }}
</el-descriptions-item>
@@ -304,7 +304,7 @@
<el-descriptions-item span="3">
<template slot="label"> 附件上传 </template>
<Affix v-model="form.attachmentUpload" :disabled="true"></Affix>
<Affix v-model="form.attachmentUpload" :disabled="true" />
</el-descriptions-item>
<el-descriptions-item span="3">
@@ -314,7 +314,7 @@
<el-descriptions-item span="3">
<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 span="3">
@@ -339,9 +339,9 @@
<!-- <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="handleDelegate">签收</el-button>-->
<el-button icon="el-icon-refresh-left" type="warning" v-if="rejectBtn" 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>
</div>
</el-col>
</el-tab-pane>
@@ -356,28 +356,28 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>办理人</template>
<template slot="label"><i class="el-icon-user" />办理人</template>
{{ item.assigneeName }}
<el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
</el-descriptions-item>
<el-descriptions-item v-if="item.candidate" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>候选办理</template>
<template slot="label"><i class="el-icon-user" />候选办理</template>
{{ item.candidate }}
</el-descriptions-item>
<el-descriptions-item label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>接收时间</template>
<template slot="label"><i class="el-icon-date" />接收时间</template>
{{ item.createTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>处理时间</template>
<template slot="label"><i class="el-icon-date" />处理时间</template>
{{ item.finishTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.duration" label-class-name="my-label">
<template slot="label"><i class="el-icon-time"></i>耗时</template>
<template slot="label"><i class="el-icon-time" />耗时</template>
{{ item.duration }}
</el-descriptions-item>
<el-descriptions-item v-if="item.comment" label-class-name="my-label">
<template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
<template slot="label"><i class="el-icon-tickets" />处理意见</template>
{{ item.comment.comment }}
</el-descriptions-item>
</el-descriptions>
@@ -389,7 +389,7 @@
</el-tab-pane>
<!--流程图-->
<el-tab-pane label="流程图" name="3">
<flow :flowData="flowData" />
<flow :flow-data="flowData" />
</el-tab-pane>
</el-tabs>
<!--审批任务-->
@@ -402,7 +402,7 @@
<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>
<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" /> -->
<div>
<div>学生工作处</div>
@@ -412,9 +412,9 @@
</div>
</div>
<!-- <pdf :src="pdfURL"> </pdf> -->
<el-button @click="fileUpload" type="danger">下载处分下文</el-button>
<el-button type="danger" @click="fileUpload">下载处分下文</el-button>
</el-card>
<el-button @click="fileUpload" type="danger" v-if="showFileDowload">下载解除处分下文</el-button>
<el-button v-if="showFileDowload" type="danger" @click="fileUpload">下载解除处分下文</el-button>
<el-card v-if="showQuitSchoolProve">
<div id="quitSchool" class="certificate">
@@ -423,7 +423,7 @@
<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>
<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>
<span>学生工作处</span>
<span>{{ form.quitStartTime }}</span>
@@ -434,79 +434,79 @@
<el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="130px">
<el-form-item prop="targetKey">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
<flow-user v-if="checkSendUser" :check-type="checkType" @handleUserSelect="handleUserSelect" />
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect" />
</el-form-item>
<!-- 处分表单 -->
<el-form-item label="处分文号" prop="penaltyNumber" v-if="dispositionServiceShow">
<el-form-item v-if="dispositionServiceShow" label="处分文号" prop="penaltyNumber">
<el-input v-model="taskForm.penaltyNumber" placeholder="请输入处分文号" />
</el-form-item>
<el-form-item label="送达书" prop="letterServiceContent" v-if="dispositionServiceShow">
<el-input type="textarea" v-model="taskForm.letterServiceContent" placeholder="请输入送达书" rows="5" />
<el-form-item v-if="dispositionServiceShow" label="送达书" prop="letterServiceContent">
<el-input v-model="taskForm.letterServiceContent" type="textarea" placeholder="请输入送达书" rows="5" />
</el-form-item>
<!-- <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-form-item> -->
<el-form-item label="处分时间" prop="disciplinaryDate" v-if="dispositionServiceShow" :rules="[{ required: true, message: '请选择违纪日期', trigger: 'blur' }]">
<el-date-picker clearable v-model="taskForm.disciplinaryDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择违纪日期"> </el-date-picker>
<el-form-item v-if="dispositionServiceShow" label="处分时间" prop="disciplinaryDate" :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 label="解除处分文号" prop="relieveNumber" v-if="relieveServiceShow">
<el-form-item v-if="relieveServiceShow" label="解除处分文号" prop="relieveNumber">
<el-input v-model="taskForm.relieveNumber" placeholder="请输入解除处分文号" />
</el-form-item>
<el-form-item label="处分期间表现" prop="ideologicalEducation" v-if="ideologicalEducationShow">
<el-form-item v-if="ideologicalEducationShow" label="处分期间表现" prop="ideologicalEducation">
<el-input v-model="taskForm.ideologicalEducation" placeholder="请输入处分期间表现" type="textarea" rows="4" />
</el-form-item>
<!-- 处分/解除处分 -->
<el-form-item label="处分材料" v-if="dispositionServiceShow || relieveServiceShow" prop="dispositionServiceContent">
<el-form-item v-if="dispositionServiceShow || relieveServiceShow" label="处分材料" prop="dispositionServiceContent">
<file-upload v-model="taskForm.dispositionServiceContent" :disabled="true" />
</el-form-item>
<!-- 休学表单 -->
<el-form-item label="辅导员联系情况" prop="ideologicalEducation" v-if="quitSchoolShow">
<el-form-item v-if="quitSchoolShow" label="辅导员联系情况" prop="ideologicalEducation">
<el-input v-model="taskForm.ideologicalEducation" placeholder="请输入辅导员联系情况" type="textarea" rows="4" />
</el-form-item>
<el-form-item label="在校时间说明 " prop="instructionSchoolHours" v-if="quitSchoolShow">
<el-form-item v-if="quitSchoolShow" label="在校时间说明 " prop="instructionSchoolHours">
<el-input v-model="taskForm.instructionSchoolHours" placeholder="在校时间说明" type="textarea" rows="1" />
</el-form-item>
<!-- 休学表单:学生教育管理科审核 -->
<el-form-item label="休学文号" prop="quitNumber" v-if="quitSchoolGLKSHShow">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学文号" prop="quitNumber">
<el-input v-model="taskForm.quitNumber" placeholder="请输入休学文号" />
</el-form-item>
<el-form-item label="休学开始时间" prop="quitStartTime" v-if="quitSchoolGLKSHShow">
<el-date-picker v-model="taskForm.quitStartTime" type="date" placeholder="开始时间"> </el-date-picker>
<el-form-item v-if="quitSchoolGLKSHShow" label="休学开始时间" prop="quitStartTime">
<el-date-picker v-model="taskForm.quitStartTime" type="date" placeholder="开始时间" />
</el-form-item>
<el-form-item label="休学结束时间" prop="quitEndTime" v-if="quitSchoolGLKSHShow">
<el-date-picker v-model="taskForm.quitEndTime" type="date" placeholder="结束时间"> </el-date-picker>
<el-form-item v-if="quitSchoolGLKSHShow" label="休学结束时间" prop="quitEndTime">
<el-date-picker v-model="taskForm.quitEndTime" type="date" placeholder="结束时间" />
</el-form-item>
<el-form-item label="休学类别" prop="quitCategory" v-if="quitSchoolGLKSHShow">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学类别" prop="quitCategory">
<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-select>
</el-form-item>
<el-form-item label="休学类型" prop="quitType" v-if="quitSchoolGLKSHShow">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学类型" prop="quitType">
<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-select>
</el-form-item>
<el-form-item label="休学年份" prop="quitYear" v-if="quitSchoolGLKSHShow">
<el-select clearable v-model="taskForm.quitYear" placeholder="请退学年份">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学年份" prop="quitYear">
<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-select>
</el-form-item>
<el-form-item label="休学备注" prop="remark" v-if="quitSchoolGLKSHShow">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学备注" prop="remark">
<el-input v-model="taskForm.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
@@ -524,7 +524,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -536,7 +536,7 @@
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -560,7 +560,7 @@ import FlowRole from '@/components/flow/Role'
import FlowUser from '@/components/flow/User'
import Parser from '@/components/parser/Parser'
import download from '@/plugins/download'
import { checkRole } from '@/utils/permission'; // 权限判断函数
import { checkRole } from '@/utils/permission' // 权限判断函数
import flow from '@/views/flowable/task/todo/detail/flow'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import pdf from 'vue-pdf'

View File

@@ -7,13 +7,13 @@
<el-tag>任务节点:{{ taskName }}</el-tag>
<el-button style="float: right" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
<!--表单信息-->
<el-tab-pane label="表单信息" name="1">
<el-col :span="16" :offset="4">
<div class="">
<!-- 休学申请表单 -->
<el-descriptions class="margin-top" title="" :column="3" size="medium" border style="width: 100%" v-if="quitSchoolForm">
<el-descriptions v-if="quitSchoolForm" class="margin-top" title="" :column="3" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -74,7 +74,7 @@
<el-descriptions-item span="3">
<template slot="label"> 附件上传 </template>
<Affix v-model="form.attachmentUpload" :disabled="true"></Affix>
<Affix v-model="form.attachmentUpload" :disabled="true" />
</el-descriptions-item>
<el-descriptions-item span="3">
@@ -84,7 +84,7 @@
<el-descriptions-item span="3">
<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 span="3">
@@ -133,8 +133,8 @@
<!-- <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="handleDelegate">签收</el-button>-->
<el-button icon="el-icon-refresh-left" type="warning" v-if="rejectBtn" 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 v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
<el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
</div>
</el-col>
</el-tab-pane>
@@ -149,28 +149,28 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>办理人</template>
<template slot="label"><i class="el-icon-user" />办理人</template>
{{ item.assigneeName }}
<el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
</el-descriptions-item>
<el-descriptions-item v-if="item.candidate" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>候选办理</template>
<template slot="label"><i class="el-icon-user" />候选办理</template>
{{ item.candidate }}
</el-descriptions-item>
<el-descriptions-item label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>接收时间</template>
<template slot="label"><i class="el-icon-date" />接收时间</template>
{{ item.createTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>处理时间</template>
<template slot="label"><i class="el-icon-date" />处理时间</template>
{{ item.finishTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.duration" label-class-name="my-label">
<template slot="label"><i class="el-icon-time"></i>耗时</template>
<template slot="label"><i class="el-icon-time" />耗时</template>
{{ item.duration }}
</el-descriptions-item>
<el-descriptions-item v-if="item.comment" label-class-name="my-label">
<template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
<template slot="label"><i class="el-icon-tickets" />处理意见</template>
{{ item.comment.comment }}
</el-descriptions-item>
</el-descriptions>
@@ -182,7 +182,7 @@
</el-tab-pane>
<!--流程图-->
<el-tab-pane label="流程图" name="3">
<flow :flowData="flowData" />
<flow :flow-data="flowData" />
</el-tab-pane>
</el-tabs>
<!--审批任务-->
@@ -194,7 +194,7 @@
<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>
<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>
<span>学生工作处</span>
<span>{{ form.quitStartTime }}</span>
@@ -204,46 +204,46 @@
</div>
<el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="130px">
<el-form-item prop="targetKey">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
<flow-user v-if="checkSendUser" :check-type="checkType" @handleUserSelect="handleUserSelect" />
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect" />
</el-form-item>
<!-- 休学表单 -->
<el-form-item label="辅导员联系情况" prop="ideologicalEducation" v-if="quitSchoolShow">
<el-form-item v-if="quitSchoolShow" label="辅导员联系情况" prop="ideologicalEducation">
<el-input v-model="taskForm.ideologicalEducation" placeholder="请输入辅导员联系情况" type="textarea" rows="4" />
</el-form-item>
<el-form-item label="在校时间说明 " prop="instructionSchoolHours" v-if="quitSchoolShow">
<el-form-item v-if="quitSchoolShow" label="在校时间说明 " prop="instructionSchoolHours">
<el-input v-model="taskForm.instructionSchoolHours" placeholder="在校时间说明" type="textarea" rows="1" />
</el-form-item>
<!-- 休学表单:学生教育管理科审核 -->
<el-form-item label="休学文号" prop="quitNumber" v-if="quitSchoolGLKSHShow">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学文号" prop="quitNumber">
<el-input v-model="taskForm.quitNumber" placeholder="请输入休学文号" />
</el-form-item>
<el-form-item label="休学开始时间" prop="quitStartTime" v-if="quitSchoolGLKSHShow">
<el-date-picker v-model="taskForm.quitStartTime" type="date" placeholder="开始时间"> </el-date-picker>
<el-form-item v-if="quitSchoolGLKSHShow" label="休学开始时间" prop="quitStartTime">
<el-date-picker v-model="taskForm.quitStartTime" type="date" placeholder="开始时间" />
</el-form-item>
<el-form-item label="休学结束时间" prop="quitEndTime" v-if="quitSchoolGLKSHShow">
<el-date-picker v-model="taskForm.quitEndTime" type="date" placeholder="结束时间"> </el-date-picker>
<el-form-item v-if="quitSchoolGLKSHShow" label="休学结束时间" prop="quitEndTime">
<el-date-picker v-model="taskForm.quitEndTime" type="date" placeholder="结束时间" />
</el-form-item>
<el-form-item label="休学类别" prop="quitCategory" v-if="quitSchoolGLKSHShow">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学类别" prop="quitCategory">
<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-select>
</el-form-item>
<el-form-item label="休学年份" prop="quitYear" v-if="quitSchoolGLKSHShow">
<el-select clearable v-model="taskForm.quitYear" placeholder="请退学年份">
<el-form-item v-if="quitSchoolGLKSHShow" label="休学年份" prop="quitYear">
<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-select>
</el-form-item>
<el-form-item label="休学备注" prop="remark" v-if="quitSchoolGLKSHShow">
<el-input v-model="taskForm.remark" placeholder="请输入备注" rows="2"/>
<el-form-item v-if="quitSchoolGLKSHShow" label="休学备注" prop="remark">
<el-input v-model="taskForm.remark" placeholder="请输入备注" rows="2" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -260,7 +260,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -272,7 +272,7 @@
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -293,7 +293,7 @@ import FlowRole from '@/components/flow/Role'
import FlowUser from '@/components/flow/User'
import Parser from '@/components/parser/Parser'
import download from '@/plugins/download'
import { checkRole } from '@/utils/permission'; // 权限判断函数
import { checkRole } from '@/utils/permission' // 权限判断函数
import flow from '@/views/flowable/task/todo/detail/flow'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import pdf from 'vue-pdf'

View File

@@ -7,13 +7,13 @@
<el-tag>任务节点:{{ taskName }}</el-tag>
<el-button style="float: right" size="mini" type="danger" @click="goBack">关闭</el-button>
</div>
<el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName" tab-position="top" @tab-click="handleClick">
<!--表单信息-->
<el-tab-pane label="表单信息" name="1">
<el-col :span="16" :offset="4">
<div class="">
<!-- 复学 -->
<el-descriptions class="margin-top" title="" :column="3" size="medium" border style="width: 100%" v-if="dropOutForm">
<el-descriptions v-if="dropOutForm" class="margin-top" title="" :column="3" size="medium" border style="width: 100%">
<el-descriptions-item>
<template slot="label"> 学号 </template>
{{ form.stuNo }}
@@ -74,7 +74,7 @@
<el-descriptions-item span="3">
<template slot="label"> 附件上传 </template>
<Affix v-model="form.attachmentUpload" :disabled="true"></Affix>
<Affix v-model="form.attachmentUpload" :disabled="true" />
</el-descriptions-item>
<el-descriptions-item span="3">
@@ -84,7 +84,7 @@
<el-descriptions-item span="3">
<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 span="3">
@@ -148,8 +148,8 @@
<!-- <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="handleDelegate">签收</el-button>-->
<el-button icon="el-icon-refresh-left" type="warning" v-if="rejectBtn" 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 v-if="rejectBtn" icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
<el-button v-if="rejectBtn" icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
</div>
</el-col>
</el-tab-pane>
@@ -164,28 +164,28 @@
<el-card :body-style="{ padding: '10px' }">
<el-descriptions class="margin-top" :column="1" size="small" border>
<el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>办理人</template>
<template slot="label"><i class="el-icon-user" />办理人</template>
{{ item.assigneeName }}
<el-tag type="info" size="mini">{{ item.deptName }}</el-tag>
</el-descriptions-item>
<el-descriptions-item v-if="item.candidate" label-class-name="my-label">
<template slot="label"><i class="el-icon-user"></i>候选办理</template>
<template slot="label"><i class="el-icon-user" />候选办理</template>
{{ item.candidate }}
</el-descriptions-item>
<el-descriptions-item label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>接收时间</template>
<template slot="label"><i class="el-icon-date" />接收时间</template>
{{ item.createTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.finishTime" label-class-name="my-label">
<template slot="label"><i class="el-icon-date"></i>处理时间</template>
<template slot="label"><i class="el-icon-date" />处理时间</template>
{{ item.finishTime }}
</el-descriptions-item>
<el-descriptions-item v-if="item.duration" label-class-name="my-label">
<template slot="label"><i class="el-icon-time"></i>耗时</template>
<template slot="label"><i class="el-icon-time" />耗时</template>
{{ item.duration }}
</el-descriptions-item>
<el-descriptions-item v-if="item.comment" label-class-name="my-label">
<template slot="label"><i class="el-icon-tickets"></i>处理意见</template>
<template slot="label"><i class="el-icon-tickets" />处理意见</template>
{{ item.comment.comment }}
</el-descriptions-item>
</el-descriptions>
@@ -197,7 +197,7 @@
</el-tab-pane>
<!--流程图-->
<el-tab-pane label="流程图" name="3">
<flow :flowData="flowData" />
<flow :flow-data="flowData" />
</el-tab-pane>
</el-tabs>
<!--审批任务-->
@@ -213,7 +213,7 @@
</p>
<p>抄送教务处财务处{{ form.departmentName }}</p>
<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>
<span>学生工作处</span>
<span>{{ form.reentryTime }}</span>
@@ -224,33 +224,33 @@
<el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="130px">
<el-form-item prop="targetKey">
<flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
<flow-user v-if="checkSendUser" :check-type="checkType" @handleUserSelect="handleUserSelect" />
<flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect" />
</el-form-item>
<!-- 复学辅导员表单 -->
<el-form-item label="辅导员联系情况" prop="ideologicalEducation" v-if="dropOutShow">
<el-form-item v-if="dropOutShow" label="辅导员联系情况" prop="ideologicalEducation">
<el-input v-model="taskForm.ideologicalEducation" placeholder="请输入辅导员联系情况" type="textarea" rows="4" />
</el-form-item>
<el-form-item label="在校时间说明 " prop="instructionSchoolHours" v-if="dropOutShow">
<el-form-item v-if="dropOutShow" label="在校时间说明 " prop="instructionSchoolHours">
<el-input v-model="taskForm.instructionSchoolHours" placeholder="在校时间说明" type="textarea" rows="1" />
</el-form-item>
<el-form-item label="辅导员处理意见 " prop="ihandlingSuggestion" v-if="dropOutShow">
<el-form-item v-if="dropOutShow" label="辅导员处理意见 " prop="ihandlingSuggestion">
<el-input v-model="taskForm.ihandlingSuggestion" placeholder="辅导员处理意见" type="textarea" rows="3" />
</el-form-item>
<el-form-item label="休学时间" prop="quitTime" v-if="dropOutShow">
<el-date-picker v-model="taskForm.quitTime" type="date" placeholder="休学时间"> </el-date-picker>
<el-form-item v-if="dropOutShow" label="休学时间" prop="quitTime">
<el-date-picker v-model="taskForm.quitTime" type="date" placeholder="休学时间" />
</el-form-item>
<el-form-item label="复学时间" prop="reentryTime" v-if="dropOutShow">
<el-date-picker v-model="taskForm.reentryTime" type="date" placeholder="复学时间"> </el-date-picker>
<el-form-item v-if="dropOutShow" label="复学时间" prop="reentryTime">
<el-date-picker v-model="taskForm.reentryTime" type="date" placeholder="复学时间" />
</el-form-item>
<el-form-item label="复学班级" prop="reentryClass" v-if="dropOutShow">
<el-cascader ref="cascader" placeholder="请选择班级" v-model="taskForm.reentryClass" :props="{ checkStrictly: true }" :show-all-levels="false" :options="ClassNameList" @change="handleChange1" clearable filterable>
<el-form-item v-if="dropOutShow" label="复学班级" prop="reentryClass">
<el-cascader ref="cascader" v-model="taskForm.reentryClass" placeholder="请选择班级" :props="{ checkStrictly: true }" :show-all-levels="false" :options="ClassNameList" clearable filterable @change="handleChange1">
<template slot-scope="{ node, data }">
<span>{{ data.label }}</span>
<span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -259,21 +259,21 @@
</el-form-item>
<!-- 复学表单学生教育管理科审核 -->
<el-form-item label="复学原因" prop="reentryCause" v-if="dropOutGLKSHShow">
<el-form-item v-if="dropOutGLKSHShow" label="复学原因" prop="reentryCause">
<el-input v-model="taskForm.reentryCause" placeholder="请输入退学原因" rows="3" />
</el-form-item>
<el-form-item label="复学年份" prop="reentryYear" v-if="dropOutGLKSHShow">
<el-select clearable v-model="taskForm.reentryYear" placeholder="请复学年份">
<el-form-item v-if="dropOutGLKSHShow" label="复学年份" prop="reentryYear">
<el-select v-model="taskForm.reentryYear" 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-select>
</el-form-item>
<el-form-item label="复学文号" prop="reentryNumber" v-if="dropOutGLKSHShow">
<el-form-item v-if="dropOutGLKSHShow" label="复学文号" prop="reentryNumber">
<el-input v-model="taskForm.reentryNumber" placeholder="请输入复学文号" />
</el-form-item>
<el-form-item label="休学类别" prop="quitCategory" v-if="dropOutGLKSHShow">
<el-form-item v-if="dropOutGLKSHShow" label="休学类别" prop="quitCategory">
<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-select>
@@ -293,7 +293,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="退回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -305,7 +305,7 @@
<el-dialog :title="rejectTitle" :visible.sync="rejectOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px">
<el-form-item label="驳回意见" prop="comment" :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
<el-input style="width: 50%" type="textarea" v-model="taskForm.comment" placeholder="请输入意见" />
<el-input v-model="taskForm.comment" style="width: 50%" type="textarea" placeholder="请输入意见" />
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -328,7 +328,7 @@ import FlowRole from '@/components/flow/Role'
import FlowUser from '@/components/flow/User'
import Parser from '@/components/parser/Parser'
import download from '@/plugins/download'
import { checkRole } from '@/utils/permission'; // 权限判断函数
import { checkRole } from '@/utils/permission' // 权限判断函数
import { getMonth } from '@/utils/ruoyi'
import flow from '@/views/flowable/task/todo/detail/flow'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'

View File

@@ -1,11 +1,11 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
<el-form-item label="名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入名称" clearable size="small" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="开始时间" prop="deployTime">
<el-date-picker clearable size="small" v-model="queryParams.deployTime" type="date" value-format="yyyy-MM-dd" placeholder="选择时间"> </el-date-picker>
<el-date-picker v-model="queryParams.deployTime" clearable size="small" type="date" value-format="yyyy-MM-dd" placeholder="选择时间" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -15,9 +15,9 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:deployment:remove']">删除 </el-button>
<el-button v-hasPermi="['system:deployment:remove']" type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除 </el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
</el-row>
<el-table v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
@@ -32,9 +32,7 @@
</el-table-column> -->
<el-table-column label="流程发起人" align="center">
<template slot-scope="scope">
<label
>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName }}</el-tag></label
>
<label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName }}</el-tag></label>
</template>
</el-table-column>
<el-table-column label="接收时间" align="center" prop="createTime" width="180" />
@@ -50,7 +48,7 @@
</template>
<script>
import { delDeployment, todoList } from '@/api/flowable/todo';
import { delDeployment, todoList } from '@/api/flowable/todo'
export default {
name: 'Deploy',