fix(flow) add resubmit page

deliver/approver-flow
bob 2 years ago
parent 44c0687812
commit 53e458f201

@ -42,7 +42,7 @@
<el-table v-loading="loading" :data="finishedList" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="项目名称" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="工作问题" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<el-table-column label="工作事项" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<el-table-column label="任务节点" align="center" prop="taskName"/>
<el-table-column label="流程发起人" align="center">
<template slot-scope="scope">

@ -1,15 +1,10 @@
<template>
<div class="app-container">
<el-dialog :title="'流转信息'" :visible.sync="open" width="80%" append-to-body>
<el-dialog :title="'详情'" :visible.sync="open" width="80%" append-to-body>
<el-card class="box-card" >
<div slot="header" class="clearfix">
<span class="el-icon-document">基础信息</span>
<el-button style="float: right;" type="primary" @click="goBack"></el-button>
</div>
<!--流程处理表单模块-->
<el-col :span="16" :offset="6" v-if="variableOpen">
<span class="el-icon-notebook-1">基础信息</span>
<div>
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="true">
<el-form-item label="所属项目">
@ -19,7 +14,7 @@
placeholder="请选择">
<el-option
v-for="(item,index) in projectList"
:key="record"
:key="index"
:label="item.label"
:value="item.value">
</el-option>
@ -34,7 +29,7 @@
<el-form-item label="工作记录">
<el-input type="textarea" v-model="form.workRecord"/>
</el-form-item>
<el-form-item label="附件">
<el-form-item label="附件">
<div v-for="(item,index) in uploadedImgs" class="demo-image__preview">
<el-row :span="24">
@ -49,12 +44,62 @@
<span>{{item.name}}</span>
</el-col>
</el-row>
</div>
<div v-for="(item,index) in uploadedFiles" class="demo-image__preview">
<span>{{item.name}}</span>
</div>
</el-form-item>
</el-form>
</div>
</el-col>
</div>
<!--流程处理表单模块-->
<!-- <el-col :span="16" :offset="6" v-if="variableOpen">-->
<!-- <div>-->
<!-- <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="true">-->
<!-- <el-form-item label="所属项目">-->
<!-- <el-select v-model="form.projectId"-->
<!-- clearable-->
<!-- filterable-->
<!-- placeholder="请选择">-->
<!-- <el-option-->
<!-- v-for="(item,index) in projectList"-->
<!-- :key="record"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="项目问题">-->
<!-- <el-input type="textarea" v-model="form.issue"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="解决方案">-->
<!-- <el-input type="textarea" v-model="form.solution"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="工作记录">-->
<!-- <el-input type="textarea" v-model="form.workRecord"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="附件">-->
<!-- <div v-for="(item,index) in uploadedImgs" class="demo-image__preview">-->
<!-- <el-row :span="24">-->
<!-- <el-col :span="6">-->
<!-- <el-image-->
<!-- style="width: 100px; height: 100px"-->
<!-- :src="'data:image/png;base64,'+item.base64"-->
<!-- :preview-src-list="['data:image/png;base64,'+item.base64]">-->
<!-- </el-image>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <span>{{item.name}}</span>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </div>-->
<!-- </el-col>-->
</el-card>
@ -122,104 +167,104 @@
<!-- </el-card>-->
<!--审批正常流程-->
<el-dialog :title="completeTitle" :visible.sync="completeOpen" :width="checkSendUser? '60%':'40%'" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px" >
<el-form-item v-if="checkSendUser" prop="targetKey">
<el-row :gutter="20">
<!--部门数据-->
<el-col :span="6" :xs="24">
<h6>部门列表</h6>
<div class="head-container">
<el-input
v-model="deptName"
placeholder="请输入部门名称"
clearable
size="small"
prefix-icon="el-icon-search"
style="margin-bottom: 20px"
/>
</div>
<div class="head-container">
<el-tree
:data="deptOptions"
:props="defaultProps"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
default-expand-all
@node-click="handleNodeClick"
/>
</div>
</el-col>
<el-col :span="10" :xs="24">
<h6>待选人员</h6>
<el-table
ref="singleTable"
:data="userList"
border
style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="用户名" align="center" prop="nickName" />
<el-table-column label="部门" align="center" prop="dept.deptName" />
</el-table>
</el-col>
<el-col :span="8" :xs="24">
<h6>已选人员</h6>
<el-tag
v-for="(user,index) in userData"
:key="record"
closable
@close="handleClose(user)">
{{user.nickName}} {{user.dept.deptName}}
</el-tag>
</el-col>
</el-row>
</el-form-item>
<el-form-item label="处理意见" prop="comment" :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
<el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="completeOpen = false"> </el-button>
<el-button type="primary" @click="taskComplete"> </el-button>
</span>
</el-dialog>
<!-- <el-dialog :title="completeTitle" :visible.sync="completeOpen" :width="checkSendUser? '60%':'40%'" append-to-body>-->
<!-- <el-form ref="taskForm" :model="taskForm" label-width="80px" >-->
<!-- <el-form-item v-if="checkSendUser" prop="targetKey">-->
<!-- <el-row :gutter="20">-->
<!-- &lt;!&ndash;部门数据&ndash;&gt;-->
<!-- <el-col :span="6" :xs="24">-->
<!-- <h6>部门列表</h6>-->
<!-- <div class="head-container">-->
<!-- <el-input-->
<!-- v-model="deptName"-->
<!-- placeholder="请输入部门名称"-->
<!-- clearable-->
<!-- size="small"-->
<!-- prefix-icon="el-icon-search"-->
<!-- style="margin-bottom: 20px"-->
<!-- />-->
<!-- </div>-->
<!-- <div class="head-container">-->
<!-- <el-tree-->
<!-- :data="deptOptions"-->
<!-- :props="defaultProps"-->
<!-- :expand-on-click-node="false"-->
<!-- :filter-node-method="filterNode"-->
<!-- ref="tree"-->
<!-- default-expand-all-->
<!-- @node-click="handleNodeClick"-->
<!-- />-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10" :xs="24">-->
<!-- <h6>待选人员</h6>-->
<!-- <el-table-->
<!-- ref="singleTable"-->
<!-- :data="userList"-->
<!-- border-->
<!-- style="width: 100%"-->
<!-- @selection-change="handleSelectionChange">-->
<!-- <el-table-column type="selection" width="50" align="center" />-->
<!-- <el-table-column label="用户名" align="center" prop="nickName" />-->
<!-- <el-table-column label="部门" align="center" prop="dept.deptName" />-->
<!-- </el-table>-->
<!-- </el-col>-->
<!-- <el-col :span="8" :xs="24">-->
<!-- <h6>已选人员</h6>-->
<!-- <el-tag-->
<!-- v-for="(user,index) in userData"-->
<!-- :key="record"-->
<!-- closable-->
<!-- @close="handleClose(user)">-->
<!-- {{user.nickName}} {{user.dept.deptName}}-->
<!-- </el-tag>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="处理意见" prop="comment" :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">-->
<!-- <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见"/>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button @click="completeOpen = false"> </el-button>-->
<!-- <el-button type="primary" @click="taskComplete"> </el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
<!--退回流程-->
<el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
<el-form ref="taskForm" :model="taskForm" label-width="80px" >
<el-form-item label="退回节点" prop="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-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-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="returnOpen = false"> </el-button>
<el-button type="primary" @click="taskReturn"> </el-button>
</span>
</el-dialog>
<!-- <el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>-->
<!-- <el-form ref="taskForm" :model="taskForm" label-width="80px" >-->
<!-- <el-form-item label="退回节点" prop="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-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-form-item>-->
<!-- </el-form>-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button @click="returnOpen = false"> </el-button>-->
<!-- <el-button type="primary" @click="taskReturn"> </el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
<!--驳回流程-->
<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-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="rejectOpen = false"> </el-button>
<el-button type="primary" @click="taskReject"> </el-button>
</span>
</el-dialog>
<!-- <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-form-item>-->
<!-- </el-form>-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button @click="rejectOpen = false"> </el-button>-->
<!-- <el-button type="primary" @click="taskReject"> </el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
</el-dialog>
</div>
</template>

