From bd63da40b4f5a5130bbb73fc654e7aaa25cacce6 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 10 十二月 2024 18:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/task/myProcess/send/index.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index d0b86cd..b235359 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -10,7 +10,10 @@
<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">
+ <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>
+ </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"/>
@@ -19,8 +22,8 @@
<!-- <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" @click="submitForm">鍗忓悓鍔炵悊</el-button>
- <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>
@@ -62,7 +65,8 @@
props: {},
data() {
return {
- formDataList: [],
+ goBackParams: {},
+ formDataList: [], // 琛ㄥ崟鍒楄〃
taskId: '',
processName: '',
// 妯″瀷xml鏁版嵁
@@ -96,6 +100,7 @@
this.taskId = this.$route.query && this.$route.query.taskId;
// 鍒濆鍖栬〃鍗�
this.procDefId = this.$route.query && this.$route.query.procDefId;
+ this.goBackParams = this.$route.query && this.$route.query.goBackParams;
// this.getNextFlowNodeByStart(this.deployId);
this.getFlowFormData(this.taskId);
},
@@ -112,8 +117,6 @@
const params = {taskId: taskId}
flowTaskForm(params).then(res => {
this.formDataList = res.data
- // this.formRenderDataList = res.data.map(item => item.formJson)
- // console.log("琛ㄥ崟鏁版嵁鍒楄〃", this.formRenderDataList)
if (this.formDataList && this.formDataList.length > 0) {
this.$nextTick(() => {
this.formDataList.forEach((formDataObj, index) => {
@@ -154,10 +157,10 @@
},
/** 杩斿洖椤甸潰 */
goBack() {
- // // 鍏抽棴褰撳墠鏍囩椤靛苟杩斿洖涓婁釜椤甸潰
- // const obj = { path: "/task/process", query: { t: Date.now()} };
- // this.$tab.closeOpenPage(obj);
- this.$tab.closePage()
+ this.$router.push({
+ path: '/projectFlow/detail',
+ query: this.goBackParams
+ })
},
/** 鐢宠娴佺▼琛ㄥ崟鏁版嵁鎻愪氦 */
submitForm() {
--
Gitblit v1.8.0