From 5cdd7e13d27d14a97e8a4a0d52abc02bb53dd929 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 03 一月 2025 12:03:41 +0800
Subject: [PATCH] 任务办理、详情样式优化
---
src/views/flowable/task/myProcess/send/index.vue | 39 +++++++++++++++++++++------------------
src/views/flowable/task/myProcess/detail/index.vue | 16 ++++++++++------
src/views/projectProcess/detail/index.vue | 4 ++++
3 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/src/views/flowable/task/myProcess/detail/index.vue b/src/views/flowable/task/myProcess/detail/index.vue
index bcfd691..f9c5720 100644
--- a/src/views/flowable/task/myProcess/detail/index.vue
+++ b/src/views/flowable/task/myProcess/detail/index.vue
@@ -1,8 +1,9 @@
<template>
<div class="app-container">
<el-card class="box-card" >
- <div slot="header" class="clearfix">
- <span class="el-icon-document">浠诲姟璇︽儏</span>
+ <div slot="header" class="clearfix" style="display: flex">
+ <div style="flex: 1" class="el-icon-document">{{`浠诲姟璇︽儏锛歚 + this.goBackParams.processName}}</div>
+ <div style="flex: 2">{{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">
@@ -116,6 +117,8 @@
props: {},
data() {
return {
+ projectName: '',
+ flowName: '',
// 妯″瀷xml鏁版嵁
flowData: {},
formDataList: [], // 琛ㄥ崟鍒楄〃
@@ -142,6 +145,8 @@
this.taskForm.taskId = this.$route.query && this.$route.query.taskId;
this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
this.goBackParams = this.$route.query && this.$route.query.goBackParams;
+ this.projectName = this.$route.query && this.$route.query.projectName;
+ this.flowName = this.$route.query && this.$route.query.flowName;
// 娴佺▼浠诲姟閲嶈幏鍙栧彉閲忚〃鍗�
this.processVariables( this.taskForm.taskId)
this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
@@ -263,11 +268,10 @@
}
.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);
+ box-shadow: rgba(67, 71, 85, 0.27) 0px 0px 0.25em, rgba(90, 125, 188, 0.05) 0px 0.25em 1em;
}
</style>
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 7c23992..76f7c37 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -1,8 +1,9 @@
<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">{{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">
@@ -11,20 +12,19 @@
<!--鍒濆鍖栨祦绋嬪姞杞借〃鍗曚俊鎭�-->
<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" @click="openRejectTask(formDataObj.beforeNodeDefId)">椹冲洖</el-button>
+<!-- 鍓嶇疆鑺傜偣鍙┏鍥� -->
+ <div v-if="!formDataObj.current" style="position: absolute; top: 4px; right: 4px">
+ <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeDefId)">椹� 鍥�</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>
+<!-- 褰撳墠鑺傜偣鍙崗鍚屻�佽浆鍔炵瓑鎿嶄綔 -->
+ <div v-else style="position: absolute; top: 4px; right: 4px; display: flex;justify-content: center; align-items: center;">
+ <el-button size="small" type="primary" @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>
+ </div>
+ <div v-if="formDataObj.current" style="margin-bottom: 15px;color: #E6A23C">褰撳墠闃舵锛�<span style="color: #409EFF">{{formDataObj.beforeNodeName}}</span></div>
+ <div v-else style="margin-bottom: 15px;color: #E6A23C">鍓嶇疆闃舵锛�<span style="color: #F56C6C">{{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" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button>
-<!-- <el-button type="primary" @click="resetForm">閲� 缃�</el-button>-->
</div>
</el-col>
</el-tab-pane>
@@ -160,6 +160,8 @@
props: {},
data() {
return {
+ projectName: '',
+ flowName: '',
roleShow: false, // 瑙掕壊缁勬樉绀�
delegationRoleSelect: [], // 閫変腑瑙掕壊
multUserShow: false, // 鐢ㄦ埛缁勬樉绀�
@@ -221,6 +223,8 @@
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.flowName = this.$route.query && this.$route.query.flowName;
// 鍒濆鍖栬〃鍗�
this.procDefId = this.$route.query && this.$route.query.procDefId;
this.goBackParams = this.$route.query && this.$route.query.goBackParams;
@@ -610,11 +614,10 @@
}
.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);
+ box-shadow: rgba(67, 71, 85, 0.27) 0px 0px 0.25em, rgba(90, 125, 188, 0.05) 0px 0.25em 1em;
}
</style>
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 7398d8a..6c17627 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -210,6 +210,8 @@
deployId: row.deployId,
procDefId: row.processDefId,
processName: row.taskName,
+ flowName: this.queryParams.processName,
+ projectName: this.detailData.projectName,
taskId: row.taskId,
showAuditing: res.data,
goBackParams: this.queryParams
@@ -220,6 +222,8 @@
goToProcessDetail(row) {
this.$router.push({ path: '/flowable/task/myProcess/detail/index',
query: {
+ projectName: this.detailData.projectName,
+ flowName: this.queryParams.processName,
procInsId: row.processInsId,
deployId: row.deployId,
taskId: row.taskId,
--
Gitblit v1.8.0