From 5a04ad14ef19b86ad4fd401af5f7d7272e8e01fe Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 14 二月 2025 15:02:58 +0800
Subject: [PATCH] 流程推进详情页查看流程日志优化
---
src/views/flowable/task/myProcess/send/index.vue | 198 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 129 insertions(+), 69 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 4bc56a7..ea5dd7c 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -10,27 +10,29 @@
<!--琛ㄥ崟淇℃伅-->
<el-tab-pane label="琛ㄥ崟淇℃伅" name="1">
<!--鍒濆鍖栨祦绋嬪姞杞借〃鍗曚俊鎭�-->
- <el-col :span="16" :offset="4">
+ <el-col :span="16" :offset="4" 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" style="position: relative">
<div v-if="formDataObj.current">
<!-- 褰撳墠鑺傜偣鍙崗鍚屻�佽浆鍔炵瓑鎿嶄綔 -->
<div class="op-list">
- <el-button size="small" type="primary" @click="submitForm">纭骞舵彁浜�</el-button>
+ <el-button size="small" type="primary" :disabled="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" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
+ <el-button v-if="formDataObj.canJump" size="small" type="primary" @click="jumpTask()">璺宠繃</el-button>
+ <el-button v-if="formDataObj.canWait" size="small" type="primary" >瀹圭己</el-button>
</div>
<div class="current">褰撳墠闃舵锛�<span>{{formDataObj.beforeNodeName}}</span></div>
</div>
<div v-else-if="formDataList.length > 1">
<!-- 鍓嶇疆鑺傜偣鍙┏鍥� -->
<div class="reject-but">
- <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeDefId)">椹� 鍥�</el-button>
+ <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.formJson != null && formDataObj.formJson != ''">
- <v-form-render :form-data="formDataObj.formJson" :ref="'form' + index"/>
+ <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
@@ -41,7 +43,7 @@
</el-alert>
</div>
<div v-if="formDataList.length <= 1">
- <div class="before">鍓嶇疆闃舵锛�<span>涓嶅瓨鍦ㄥ墠缃樁娈�</span></div>
+ <div class="before_none">鍓嶇疆闃舵锛�<span>涓嶅瓨鍦ㄥ墠缃樁娈�</span></div>
<el-alert
title="涓嶅瓨鍦ㄥ墠缃樁娈�"
type="warning"
@@ -55,7 +57,9 @@
</el-tab-pane>
<!--娴佺▼鍥�-->
<el-tab-pane label="娴佺▼鍥�" name="2">
- <bpmn-viewer :flowData="flowData" :procInsId="procInsId"/>
+ <div v-loading="imgLoading" class="tab-min-height">
+ <bpmn-viewer :flowData="flowData" :procInsId="procInsId"/>
+ </div>
</el-tab-pane>
</el-tabs>
<!--閫夋嫨娴佺▼鎺ユ敹浜�-->
@@ -71,7 +75,7 @@
<el-dialog
- :title="`椹冲洖锛歚 + rejectForm.projectName"
+ :title="`椹冲洖锛歚 + rejectForm.taskName"
:visible.sync="rejectShow"
width="950px"
:destroy-on-close="true"
@@ -86,7 +90,7 @@
</el-input>
</div>
<div class="opBut">
- <el-button type="danger" size="small" @click="rejectTask">椹冲洖</el-button>
+ <el-button type="danger" size="small" :disabled="rejectLoading" v-loading="rejectLoading" @click="rejectTask">椹冲洖</el-button>
</div>
</el-dialog>
@@ -153,7 +157,7 @@
</el-form>
</div>
<div class="opBut">
- <el-button type="danger" size="small" @click="delegation">杞� 鍔�</el-button>
+ <el-button type="danger" size="small" :disabled="delegationButLoading" v-loading="delegationButLoading" @click="delegation">杞� 鍔�</el-button>
</div>
</el-dialog>
@@ -171,7 +175,7 @@
import { flowTaskForm } from "@/api/flowable/todo";
import {getNextFlowNodeByStart} from "@/api/flowable/todo";
import {rejectTask} from "@/api/flowable/process";
-import {taskDelegation} from "@/api/projectProcess/projectProcess";
+import {taskDelegation, taskJump} from "@/api/projectProcess/projectProcess";
export default {
name: "Record",
@@ -185,6 +189,12 @@
props: {},
data() {
return {
+ jumpDesc: '', // 璺宠繃璇存槑
+ rejectLoading: false, // 椹冲洖鎸夐挳鍔犺浇
+ submitLoading: false, // 鎻愪氦鎸夐挳鍔犺浇
+ delegationButLoading: false, // 杞姙鎸夐挳鍔犺浇
+ formLoading: false, // 鍔犺浇褰撳墠鍠濆墠缃妭鐐规暟鎹�
+ imgLoading: false, // 鍔犺浇娴佺▼鍥�
roleKey: 'role',
deptKey: 'dept',
multUserKey: 0,
@@ -210,7 +220,9 @@
taskId: '',
peopleType: '',
targetId: '',
- taskName: ''
+ taskName: '',
+ processInsId: '',
+ projectId: '',
},
delegationShow: false, // 杞姙鏄剧ず
rejectShow: false, // 椹冲洖鏄剧ず
@@ -245,7 +257,7 @@
rejectForm: {
comment: '', // 瀹℃牳鎰忚
taskId: '',
- // rejectedTaskDefKey: '' // 琚┏鍥炵殑浠诲姟key
+ taskName: '' // 琚┏鍥炵殑浠诲姟k
}
};
},
@@ -263,6 +275,32 @@
this.getFlowFormData(this.taskId);
},
methods: {
+ // 璺宠繃浠诲姟
+ jumpTask() {
+ this.$prompt('澶囨敞璇存槑', '纭畾瑕佽烦杩囨浠诲姟鍚�', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputType: 'textarea'
+ // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
+ // inputErrorMessage: '閭鏍煎紡涓嶆纭�'
+ }).then(({ value }) => {
+ let jumpForm = {
+ taskId: this.taskId,
+ projectId: this.goBackParams.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) {
@@ -306,8 +344,13 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
+ this.delegationForm.projectId = this.goBackParams.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(() => {
@@ -435,19 +478,36 @@
this.delegationShow = true
},
rejectTask() {
- rejectTask(this.rejectForm).then(res => {
- this.rejectShow = false
- this.$message.success("椹冲洖鎴愬姛")
- })
+ 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(rejectedTaskDefKey) {
- // this.rejectForm.rejectedTaskDefKey = rejectedTaskDefKey;
+ openRejectTask(taskName) {
+ this.rejectForm.taskName = taskName;
this.rejectForm.taskId = this.taskId;
this.rejectShow = true
},
handleClick(tab, event) {
if (tab.name === '2'){
- flowXmlAndNode({procInsId:this.procInsId,deployId:this.deployId}).then(res => {
+ this.imgLoading = true
+ flowXmlAndNode({processInsId:this.procInsId,deployId:this.deployId}).then(res => {
+ this.imgLoading = false
this.flowData = res.data;
})
}
@@ -455,13 +515,13 @@
/** 娴佺▼琛ㄥ崟鏁版嵁 */
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) => {
let that = this
- console.log(eval("that.$refs.form" +index))
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);
@@ -471,8 +531,8 @@
this.formJson = this.formDataList[0].formJsonObj.formJson
}
})
-
}
+ this.formLoading = false
// if (res.data.formJson) {
// // 鍥炴樉琛ㄥ崟
// this.$refs.vFormRef.setFormJson(res.data.formJson);
@@ -512,54 +572,44 @@
},
/** 鐢宠娴佺▼琛ㄥ崟鏁版嵁鎻愪氦 */
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,
}
- }
- })
- }).catch(error => {
- // this.$modal.msgError(error)
- })
+ // 澶嶅埗瀵硅薄鐨勫睘鎬у�肩粰鏂扮殑瀵硅薄
+ Object.assign(param, formData);
+ // 瀹屾垚浠诲姟
+ completeSubmitFormTask(this.taskId, param).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((err) => {
+ console.log(err)
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堟彁浜ゆ搷浣�'
+ });
+ });
+
},
/** 閲嶇疆琛ㄥ崟 */
resetForm() {
@@ -666,6 +716,13 @@
color: #F56C6C
}
margin-bottom: 15px;
+ color: #E6A23C
+}
+.before_none {
+ span {
+ color: #F56C6C
+ }
+ margin-bottom: 15px;
margin-top: 15px;
color: #E6A23C
}
@@ -689,4 +746,7 @@
justify-content: center;
align-items: center;
}
+.tab-min-height {
+ min-height: 500px;
+}
</style>
--
Gitblit v1.8.0