From 5c929cfb5286a31a4e067cbc61e8774f4e7d42ae Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 06 五月 2025 11:25:41 +0800
Subject: [PATCH] 任务查看:任务名称undefined解决
---
src/views/flowable/task/myProcess/send/index.vue | 725 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 636 insertions(+), 89 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index b235359..32bbe07 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -1,36 +1,74 @@
<template>
<div class="app-container">
<el-card class="box-card" >
- <div slot="header" class="clearfix">
- <span class="el-icon-document">{{`娴佺▼澶勭悊锛歚 + processName}}</span>
+ <div slot="header" class="clearfix" style="display: flex">
+ <div style="flex: 1" class="el-icon-document">{{`浠诲姟鍔炵悊锛歚 + processName}}</div>
+ <div style="flex: 2; color: #303133">{{projectName + '鈥斺��' + flowName}}</div>
<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-tab-pane label="琛ㄥ崟淇℃伅" name="1">
<!--鍒濆鍖栨祦绋嬪姞杞借〃鍗曚俊鎭�-->
- <el-col :span="16" :offset="4" v-if="formDataList && formDataList.length > 0">
- <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp" style="position: relative">
- <div v-if="!formDataObj.current" style="position: absolute; top: 2px; right: 2px">
- <el-button type="danger" disabled>椹冲洖(鍔熻兘寮�鍙戜腑)</el-button>
+ <el-col :span="24" v-loading="formLoading" class="tab-min-height">
+ <div v-if="formDataList && formDataList.length > 0">
+ <div v-for="(formDataObj, index) in formDataList" :key="index" class="form-warp">
+ <el-row>
+ <el-col :span="18" style="position: relative">
+ <div v-if="formDataObj.current">
+ <!-- 褰撳墠鑺傜偣鍙崗鍚屻�佽浆鍔炵瓑鎿嶄綔 -->
+ <div class="op-list">
+ <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '鎸傝捣' || submitLoading" v-loading="submitLoading" @click="submitForm">纭骞舵彁浜�</el-button>
+ <!-- <el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>-->
+ <el-button size="small" type="primary" v-if="!isWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
+ <el-button v-if="formDataObj.canJump && !isWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="jumpTask()">璺宠繃</el-button>
+ <el-button v-if="formDataObj.canWait && !isWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="waitTask()">瀹圭己</el-button>
+ <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus !== '鎸傝捣' && !isWait" size="small" type="primary" @click="hangup">鎸傝捣</el-button>
+ <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus === '鎸傝捣' && !isWait" size="small" type="primary" @click="cancelHangup">缁撴潫鎸傝捣</el-button>
+ </div>
+ <div class="current">褰撳墠闃舵锛�<span>{{formDataObj.beforeNodeName}}</span><span v-if="formDataObj.taskStatus === 'HANGUP'">锛堟寕璧蜂腑锛�</span></div>
+ </div>
+ <div v-else-if="formDataList.length > 1">
+ <!-- 鍓嶇疆鑺傜偣鍙┏鍥� -->
+ <div class="reject-but">
+ <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeName)">椹� 鍥�</el-button>
+ </div>
+ <div class="before">鍓嶇疆闃舵锛�<span>{{formDataObj.beforeNodeName}}</span></div>
+ </div>
+ <div v-if="formDataObj != null && formDataObj.formJsonObj != null">
+ <v-form-render :form-data="formDataObj.formJsonObj.formJson" :ref="'form' + index"/>
+ </div>
+ <div v-else>
+ <el-alert
+ title="鏈粦瀹氳〃鍗�"
+ type="warning"
+ :closable="false"
+ >
+ </el-alert>
+ </div>
+ <div v-if="formDataList.length <= 1">
+ <div class="before_none">鍓嶇疆闃舵锛�<span>涓嶅瓨鍦ㄥ墠缃樁娈�</span></div>
+ <el-alert
+ title="涓嶅瓨鍦ㄥ墠缃樁娈�"
+ type="warning"
+ :closable="false"
+ >
+ </el-alert>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <log-time-line v-if="formDataObj.events.length > 0" :log-list="formDataObj.events"/>
+ </el-col>
+ </el-row>
</div>
- <div v-if="formDataObj.current" style="margin-bottom: 15px;color: #409eff">褰撳墠闃舵锛�<span style="color: red">{{formDataObj.beforeNodeName}}</span></div>
- <div v-else style="margin-bottom: 15px;color: #409eff">鍓嶇疆闃舵锛�<span style="color: #d5904b">{{formDataObj.beforeNodeName}}</span></div>
- <v-form-render :form-data="formDataObj.formJson" :ref="'form' + index"/>
- </div>
-
-<!-- <v-form-render :form-data="formRenderData" ref="vFormRef"/>-->
- <div style="display: flex;justify-content: center; align-items: center; margin: 20px 0">
- <el-button type="primary" @click="submitForm">纭骞舵彁浜�</el-button>
- <el-button type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
- <el-button type="primary" disabled @click="submitForm">杞氦浠栦汉鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>
-<!-- <el-button type="primary" @click="resetForm">閲� 缃�</el-button>-->
</div>
</el-col>
</el-tab-pane>
<!--娴佺▼鍥�-->
<el-tab-pane label="娴佺▼鍥�" name="2">
- <bpmn-viewer :flowData="flowData"/>
+ <div v-loading="imgLoading" class="tab-min-height">
+ <bpmn-viewer :flowData="flowData" :procInsId="procInsId"/>
+ </div>
</el-tab-pane>
</el-tabs>
<!--閫夋嫨娴佺▼鎺ユ敹浜�-->
@@ -43,28 +81,165 @@
</span>
</el-dialog>
</el-card>
+
+
+ <el-dialog
+ :title="`椹冲洖锛歚 + rejectForm.taskName"
+ :visible.sync="rejectShow"
+ width="950px"
+ :destroy-on-close="true"
+ :close-on-click-modal="false"
+ >
+ <div>
+ <el-input
+ type="textarea"
+ :rows="3"
+ placeholder="瀹℃牳寤鸿"
+ v-model="rejectForm.comment">
+ </el-input>
+ </div>
+ <div class="opBut">
+ <el-button type="danger" size="small" :disabled="rejectLoading" v-loading="rejectLoading" @click="rejectTask">椹冲洖</el-button>
+ </div>
+ </el-dialog>
+
+ <el-dialog
+ :title="`杞姙锛歚 + delegationForm.taskName"
+ :visible.sync="delegationShow"
+ width="950px"
+ :destroy-on-close="true"
+ :close-on-click-modal="false"
+ >
+ <div>
+ <el-form :model="delegationForm" :rules="delegationFormRules" ref="delegationForm" label-width="100px" class="demo-ruleForm">
+ <el-alert
+ title="璇烽�夋嫨瑕佽浆鍔炵殑鐢ㄦ埛瀵硅薄锛岀敤鎴风被鍨嬩笉鍚屽鐞嗕汉涓嶅悓"
+ type="info"
+ :closable="false"
+ style="margin-bottom: 8px"
+ show-icon>
+ </el-alert>
+ <el-form-item label="鐢ㄦ埛绫诲瀷" prop="peopleType">
+ <el-select v-model="delegationForm.peopleType" @change="peopleTypeChange" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
+ <el-option label="鎸囧畾浜哄憳" value="FIX_USER"></el-option>
+ <el-option label="鍊欓�変汉鍛�" value="USER"></el-option>
+ <el-option label="鍊欓�夐儴闂�" value="DEPT"></el-option>
+ <el-option label="鍊欓�夎鑹�" value="ROLE"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="delegationForm.peopleType === 'DEPT'" label="鍊欓�夐儴闂�" prop="targetId">
+ <MyDept ref="dept" :checkeds="delegationDeptSelect" :title="`閫夋嫨杞姙閮ㄩ棬`" :show="deptShow" @close="closeDept" @submit="getDeptSelect" :key="deptKey"/>
+ <div style="display: flex;align-items: center">
+ <div>
+ <el-tag v-for="dept in delegationDeptSelect" :key="dept.id + 'zxc'" type="info" closable @close="removeDept(dept)">{{dept.label}}</el-tag>
+ </div>
+ <el-button style="margin-left: 8px" type="text" @click="editDept">閫夋嫨</el-button>
+ </div>
+ </el-form-item>
+ <el-form-item v-if="delegationForm.peopleType === 'FIX_USER'" label="鎸囧畾浜哄憳" prop="targetId">
+ <single-user ref="singleUser" :select-user="delegationForm.targetId" :title="`閫夋嫨杞姙鎺ユ敹浜哄憳(鍗曚汉)`" :show="singleUserShow" @close="closeSingleUser" @submit="getSingleUserSelect" :key="singleUserKey"/>
+ <div style="display: flex;align-items: center">
+ <div>
+ <el-tag v-for="user in delegationUserSelect" :key="user.userId + 'abc'" type="info" closable @close="removeSingleUser(user)">{{user.nickName}}</el-tag>
+ </div>
+ <el-button style="margin-left: 8px" type="text" @click="editSingleUser">閫夋嫨</el-button>
+ </div>
+ </el-form-item>
+ <el-form-item v-if="delegationForm.peopleType === 'USER'" label="鍊欓�変汉鍛�" prop="targetId">
+ <mult-user ref="multUser" :select-user="delegationUserSelect" :title="`閫夋嫨杞姙鎺ユ敹浜哄憳(鍙浜�)`" :show="multUserShow" @close="closeMultUser" @submit="getMultUserSelect" :key="multUserKey"/>
+ <div style="display: flex;align-items: center">
+ <div>
+ <el-tag v-for="user in delegationUserSelect" :key="user.userId + 'qwe'" type="info" closable @close="removeMultUser(user)">{{user.nickName}}</el-tag>
+ </div>
+ <el-button style="margin-left: 8px" type="text" @click="editMultUser">閫夋嫨</el-button>
+ </div>
+ </el-form-item>
+ <el-form-item v-if="delegationForm.peopleType === 'ROLE'" label="鍊欓�夎鑹�" prop="targetId">
+ <my-role ref="role" :select-values="delegationRoleSelect" :title="`閫夋嫨杞姙瑙掕壊`" :show="roleShow" @close="closeRole" @submit="getRoleSelect" :key="roleKey"/>
+ <div style="display: flex;align-items: center">
+ <div>
+ <el-tag v-for="role in delegationRoleSelect" :key="role.roleId + 'rty'" type="info" closable @close="removeRole(role)">{{role.roleName}}</el-tag>
+ </div>
+ <el-button style="margin-left: 8px" type="text" @click="editRole">閫夋嫨</el-button>
+ </div>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="opBut">
+ <el-button type="danger" size="small" :disabled="delegationButLoading" v-loading="delegationButLoading" @click="delegation">杞� 鍔�</el-button>
+ </div>
+ </el-dialog>
+
</div>
</template>
<script>
import {definitionStart, flowXmlAndNode} from "@/api/flowable/definition";
import BpmnViewer from '@/components/Process/viewer';
-import {completeSubmitFormTask} from "@/api/flowable/process";
+import MyDept from '@/components/flow/Dept/MyDept'
+import SingleUser from '@/components/flow/User/SingleUser'
+import MultUser from '@/components/flow/User/MultUser'
+import MyRole from '@/components/flow/Role/MyRole'
+import {completeSubmitFormTask, waitCompleteSubmitFormTask} from "@/api/flowable/process";
import { flowTaskForm } from "@/api/flowable/todo";
import {getNextFlowNodeByStart} from "@/api/flowable/todo";
-import FlowUser from '@/components/flow/User'
-import FlowRole from '@/components/flow/Role'
+import LogView from "@/views/projectProcess/components/LogView";
+import LogTimeLine from "@/views/projectProcess/components/LogTimeLine";
+import {rejectTask} from "@/api/flowable/process";
+import {cancelTaskHangup, taskDelegation, taskHangup, taskJump, taskWait} from "@/api/projectProcess/projectProcess";
export default {
name: "Record",
components: {
BpmnViewer,
- FlowUser,
- FlowRole,
+ MyRole,
+ MyDept,
+ SingleUser,
+ MultUser,
+ LogView,
+ LogTimeLine
},
props: {},
data() {
return {
+ isWait: false,
+ jumpDesc: '', // 璺宠繃璇存槑
+ rejectLoading: false, // 椹冲洖鎸夐挳鍔犺浇
+ submitLoading: false, // 鎻愪氦鎸夐挳鍔犺浇
+ delegationButLoading: false, // 杞姙鎸夐挳鍔犺浇
+ formLoading: false, // 鍔犺浇褰撳墠鍠濆墠缃妭鐐规暟鎹�
+ imgLoading: false, // 鍔犺浇娴佺▼鍥�
+ roleKey: 'role',
+ deptKey: 'dept',
+ multUserKey: 0,
+ singleUserKey: 'single',
+ projectName: '',
+ flowName: '',
+ roleShow: false, // 瑙掕壊缁勬樉绀�
+ delegationRoleSelect: [], // 閫変腑瑙掕壊
+ multUserShow: false, // 鐢ㄦ埛缁勬樉绀�
+ singleUserShow: false, // 鎸囧畾鐢ㄦ埛鏄剧ず
+ delegationUserSelect: [], // 閫変腑鐨勭敤鎴�
+ deptShow: false, // 閮ㄩ棬缁勬樉绀�
+ delegationDeptSelect: [], // 閫変腑閮ㄩ棬
+ delegationFormRules: {
+ peopleType: [
+ { required: true, message: '璇烽�夋嫨鐢ㄦ埛绫诲瀷', trigger: 'change' }
+ ],
+ targetId: [
+ { required: true, message: '璇烽�夋嫨杞姙瀵硅薄', trigger: 'blur' }
+ ],
+ },
+ delegationForm: { // 杞姙琛ㄥ崟
+ taskId: '',
+ peopleType: '',
+ targetId: '',
+ taskName: '',
+ processInsId: '',
+ projectId: '',
+ },
+ delegationShow: false, // 杞姙鏄剧ず
+ rejectShow: false, // 椹冲洖鏄剧ず
goBackParams: {},
formDataList: [], // 琛ㄥ崟鍒楄〃
taskId: '',
@@ -80,6 +255,7 @@
loading: true,
deployId: "", // 娴佺▼瀹氫箟缂栧彿
procDefId: "", // 娴佺▼瀹炰緥缂栧彿
+ procInsId: "", // 娴佺▼瀹炰緥缂栧彿
formRenderData: {},
formRenderDataList: [],
variables: [], // 娴佺▼鍙橀噺鏁版嵁
@@ -91,23 +267,343 @@
checkValues: null, // 閫変腑浠诲姟鎺ユ敹浜哄憳鏁版嵁
formData: {}, // 濉啓鐨勮〃鍗曟暟鎹�,
multiInstanceVars: '', // 浼氱鑺傜偣
- formJson: {} // 琛ㄥ崟json
+ formJson: {}, // 琛ㄥ崟json
+ rejectForm: {
+ comment: '', // 瀹℃牳鎰忚
+ taskId: '',
+ taskName: '' // 琚┏鍥炵殑浠诲姟k
+ }
};
},
mounted() {
this.processName = this.$route.query && this.$route.query.processName;
this.deployId = this.$route.query && this.$route.query.deployId;
this.taskId = this.$route.query && this.$route.query.taskId;
+ this.projectName = this.$route.query && this.$route.query.projectName;
+ this.projectId = this.$route.query && this.$route.query.projectId;
+ this.flowName = this.$route.query && this.$route.query.flowName;
// 鍒濆鍖栬〃鍗�
this.procDefId = this.$route.query && this.$route.query.procDefId;
+ this.procInsId = this.$route.query && this.$route.query.procInsId;
this.goBackParams = this.$route.query && this.$route.query.goBackParams;
+ this.isWait = this.$route.query && this.$route.query.isWait === 'true' ? true : false;
// this.getNextFlowNodeByStart(this.deployId);
this.getFlowFormData(this.taskId);
},
methods: {
+ // 鎸傝捣浠诲姟
+ hangup() {
+ this.$prompt('澶囨敞璇存槑', '纭畾瑕佹寕璧锋浠诲姟鍚�', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputType: 'textarea'
+ // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
+ // inputErrorMessage: '閭鏍煎紡涓嶆纭�'
+ }).then(({ value }) => {
+ let hangupForm = {
+ taskId: this.taskId,
+ projectId: this.projectId,
+ processInsId: this.procInsId,
+ reason: value
+ }
+ taskHangup(hangupForm).then(res => {
+ this.$message.success("鎿嶄綔鎴愬姛")
+ this.goBack()
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堟寕璧锋搷浣�'
+ });
+ });
+ },
+ // 鎸傝捣浠诲姟
+ cancelHangup() {
+ this.$confirm('纭畾瑕佸彇娑堟寕璧峰悧?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ let cancelHangupForm = {
+ taskId: this.taskId,
+ projectId: this.projectId,
+ processInsId: this.procInsId
+ }
+ cancelTaskHangup(cancelHangupForm).then(res => {
+ this.$message.success("鎿嶄綔鎴愬姛")
+ this.goBack()
+ })
+ })
+ },
+ // 瀹圭己浠诲姟
+ waitTask() {
+ this.$prompt('澶囨敞璇存槑', '纭畾瑕佸缂烘浠诲姟鍚�', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputType: 'textarea',
+ inputValidator: (value) => {
+ if (!value || value.trim() === '') {
+ return "璇峰～鍐欏娉ㄨ鏄�"
+ }
+ return true
+ },
+ inputErrorMessage: '璇峰～鍐欏娉ㄨ鏄�'
+ }).then(({ value }) => {
+ let waitForm = {
+ taskId: this.taskId,
+ projectId: this.projectId,
+ processInsId: this.procInsId,
+ desc: value
+ }
+ taskWait(waitForm).then(res => {
+ this.$message.success("鎿嶄綔鎴愬姛")
+ this.goBack()
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝缂烘搷浣�'
+ });
+ });
+ },
+ // 璺宠繃浠诲姟
+ jumpTask() {
+ this.$prompt('澶囨敞璇存槑', '纭畾瑕佽烦杩囨浠诲姟鍚�', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputType: 'textarea',
+ inputValidator: (value) => {
+ if (!value || value.trim() === '') {
+ return "璇峰～鍐欏娉ㄨ鏄�"
+ }
+ return true
+ },
+ inputErrorMessage: '璇峰～鍐欏娉ㄨ鏄�'
+ }).then(({ value }) => {
+ let jumpForm = {
+ taskId: this.taskId,
+ projectId: this.projectId,
+ processInsId: this.procInsId,
+ desc: value
+ }
+ taskJump(jumpForm).then(res => {
+ this.$message.success("鎿嶄綔鎴愬姛")
+ this.goBack()
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堣烦杩囨搷浣�'
+ });
+ });
+ },
+ removeDept(dept) {
+ let index = this.delegationDeptSelect.indexOf(dept);
+ if (index !== -1) {
+ this.delegationDeptSelect.splice(index, 1);
+ }
+ this.delegationForm.targetId = this.delegationDeptSelect.map(item => item.id).join(",")
+ },
+ removeRole(role) {
+ let index = this.delegationRoleSelect.indexOf(role);
+ if (index !== -1) {
+ this.delegationRoleSelect.splice(index, 1);
+ }
+ this.delegationForm.targetId = this.delegationRoleSelect.map(item => item.roleId).join(",")
+ },
+ removeMultUser(user) {
+ let index = this.delegationUserSelect.indexOf(user);
+ if (index !== -1) {
+ this.delegationUserSelect.splice(index, 1);
+ }
+ this.delegationForm.targetId = this.delegationUserSelect.map(item => item.userId).join(",")
+ },
+ removeSingleUser(user) {
+ // 鍥犱负鍙兘閫変竴涓敤鎴凤紝鎵�浠ュ垹浜嗗氨娌′簡
+ this.delegationUserSelect = []
+ this.delegationForm.targetId = ''
+ },
+ getTips() {
+ if (this.delegationForm.peopleType === 'USER' || this.delegationForm.peopleType === 'FIX_USER') {
+ return this.delegationUserSelect.map(item => item.nickName).join("銆�")
+ } else if (this.delegationForm.peopleType === 'DEPT') {
+ return this.delegationDeptSelect.map(item => item.label).join("銆�")
+ } else if (this.delegationForm.peopleType === 'ROLE') {
+ return this.delegationRoleSelect.map(item => item.roleName).join("銆�")
+ }
+ },
+ delegation() {
+ this.$refs['delegationForm'].validate((valid) => {
+ if (valid) {
+ this.$confirm(`纭畾瑕佸皢姝や换鍔′氦鐢便��${this.getTips()}銆戝鐞嗗悧?`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.delegationForm.projectId = this.projectId
+ this.delegationForm.processInsId = this.procInsId
+ this.delegationButLoading = true
+ taskDelegation(this.delegationForm).then(res => {
+ this.$message.success("宸插彂璧疯浆鍔炵敵璇�")
+ this.delegationButLoading = false
+ this.delegationShow = false
+ this.goBack()
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堣浆鍔炴搷浣�'
+ });
+ });
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
+ peopleTypeChange(val) {
+ if (val === 'DEPT') {
+ this.$nextTick(() => {
+ this.$refs.dept.setCheckList(this.delegationDeptSelect)
+ })
+ this.deptShow = true
+ } else if (val === 'FIX_USER') {
+ this.singleUserShow = true
+ } else if (val === 'USER') {
+ this.multUserShow = true
+ } else if (val === 'ROLE') {
+ this.roleShow = true
+ }
+ },
+ editDept() {
+ this.deptKey += '1'
+ this.$nextTick(() => {
+ this.$refs.dept.setCheckList(this.delegationDeptSelect)
+ })
+ this.deptShow = true
+ },
+ editSingleUser() {
+ if (this.delegationUserSelect && this.delegationUserSelect.length > 0) {
+ this.singleUserKey += '1'
+ this.$nextTick(() => {
+ this.$refs.singleUser.setChecked(this.delegationUserSelect[0])
+ })
+ }
+ this.singleUserShow = true
+ },
+ editRole() {
+ if (this.delegationRoleSelect && this.delegationRoleSelect.length > 0) {
+ this.roleKey += '1'
+ this.$nextTick(() => {
+ this.$refs.role.setChecked(this.delegationRoleSelect)
+ })
+ }
+ this.roleShow = true
+ },
+ editMultUser() {
+ if (this.delegationForm.targetId) {
+ this.multUserKey += 1
+ this.$nextTick(() => {
+ this.$refs.multUser.setChecked(this.delegationUserSelect)
+ })
+ }
+ this.multUserShow = true
+ },
+ getDeptSelect(deptList) {
+ if (deptList && deptList.length > 0) {
+ this.delegationForm.targetId = deptList.map(item => item.id).join(",")
+ this.delegationDeptSelect = deptList
+ } else {
+ this.delegationDeptSelect = []
+ }
+ this.deptShow = false
+ this.deptKey += 1
+ },
+ getMultUserSelect(userList) {
+ if (userList && userList.length > 0) {
+ this.delegationForm.targetId = userList.map(item => item.userId).join(",")
+ this.delegationUserSelect = userList
+ } else {
+ this.delegationForm.targetId = ''
+ this.delegationUserSelect = []
+ }
+ this.multUserShow = false
+ this.multUserKey += 1
+ },
+ getRoleSelect(roleList) {
+ if (roleList && roleList.length > 0) {
+ this.delegationForm.targetId = roleList.map(item => item.roleId).join(",")
+ this.delegationRoleSelect = roleList
+ } else {
+ this.delegationForm.targetId = ''
+ this.delegationRoleSelect = []
+ }
+ this.roleShow = false
+ this.roleKey += '1'
+ },
+ getSingleUserSelect(user) {
+ if (user) {
+ this.delegationForm.targetId = user.userId
+ this.delegationUserSelect = [user]
+ } else {
+ this.delegationForm.targetId = ''
+ this.delegationUserSelect = []
+ }
+ this.singleUserShow = false
+ this.singleUserKey += '1'
+ },
+ closeDept() {
+ this.deptShow = false
+ this.deptKey += '1'
+ },
+ closeSingleUser() {
+ this.singleUserShow = false
+ this.singleUserKey += '1'
+ },
+ closeRole() {
+ this.roleShow = false
+ this.roleKey += '1'
+ },
+ closeMultUser() {
+ this.multUserShow = false
+ this.multUserKey += 1
+ },
+ openDelegation(taskName) {
+ this.delegationForm.taskName = taskName
+ this.delegationForm.taskId = this.taskId
+ this.delegationShow = true
+ },
+ rejectTask() {
+ this.$confirm(`纭畾瑕侀┏鍥炰换鍔°��${this.rejectForm.taskName}銆戝悧?`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ this.rejectLoading = true
+ rejectTask(this.rejectForm).then(res => {
+ this.rejectShow = false
+ this.$message.success("椹冲洖鎴愬姛")
+ this.goBack()
+ })
+ }).catch((err) => {
+ console.log(err)
+ this.$message({
+ type: 'info',
+ message: '宸插彇椹冲洖浜ゆ搷浣�'
+ });
+ });
+
+ },
+ openRejectTask(taskName) {
+ this.rejectForm.taskName = taskName;
+ this.rejectForm.taskId = this.taskId;
+ this.rejectShow = true
+ },
handleClick(tab, event) {
if (tab.name === '2'){
- flowXmlAndNode({deployId:this.deployId}).then(res => {
+ this.imgLoading = true
+ flowXmlAndNode({processInsId:this.procInsId,deployId:this.deployId}).then(res => {
+ this.imgLoading = false
this.flowData = res.data;
})
}
@@ -115,22 +611,24 @@
/** 娴佺▼琛ㄥ崟鏁版嵁 */
getFlowFormData(taskId) {
const params = {taskId: taskId}
+ this.formLoading = true
flowTaskForm(params).then(res => {
this.formDataList = res.data
if (this.formDataList && this.formDataList.length > 0) {
this.$nextTick(() => {
this.formDataList.forEach((formDataObj, index) => {
- console.log("琛ㄥ崟鏁版嵁鍒楄〃", formDataObj.formJson)
let that = this
- console.log(eval("that.$refs.form" +index)[0])
- eval("that.$refs.form" +index)[0].setFormJson(formDataObj.formJsonObj.formJson);
-
- eval("that.$refs.form" +index)[0].setFormData(formDataObj.formJsonObj);
+ if (eval("that.$refs.form" +index) && formDataObj.formJsonObj) {
+ eval("that.$refs.form" +index)[0].setFormJson(formDataObj.formJsonObj.formJson);
+ eval("that.$refs.form" +index)[0].setFormData(formDataObj.formJsonObj);
+ }
})
- this.formJson = this.formDataList[0].formJsonObj.formJson
+ if (this.formDataList[0].formJsonObj) {
+ this.formJson = this.formDataList[0].formJsonObj.formJson
+ }
})
-
}
+ this.formLoading = false
// if (res.data.formJson) {
// // 鍥炴樉琛ㄥ崟
// this.$refs.vFormRef.setFormJson(res.data.formJson);
@@ -151,67 +649,79 @@
// })
// }
}).catch(res => {
- console.log("鎶ラ敊浜嗭細", res)
this.goBack();
})
},
/** 杩斿洖椤甸潰 */
goBack() {
+ // 鍏抽棴褰撳墠鏍囩椤�
+ this.$store.dispatch("tagsView/delView", this.$route);
+ // 璺宠浆璺敱
this.$router.push({
path: '/projectFlow/detail',
- query: this.goBackParams
+ query: {
+ projectId: this.projectId,
+ processDefId: this.goBackParams.processDefId,
+ processName: this.goBackParams.processName
+ }
})
},
/** 鐢宠娴佺▼琛ㄥ崟鏁版嵁鎻愪氦 */
submitForm() {
- let that = this
- eval("that.$refs.form" +0)[0].getFormData().then(formData => {
- // 鏍规嵁褰撳墠浠诲姟鎴栬�呮祦绋嬭璁￠厤缃殑涓嬩竴姝ヨ妭鐐� todo 鏆傛椂鏈秹鍙婂埌鑰冭檻缃戝叧銆佽〃杈惧紡鍜屽鑺傜偣鎯呭喌
- getNextFlowNodeByStart({deploymentId: this.deployId, variables: formData}).then(res => {
- const data = res.data;
- if (data) {
- this.formData = formData;
- if (data.dataType === 'dynamic') {
- if (data.type === 'assignee') { // 鎸囧畾浜哄憳
- this.checkSendUser = true;
- this.checkType = "single";
- } else if (data.type === 'candidateUsers') { // 鍊欓�変汉鍛�(澶氫釜)
- this.checkSendUser = true;
- this.checkType = "multiple";
- } else if (data.type === 'candidateGroups') { // 鎸囧畾缁�(鎵�灞炶鑹叉帴鏀朵换鍔�)
- this.checkSendRole = true;
- } else { // 浼氱
- // 娴佺▼璁捐鎸囧畾鐨� elementVariable 浣滀负浼氱浜哄憳鍒楄〃
- this.multiInstanceVars = data.vars;
- this.checkSendUser = true;
- this.checkType = "multiple";
- }
- this.taskOpen = true;
- this.taskTitle = "閫夋嫨浠诲姟鎺ユ敹";
- } else {
- if (this.procDefId) {
- const param = {
- formJson: this.formJson,
- }
- // 澶嶅埗瀵硅薄鐨勫睘鎬у�肩粰鏂扮殑瀵硅薄
- Object.assign(param, formData);
- // 瀹屾垚浠诲姟
- completeSubmitFormTask(this.taskId, param).then(res => {
- this.$modal.msgSuccess(res.msg);
- this.goBack();
- })
- // // 鍚姩娴佺▼骞跺皢琛ㄥ崟鏁版嵁鍔犲叆娴佺▼鍙橀噺
- // definitionStart(this.procDefId, param).then(res => {
- // this.$modal.msgSuccess(res.msg);
- // this.goBack();
- // })
- }
+ this.$confirm(`纭畾瑕佹彁浜や换鍔°��${this.processName}銆戝悧?`, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ let that = this
+ if (eval("that.$refs.form" +0)) {
+ eval("that.$refs.form" +0)[0].getFormData().then(formData => {
+ this.submitLoading = true
+ this.formData = formData
+ const param = {
+ formJson: this.formJson,
}
+ // 澶嶅埗瀵硅薄鐨勫睘鎬у�肩粰鏂扮殑瀵硅薄
+ Object.assign(param, formData);
+ // 瀹屾垚浠诲姟
+ if (this.isWait) {
+ waitCompleteSubmitFormTask(this.taskId, param).then(res => {
+ this.$modal.msgSuccess(res.msg);
+ this.submitLoading = false
+ this.goBack();
+ })
+ } else {
+ completeSubmitFormTask(this.taskId, param).then(res => {
+ this.$modal.msgSuccess(res.msg);
+ this.submitLoading = false
+ this.goBack();
+ })
+ }
+ })
+ } else {
+ // 娌″叧鑱旇〃鍗曠洿鎺ヤ紶绌�
+ if (this.isWait) {
+ waitCompleteSubmitFormTask(this.taskId, {}).then(res => {
+ this.$modal.msgSuccess(res.msg);
+ this.submitLoading = false
+ this.goBack();
+ })
+ } else {
+ completeSubmitFormTask(this.taskId, {}).then(res => {
+ this.$modal.msgSuccess(res.msg);
+ this.submitLoading = false
+ this.goBack();
+ })
}
- })
- }).catch(error => {
- // this.$modal.msgError(error)
- })
+ }
+ }).catch((err) => {
+ console.log(err)
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堟彁浜ゆ搷浣�'
+ });
+ });
+
},
/** 閲嶇疆琛ㄥ崟 */
resetForm() {
@@ -280,12 +790,14 @@
};
</script>
<style lang="scss" scoped>
+.opBut {
+ display: flex;justify-content: center;align-items: center;width: 100%; margin-top: 8px
+}
.test-form {
margin: 15px auto;
width: 800px;
padding: 15px;
}
-
.clearfix:before,
.clearfix:after {
display: table;
@@ -294,26 +806,61 @@
.clearfix:after {
clear: both
}
-
.box-card {
width: 100%;
margin-bottom: 20px;
}
-
.el-tag + .el-tag {
margin-left: 10px;
}
-
.my-label {
background: #E1F3D8;
}
-
.form-warp {
+ min-width: 700px;
padding: 20px;
+ margin-top: 5px;
margin-bottom: 20px;
- box-shadow:
- inset 0 -3em 3em rgba(0, 0, 0, 0.1),
- 0 0 0 2px rgb(239, 239, 239),
- 0.3em 0.3em 1em rgba(0, 0, 0, 0.3);
+ margin-left: 3px;
+ margin-right: 3px;
+ box-shadow: rgba(67, 71, 85, 0.27) 0px 0px 0.25em, rgba(90, 125, 188, 0.05) 0px 0.25em 1em;
+}
+.before {
+ span {
+ color: #F56C6C
+ }
+ margin-bottom: 15px;
+ color: #E6A23C
+}
+.before_none {
+ span {
+ color: #F56C6C
+ }
+ margin-bottom: 15px;
+ margin-top: 15px;
+ color: #E6A23C
+}
+.reject-but {
+ position: absolute;
+ top: -4px;
+ right: 4px
+}
+.current {
+ span {
+ color: #409EFF
+ }
+ margin-bottom: 15px;
+ color: #E6A23C
+}
+.op-list {
+ position: absolute;
+ top: -4px;
+ right: 4px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+.tab-min-height {
+ min-height: 500px;
}
</style>
--
Gitblit v1.8.0