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 | 133 ++++++++++++++++++++++++-------------------- 1 files changed, 72 insertions(+), 61 deletions(-) diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue index 706f2c2..32bbe07 100644 --- a/src/views/flowable/task/myProcess/send/index.vue +++ b/src/views/flowable/task/myProcess/send/index.vue @@ -3,68 +3,63 @@ <el-card class="box-card" > <div slot="header" class="clearfix" style="display: flex"> <div style="flex: 1" class="el-icon-document">{{`浠诲姟鍔炵悊锛歚 + processName}}</div> - <div style="flex: 2">{{projectName + '鈥斺��' + flowName}}</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-loading="formLoading" class="tab-min-height"> + <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" 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> - <el-popover - style="margin-left: 10px" v-if="formDataObj.events.length > 0" - placement="right-start" - title="浠诲姟鏃ュ織" - width="800" - trigger="hover" - > - <div v-if="formDataObj.events.length > 0"> - <log-view :log-list="formDataObj.events"/> + <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> - <el-button slot="reference">浠诲姟鏃ュ織</el-button> - </el-popover> - </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> + <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> </el-col> @@ -189,6 +184,7 @@ import { flowTaskForm } from "@/api/flowable/todo"; import {getNextFlowNodeByStart} from "@/api/flowable/todo"; 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"; @@ -200,7 +196,8 @@ MyDept, SingleUser, MultUser, - LogView + LogView, + LogTimeLine }, props: {}, data() { @@ -343,7 +340,14 @@ this.$prompt('澶囨敞璇存槑', '纭畾瑕佸缂烘浠诲姟鍚�', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', - inputType: 'textarea' + inputType: 'textarea', + inputValidator: (value) => { + if (!value || value.trim() === '') { + return "璇峰~鍐欏娉ㄨ鏄�" + } + return true + }, + inputErrorMessage: '璇峰~鍐欏娉ㄨ鏄�' }).then(({ value }) => { let waitForm = { taskId: this.taskId, @@ -367,9 +371,14 @@ this.$prompt('澶囨敞璇存槑', '纭畾瑕佽烦杩囨浠诲姟鍚�', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', - inputType: 'textarea' - // inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, - // inputErrorMessage: '閭鏍煎紡涓嶆纭�' + inputType: 'textarea', + inputValidator: (value) => { + if (!value || value.trim() === '') { + return "璇峰~鍐欏娉ㄨ鏄�" + } + return true + }, + inputErrorMessage: '璇峰~鍐欏娉ㄨ鏄�' }).then(({ value }) => { let jumpForm = { taskId: this.taskId, @@ -812,6 +821,8 @@ padding: 20px; margin-top: 5px; margin-bottom: 20px; + 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 { @@ -831,7 +842,7 @@ } .reject-but { position: absolute; - top: 4px; + top: -4px; right: 4px } .current { @@ -843,7 +854,7 @@ } .op-list { position: absolute; - top: 4px; + top: -4px; right: 4px; display: flex; justify-content: center; -- Gitblit v1.8.0