From cbb1cc11a9557ce5c3cca9bca549b098436092b6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 14:55:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/task/myProcess/send/index.vue | 58 +++++-----------------------------------------------------
1 files changed, 5 insertions(+), 53 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 702f003..ea5dd7c 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -506,7 +506,7 @@
handleClick(tab, event) {
if (tab.name === '2'){
this.imgLoading = true
- flowXmlAndNode({procInsId:this.procInsId,deployId:this.deployId}).then(res => {
+ flowXmlAndNode({processInsId:this.procInsId,deployId:this.deployId}).then(res => {
this.imgLoading = false
this.flowData = res.data;
})
@@ -577,10 +577,10 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- this.submitLoading = true
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,
@@ -592,64 +592,16 @@
this.$modal.msgSuccess(res.msg);
this.submitLoading = false
this.goBack();
- }).catch((err) => {
- this.submitLoading = false;
- });
- }).catch((err) => {
- this.submitLoading = false;
- });
+ })
+ })
} else {
// 娌″叧鑱旇〃鍗曠洿鎺ヤ紶绌�
completeSubmitFormTask(this.taskId, {}).then(res => {
this.$modal.msgSuccess(res.msg);
this.submitLoading = false
this.goBack();
- }).catch((err) => {
- this.submitLoading = false;
- });
+ })
}
-
- // 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();
- // })
- // }
- // }
- // }
- // })
- // })
}).catch((err) => {
console.log(err)
this.$message({
--
Gitblit v1.8.0