From b25e78e9887935e5955f0c5ad798104eca444016 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 08 四月 2025 18:12:09 +0800
Subject: [PATCH] 修改任务实现，流程日志扩展
---
src/views/projectProcess/detail/index.vue | 88 +++++++++++--------------------------------
1 files changed, 23 insertions(+), 65 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index d8f3bdb..ca42051 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -21,15 +21,15 @@
<div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'todo-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
<div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
<div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.timelyFinishedTaskNum}}锛�</span></div>
- <div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」锛�0锛�</div>
+ <div @click="changeTab(6, 'overtime')" :class="{'item-warm': true, 'overtime-color': true, 'active': 6 === selectTabId}">瓒呮椂浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.overtimeTaskNum}}锛�</span></div>
<div @click="changeTab(3, 'wait')" :class="{'item-warm': true, 'wait-color': true, 'active': 3 === selectTabId}">瀹圭己浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.waitTaskNum}}锛�</span></div>
-<!-- <div @click="changeTab(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</div>-->
+ <div @click="changeTab(7, 'jump')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">璺宠繃浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.jumpTaskNum}}锛�</span></div>
<div @click="changeTab(8, 'urge')" :class="{'item-warm': true, 'urge-color': true, 'active': 8 === selectTabId}">鐫ｅ姙浜嬮」锛�0锛�</div>
</div>
<div style="display: flex;justify-content: center;align-items: center;margin-top: 20px; position: relative">
<el-form :inline="true" :model="queryParams" class="demo-form-inline">
<el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="queryParams.taskName" placeholder="浠诲姟鍚嶇О"></el-input>
+ <el-input v-model="queryParams.taskName" clearable @clear="search" placeholder="浠诲姟鍚嶇О"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="search">鏌ヨ</el-button>
@@ -88,6 +88,7 @@
<el-button v-if="scope.row.taskStatus !== '鏈紑濮�'" @click="goToProcessDetail(scope.row)" type="text" size="small">鏌ョ湅</el-button>
<el-button v-if="showHandle(scope.row)" @click="goToDo(scope.row)" type="text" size="small">鍔炵悊</el-button>
<el-button v-if = "scope.row.taskStatus === '寰呭姙'" @click="openSupervise(scope.row)" type="text" size="small">鐫ｅ姙</el-button>
+ <el-button v-if = "scope.row.taskStatus === '宸插畬鎴�' || scope.row.taskStatus === '璺宠繃' || scope.row.taskStatus === '瀹圭己'" v-hasPermi="['task:edit']" @click="openEditTask(scope.row)" type="text" size="small">淇敼</el-button>
</template>
</el-table-column>
</el-table>
@@ -127,62 +128,6 @@
<log-view style="padding: 10px 20px" :log-list="logList"/>
</el-drawer>
-<!-- <el-dialog-->
-<!-- :title="`${this.queryParams.processName}锛氭祦杞褰昤"-->
-<!-- :visible.sync="processRecordShow"-->
-<!-- :fullscreen="true"-->
-<!-- :close-on-click-modal="false"-->
-<!-- :destroy-on-close="true"-->
-<!-- >-->
-<!-- <div>-->
-<!-- <log-view :log-list="logList"/>-->
-<!--<!– <div class="block">–>-->
-<!--<!– <el-timeline>–>-->
-<!--<!– <el-timeline-item–>-->
-<!--<!– v-for="(item,index ) in flowRecordList"–>-->
-<!--<!– :key="index"–>-->
-<!--<!– :icon="setIcon(item.finishTime)"–>-->
-<!--<!– :color="setColor(item.finishTime)"–>-->
-<!--<!– >–>-->
-<!--<!– <p style="font-weight: 700">{{item.taskName}}–>-->
-<!--<!– <span v-if="item.comment && item.comment.type === '3'" style="color: red">(鎵ц浜嗛┏鍥�)</span>–>-->
-<!--<!– <span v-if="item.overtime && item.overtime==='red'" style="color: red">(宸茶秴鏃�)</span>–>-->
-<!--<!– <span v-if="item.overtime && item.overtime==='yellow'" style="color: orange">(鍗冲皢瓒呮椂)</span>–>-->
-<!--<!– </p>–>-->
-<!--<!– <el-card :body-style="{ padding: '10px' }">–>-->
-<!--<!– <el-descriptions class="margin-top" :column="1" size="small" border>–>-->
-<!--<!– <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">–>-->
-<!--<!– <template slot="label"><i class="el-icon-user"></i>鍔炵悊浜�</template>–>-->
-<!--<!– {{item.assigneeName}}–>-->
-<!--<!– <el-tag type="info" size="mini">{{item.deptName}}</el-tag>–>-->
-<!--<!– </el-descriptions-item>–>-->
-<!--<!– <el-descriptions-item v-if="item.candidate" label-class-name="my-label">–>-->
-<!--<!– <template slot="label"><i class="el-icon-user"></i>鍊欓�夊姙鐞�</template>–>-->
-<!--<!– {{item.candidate}}–>-->
-<!--<!– </el-descriptions-item>–>-->
-<!--<!– <el-descriptions-item label-class-name="my-label">–>-->
-<!--<!– <template slot="label"><i class="el-icon-date"></i>鎺ユ敹鏃堕棿</template>–>-->
-<!--<!– {{item.createTime}}–>-->
-<!--<!– </el-descriptions-item>–>-->
-<!--<!– <el-descriptions-item v-if="item.finishTime" label-class-name="my-label">–>-->
-<!--<!– <template slot="label"><i class="el-icon-date"></i>澶勭悊鏃堕棿</template>–>-->
-<!--<!– {{item.finishTime}}–>-->
-<!--<!– </el-descriptions-item>–>-->
-<!--<!– <el-descriptions-item v-if="item.duration" label-class-name="my-label">–>-->
-<!--<!– <template slot="label"><i class="el-icon-time"></i>鑰楁椂</template>–>-->
-<!--<!– {{item.duration}}–>-->
-<!--<!– </el-descriptions-item>–>-->
-<!--<!– <el-descriptions-item v-if="item.comment" label-class-name="my-label">–>-->
-<!--<!– <template slot="label"><i class="el-icon-tickets"></i>澶勭悊鎰忚</template>–>-->
-<!--<!– {{item.comment.comment}}–>-->
-<!--<!– </el-descriptions-item>–>-->
-<!--<!– </el-descriptions>–>-->
-<!--<!– </el-card>–>-->
-<!--<!– </el-timeline-item>–>-->
-<!--<!– </el-timeline>–>-->
-<!--<!– </div>–>-->
-<!-- </div>-->
-<!-- </el-dialog>-->
<el-dialog :visible.sync="superviseShow" width="1000px" title="鐫ｅ姙" append-to-body>
<el-form ref="superviseForm" :model="superviseForm" :rules="superviseRules" label-width="80px">
<el-form-item label="鐫ｅ姙鍐呭" prop="content">
@@ -194,6 +139,8 @@
<el-button type="primary" @click="submitSupervise">纭� 瀹�</el-button>
</div>
</el-dialog>
+
+ <edit-task :task-id="editTaskId" :open="editTaskOpen" @close="editTaskOpen = false; editTaskId = ''"/>
</div>
</template>
@@ -206,6 +153,7 @@
import {flowXmlAndNode} from "@/api/flowable/definition";
import BpmnViewer from '@/components/Process/viewer';
import LogView from "@/views/projectProcess/components/LogView";
+import EditTask from "@/views/projectProcess/components/EditTask";
import {flowRecord} from "@/api/flowable/finished";
import {editProject} from "@/api/projectEngineering/projectInfo";
import {getProjectProcessLog} from "@/api/flowLog/flowLog";
@@ -214,10 +162,13 @@
name: "Detail",
components: {
BpmnViewer,
- LogView
+ LogView,
+ EditTask
},
data() {
return {
+ editTaskId: '',
+ editTaskOpen: false,
logList: [], // 娴佺▼鏃ュ織
processRecordShow: false, // 娴佽浆璁板綍鏄剧ず
flowRecordList: [], // 娴佺▼娴佽浆鏁版嵁
@@ -280,6 +231,11 @@
this.getProjectProcessInfo()
},
methods: {
+ // 鎵撳紑缂栬緫浠诲姟
+ openEditTask(row) {
+ this.editTaskOpen = true
+ this.editTaskId = row.taskId
+ },
transEventType(selectTabId) {
if (selectTabId == 1) {
return "all"
@@ -293,6 +249,8 @@
return "timely"
} else if (selectTabId == 6) {
return "overtime"
+ } else if (selectTabId == 7) {
+ return "jump"
} else if (selectTabId == 8) {
return "urge"
}
@@ -370,13 +328,13 @@
})
},
unitFormatter(row) {
- if (row.taskStatus != '宸插畬鎴�') {
+ if (row.taskStatus != '宸插畬鎴�' && row.taskStatus != '璺宠繃' && row.taskStatus != '瓒呮椂宸插畬鎴�') {
return null
}
return row.handlerUnitName.join("銆�")
},
candidateFormatter(row) {
- if (row.taskStatus != '宸插畬鎴�') {
+ if (row.taskStatus != '宸插畬鎴�' && row.taskStatus != '璺宠繃' && row.taskStatus != '瓒呮椂宸插畬鎴�') {
return null
}
return row.handlerName.join("銆�")
@@ -397,7 +355,7 @@
}
},
showHandle(row) {
- if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣' || row.taskStatus === '瀹圭己') {
+ if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣' || row.taskStatus === '瀹圭己' || row.taskStatus === '瓒呮椂鏈畬鎴�') {
if (row.handlerType === "USER") {
return row.handlerId.indexOf(this.$store.state.user.id) !== -1
} else if (row.handlerType === "DEPT") {
@@ -574,7 +532,7 @@
color: white;
}
.timely-color {
- background-color: rgb(204, 247, 131);
+ background-color: rgb(85, 248, 106);
}
.overtime-color {
background-color: #e8e866;
@@ -585,7 +543,7 @@
}
.willOvertime-color {
- background-color: rgb(255, 248, 29);
+ background-color: rgb(204, 247, 131);
}
.urge-color {
background-color: red;
--
Gitblit v1.8.0