@ -55,7 +55,7 @@
<el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="工作问题" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<el-table-column label="工作事项" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<el-table-column label="流程类别" align="center" prop="category" width="100px" />
<el-table-column label="流程版本" align="center" width="80px">
<template slot-scope="scope">
@ -88,7 +88,7 @@
<el-dropdown-item icon="el-icon-tickets" @click.native="handleFlowRecord(scope.row)">
详情
</el-dropdown-item>
<el-dropdown-item v-if="scope.row.status =='reject' " icon="el-icon-circle-close" @click.native="handleFlowRecord(scope.row)">
<el-dropdown-item v-if="scope.row.status =='reject' " icon="el-icon-circle-close" @click.native="handleResubmit(scope.row)">
重新发起
</el-dropdown-item>
<!-- <el-dropdown-item icon="el-icon-delete" @click.native="handleDelete(scope.row)" v-hasPermi="['system:deployment:remove']">-->
@ -153,6 +153,9 @@
/>
</el-dialog>
<oa-project-flow refre ref="oaProjectFlow" @refreshDataList="getList"></oa-project-flow>
<finished-record ref="finishedRecord"></finished-record>
<record-resubmit ref="recordResubmit"></record-resubmit>
</div>
</template>
@ -168,10 +171,14 @@ import {
} from "@/api/flowable/finished";
import { myProcessList,stopProcess } from "@/api/flowable/process";
import {listDefinition} from "@/api/flowable/definition";
import finishedRecord from "@/views/flowable/task/finished/record.vue";
import recordResubmit from "@/views/flowable/task/record/resubmit.vue";
export default {
name: "Deploy",
components: {
oaProjectFlow
oaProjectFlow,
finishedRecord,
recordResubmit
},
data() {
return {
@ -328,15 +335,22 @@ export default {
this.getList();
});
},
// /** */
// handleFlowRecord(row){
// this.$router.push({ path: '/flowable/task/record/index',
// query: {
// procInsId: row.procInsId,
// deployId: row.deployId,
// taskId: row.taskId,
// finished: false
// }})
// },
/** 流程流转记录 */
handleFlowRecord(row){
this.$router.push({ path: '/flowable/task/record/index',
query: {
procInsId: row.procInsId,
deployId: row.deployId,
taskId: row.taskId,
finished: false
}})
this.$refs.finishedRecord.init(row.procInsId,row.deployId,row.taskId, false)
}, /** 流程流转记录 */
handleResubmit(row){
this.$refs.recordResubmit.init(row.procInsId,row.deployId,row.taskId, false)
},
/** 修改按钮操作 */
handleUpdate(row) {

@ -0,0 +1,611 @@
<template>
<div class="app-container">
<el-dialog :title="'详情'" :visible.sync="open" width="80%" append-to-body>
<el-card class="box-card" >
<div slot="header" class="clearfix">
<span class="el-icon-document">基础信息</span>
</div>
<!--初始化流程加载表单信息-->
<el-col :span="16" :offset="4" v-if="formConfOpen" >
<div class="test-form">
<el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled=!applyIsRevoked>
<el-form-item label="所属项目">
<el-select v-model="form.projectId"
clearable
filterable
placeholder="请选择">
<el-option
v-for="(item,index) in projectList"
:key="index"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目问题">
<el-input type="textarea" v-model="form.issue"/>
</el-form-item>
<el-form-item label="解决方案">
<el-input type="textarea" v-model="form.solution"/>
</el-form-item>
<el-form-item label="工作记录">
<el-input type="textarea" v-model="form.workRecord"/>
</el-form-item>
<el-form-item v-if="applyIsRevoked" label="附件上传" prop="remark">
<el-upload
class="upload-demo"
:action="uploadFileUrl"
:on-error="handleUploadError"
:on-preview="handlePreview"
:on-success="handleSuccess"
:on-remove="handleRemove"
:headers="headers"
:file-list="fileList">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</el-form-item>
<el-form-item v-if="!applyIsRevoked" label="附件">
<div v-for="(item,index) in uploadedImgs" class="demo-image__preview">
<el-row :span="24">
<el-col :span="6">
<el-image
style="width: 100px; height: 100px"
:src="'data:image/png;base64,'+item.base64"
:preview-src-list="['data:image/png;base64,'+item.base64]">
</el-image>
</el-col>
<el-col :span="2">
<span>{{item.name}}</span>
</el-col>
</el-row>
</div>
<div v-for="(item,index) in uploadedFiles" class="demo-image__preview">
<span>{{item.name}}</span>
</div>
</el-form-item>
</el-form>
</div>
<div style="margin-left:10%;margin-bottom: 20px;font-size: 14px;" v-if=applyIsRevoked>
<el-button icon="el-icon-edit-outline" type="success" size="mini" @click="handleClaimAndComplete"></el-button>
</div>
</el-col>
</el-card>
</el-dialog>
</div>
</template>
<script>
import {flowRecord} from "@/api/flowable/finished";
import Parser from '@/components/parser/Parser'
import {definitionStart, getProcessVariables, readXml, getFlowViewer} from "@/api/flowable/definition";
import {complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate} from "@/api/flowable/todo";
import flow from '@/views/flowable/task/record/flow'
import {treeselect} from "@/api/system/dept";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect";
import {listUser} from "@/api/system/user";
import {optionProject} from "@/api/system/project";
import {getToken} from "@/utils/auth";
export default {
name: "Record",
components: {
Parser,
flow,
Treeselect
},
props: {},
data() {
return {
// xml
xmlData: "",
taskList: [],
//
deptName: undefined,
//
deptOptions: undefined,
//
userList: null,
defaultProps: {
children: "children",
label: "label"
},
//
queryParams: {
deptId: undefined
},
open: false,
//
loading: true,
applyIsRevoked: false,
flowRecordList: [], //
formConfCopy: {},
src: null,
rules: {}, //
variablesForm: {}, //
taskForm:{
returnTaskShow: false, // 退
delegateTaskShow: false, // 退
defaultTaskShow: true, //
sendUserShow: false, //
multiple: false,
comment:"", //
procInsId: "", //
instanceId: "", //
deployId: "", //
taskId: "" ,//
procDefId: "", //
vars: "",
targetKey:""
},
userDataList:[], //
assignee: null,
formConf: {}, //
formConfOpen: false, //
variables: [], //
variablesData: {}, //
variableOpen: false, //
//
form: {
projectId: 0,
workRecord: '',
issue: '',
submitDate: '',
solution: '',
attachmentIds:''
},
fileIdList: [],
fileList: [],
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/attachment/upload", //
headers: {
Authorization: "Bearer " + getToken(),
},
uploadedImgs: [],
uploadedFiles: [],
projectList: [],
returnTaskList: [], // 退
finished: 'false',
completeTitle: null,
completeOpen: false,
returnTitle: null,
returnOpen: false,
rejectOpen: false,
rejectTitle: null,
userData:[],
checkSendUser: false //
};
},
// activated() {
// this.taskForm.deployId = this.$route.query && this.$route.query.deployId;
// this.taskForm.taskId = this.$route.query && this.$route.query.taskId;
// this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
// this.taskForm.executionId = this.$route.query && this.$route.query.executionId;
// this.taskForm.instanceId = this.$route.query && this.$route.query.procInsId;
// //
// this.taskForm.procDefId = this.$route.query && this.$route.query.procDefId;
// //
// this.getFlowViewer(this.taskForm.procInsId,this.taskForm.executionId);
// this.getModelDetail(this.taskForm.deployId);
// //
// if (this.taskForm.taskId){
// this.processVariables( this.taskForm.taskId)
// this.getNextFlowNode(this.taskForm.taskId)
// this.taskForm.deployId = null
// }
// this.optionList();
// this.getFlowRecordList( this.taskForm.procInsId, this.taskForm.deployId);
// this.finished = this.$route.query && this.$route.query.finished
// this.fileIdList = []
// this.uploadedFiles = []
// this.uploadedImgs = []
// },
methods: {
init(procInsId, deployId, taskId, finished) {
this.uploadedImgs = []
this.open = true
this.taskForm.deployId = deployId;
this.taskForm.taskId = taskId;
this.taskForm.procInsId = procInsId;
// this.taskForm.executionId = this.$route.query && this.$route.query.executionId;
// this.taskForm.instanceId = this.$route.query && this.$route.query.procInsId;
//
// this.taskForm.procDefId = this.$route.query && this.$route.query.procDefId;
//
this.getFlowViewer(this.taskForm.procInsId, this.taskForm.executionId);
this.getModelDetail(this.taskForm.deployId);
//
if (this.taskForm.taskId) {
this.processVariables(this.taskForm.taskId)
this.getNextFlowNode(this.taskForm.taskId)
this.taskForm.deployId = null
}
this.optionList();
this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
this.finished = finished;
},
/** 查询部门下拉树结构 */
getTreeselect() {
treeselect().then(response => {
this.deptOptions = response.data;
});
},
/** 查询用户列表 */
getList() {
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows;
this.total = response.total;
}
);
},
//
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
//
handleNodeClick(data) {
this.queryParams.deptId = data.id;
this.getList();
},
/** xml 文件 */
getModelDetail(deployId) {
// xml
readXml(deployId).then(res => {
this.xmlData = res.data
})
},
getFlowViewer(procInsId,executionId) {
getFlowViewer(procInsId,executionId).then(res => {
this.taskList = res.data
})
},
isRefuse(comment) {
return comment !== null &&comment !== undefined && comment.type !== null && comment.type !== undefined && comment.type === "3"
},
setIcon(finishTime,comment) {
console.log('setIcon::',comment)
//
if (this.isRefuse(comment)) {
return "el-icon-close";
} else if (finishTime) {
return "el-icon-check";
} else {
return "el-icon-time";
}
},
setColor(val) {
if (val) {
return "#2bc418";
} else {
return "#b3bdbb";
}
},
//
handleSelectionChange(selection) {
if (selection) {
this.userData = selection
const selectVal = selection.map(item => item.userId);
if (selectVal instanceof Array) {
this.taskForm.values = {
"approval": selectVal.join(',')
}
} else {
this.taskForm.values = {
"approval": selectVal
}
}
}
},
//
handleClose(tag) {
this.userData.splice(this.userData.indexOf(tag), 1);
this.$refs.singleTable.toggleRowSelection(tag, false)
},
/** 流程变量赋值 */
handleCheckChange(val) {
if (val instanceof Array) {
this.taskForm.values = {
"approval": val.join(',')
}
} else {
this.taskForm.values = {
"approval": val
}
}
},
/** 流程流转记录 */
getFlowRecordList(procInsId, deployId) {
const params = {procInsId: procInsId, deployId: deployId}
flowRecord(params).then(res => {
this.flowRecordList = res.data.flowList;
this.uploadedImgs = res.data.imgs;
this.uploadedFiles = res.data.files;
//
// if (res.data.formData) {
this.form = res.data.form;
console.log("res.data.form;", res.data.form)
console.log("this.form ", this.form)
if (this.taskForm.executionId === undefined) {
this.formConfOpen = true
if (this.flowRecordList && this.flowRecordList.length !== 0) {
console.log("this.flowRecordList[0]", this.flowRecordList[0])
this.applyIsRevoked = this.flowRecordList[0].taskName === '提交汇报';
console.log("applyIsRevoked", this.applyIsRevoked)
}
}
// }
}).catch(res => {
this.goBack();
})
},
fillFormData(form, data) {
form.fields.forEach(item => {
const val = data[item.__vModel__]
if (val) {
item.__config__.defaultValue = val
}
})
},
/** 获取流程变量内容 */
processVariables(taskId) {
if (taskId) {
//
getProcessVariables(taskId).then(res => {
// this.variables = res.data.variables;
this.form = res.data;
this.variableOpen = true
});
}
},
/** 查询项目列表 */
optionList() {
this.loading = true;
optionProject().then(response => {
this.projectList = response.data;
this.loading = false;
});
},
/** 根据当前任务或者流程设计配置的下一步节点 */
getNextFlowNode(taskId) {
// todo
const params = {taskId: taskId}
getNextFlowNode(params).then(res => {
const data = res.data;
if (data) {
this.checkSendUser = true
if (data.type === 'assignee') { //
this.userDataList = res.data.userList;
} else if (data.type === 'candidateUsers') { // ()
this.userDataList = res.data.userList;
this.taskForm.multiple = true;
} else if (data.type === 'candidateGroups') { // ()
res.data.roleList.forEach(role => {
role.userId = role.roleId;
role.nickName = role.roleName;
})
this.userDataList = res.data.roleList;
this.taskForm.multiple = false;
} else if (data.type === 'multiInstance') { // ?
this.userDataList = res.data.userList;
this.taskForm.multiple = true;
}else if (data.type === 'fixed') { //
this.checkSendUser = false;
}
}
})
},
/** 审批任务选择 */
handleComplete() {
this.completeOpen = true;
this.completeTitle = "审批流程";
this.getTreeselect();
}, /** 确认并提交任务选择 */
handleClaimAndComplete() {
if (this.fileIdList.length > 0) {
this.form.attachmentIds=this.fileIdList.map(e => e.id).join(',')
console.log("this.form.attachmentIds", this.form.attachmentIds);
}
this.taskForm.comment = '提交任务';
this.taskForm.vars= JSON.stringify(this.form)
this.taskForm.taskId= this.flowRecordList[0].taskId
complete(this.taskForm).then(response => {
this.msgSuccess(response.msg);
this.goBack();
});
},
/** 审批任务 */
taskComplete() {
if (!this.taskForm.values && this.checkSendUser){
this.msgError("请选择流程接收人员");
return;
}
if (!this.taskForm.comment){
this.msgError("请输入审批意见");
return;
}
complete(this.taskForm).then(response => {
this.msgSuccess(response.msg);
this.goBack();
});
},
/** 委派任务 */
handleDelegate() {
this.taskForm.delegateTaskShow = true;
this.taskForm.defaultTaskShow = false;
},
handleAssign(){
},
/** 返回页面 */
goBack() {
//
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1)
},
/** 接收子组件传的值 */
getData(data) {
if (data) {
const variables = [];
data.fields.forEach(item => {
let variableData = {};
variableData.label = item.__config__.label
//
if (item.__config__.defaultValue instanceof Array) {
const array = [];
item.__config__.defaultValue.forEach(val => {
array.push(val)
})
variableData.val = array;
} else {
variableData.val = item.__config__.defaultValue
}
variables.push(variableData)
})
this.variables = variables;
}
},
/** 申请流程表单数据提交 */
submitForm(data) {
if (data) {
const variables = data.valData;
const formData = data.formData;
formData.disabled = true;
formData.formBtns = false;
if (this.taskForm.procDefId) {
variables.variables = formData;
//
definitionStart(this.taskForm.procDefId, JSON.stringify(variables)).then(res => {
this.msgSuccess(res.msg);
this.goBack();
})
}
}
},
/** 驳回任务 */
handleReject() {
this.rejectOpen = true;
this.rejectTitle = "驳回流程";
},
/** 驳回任务 */
taskReject() {
this.$refs["taskForm"].validate(valid => {
if (valid) {
rejectTask(this.taskForm).then(res => {
this.msgSuccess(res.msg);
this.goBack();
});
}
});
},
/** 可退回任务列表 */
handleReturn() {
this.returnOpen = true;
this.returnTitle = "退回流程";
returnList(this.taskForm).then(res => {
this.returnTaskList = res.data;
this.taskForm.values = null;
})
},
/** 提交退回任务 */
taskReturn() {
this.$refs["taskForm"].validate(valid => {
if (valid) {
returnTask(this.taskForm).then(res => {
this.msgSuccess(res.msg);
this.goBack()
});
}
});
},
/** 取消回退任务按钮 */
cancelTask() {
this.taskForm.returnTaskShow = false;
this.taskForm.defaultTaskShow = true;
this.taskForm.sendUserShow = true;
this.returnTaskList = [];
},
/** 委派任务 */
submitDeleteTask() {
this.$refs["taskForm"].validate(valid => {
if (valid) {
delegate(this.taskForm).then(response => {
this.msgSuccess(response.msg);
this.goBack();
});
}
});
},
/** 取消回退任务按钮 */
cancelDelegateTask() {
this.taskForm.delegateTaskShow = false;
this.taskForm.defaultTaskShow = true;
this.taskForm.sendUserShow = true;
this.returnTaskList = [];
},
handleRemove(file, fileList) {
// id
console.log(file, fileList);
for(var i = this.fileIdList.length -1; i >= 0 ; i--){
if(this.fileIdList[i].uid == file.uid){
// fileIdListid
this.fileIdList.splice(i, 1);
}
}
},
handleUploadError(err, file, fileList) {
this.$message.error("上传失败, 请重试");
},
handleSuccess(res, file, fileList) {
if (res.code !== 200) {
this.$message.error("上传失败, 请重试");
return
}
this.fileIdList.push({
id:res.data.id,
uid:file.uid // id
})
// id
},
handlePreview(file) {
console.log(file);
}
}
};
</script>
<style lang="scss" scoped>
.test-form {
margin: 15px auto;
width: 800px;
padding: 15px;
}
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
.clearfix:after {
clear: both
}
.box-card {
width: 100%;
margin-bottom: 20px;
}
.el-tag + .el-tag {
margin-left: 10px;
}
.my-label {
background: #E1F3D8;
}
</style>

@ -43,7 +43,7 @@
<el-table v-loading="loading" :data="todoList" border @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="项目名称" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="工作问题" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<el-table-column label="工作事项" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<el-table-column label="任务节点" align="center" prop="taskName"/>
<el-table-column label="流程发起人" align="center">
<template slot-scope="scope">

@ -82,7 +82,7 @@
</template>
</el-table-column>
<el-table-column label="项目名称" align="center" prop="projectName" :show-overflow-tooltip="true"/>
<el-table-column label="工作问题" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<el-table-column label="工作事项" align="center" prop="workIssue" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="流程类别" align="center" prop="category" width="100px" />-->
<!-- <el-table-column label="流程版本" align="center" width="80px">-->
<!-- <template slot-scope="scope">-->

Loading…
Cancel
Save