From 1dbb227aeabe6549500b3b9146e0ffca90490dfb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 11 二月 2025 15:00:24 +0800
Subject: [PATCH] 按钮悬浮提示
---
src/views/projectProcess/detail/index.vue | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 206 insertions(+), 19 deletions(-)
diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 37167c0..f934da0 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -6,7 +6,7 @@
<h2>椤圭洰鍚嶇О锛歿{detailData.projectName}}</h2>
</div>
<div class="project-info">
- <div class="project-info-item"></div>
+ <div class="project-info-item">娴佺▼鍚嶇О锛歿{queryParams.processName}}</div>
<div class="project-info-item">椤圭洰浠ｇ爜锛歿{detailData.projectCode}}</div>
<div class="project-info-item">
<div style="color: black">
@@ -18,15 +18,15 @@
</div>
<div class="search-warp">
<div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">鍏ㄩ儴浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.totalTaskNum}}锛�</span></div>
- <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">浠ｅ姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
+ <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
<div @click="changeTab(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">褰撳墠鐜妭</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}">鎸夋椂瀹屾垚锛�0锛�</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(7, 'willOvertime')" :class="{'item-warm': true, 'willOvertime-color': true, 'active': 7 === selectTabId}">涓存湡浜嬮」锛�0锛�</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">
+ <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>
@@ -35,6 +35,10 @@
<el-button type="primary" @click="search">鏌ヨ</el-button>
</el-form-item>
</el-form>
+ <div style="position: absolute; right: 0; top: 0">
+ <el-button @click="openProcessImg" v-loading="imgLoading" type="primary">娴佺▼鍥�</el-button>
+ <el-button @click="openRecord" type="info" v-loading="recordLoading">娴佽浆璁板綍</el-button>
+ </div>
</div>
<div class="table">
<el-table
@@ -48,11 +52,6 @@
>
</el-table-column>
<el-table-column
- prop="processName"
- label="娴佺▼鍚嶇О"
- >
- </el-table-column>
- <el-table-column
prop="promoterUnitName"
label="鍙戣捣鍗曚綅"
>
@@ -63,16 +62,36 @@
>
</el-table-column>
<el-table-column
+ align="center"
+ prop="handlerType"
+ label="澶勭悊鏂圭被鍨�"
+ >
+ <template slot-scope="scope">
+ <el-tag v-if="scope.row.handlerType === 'USER'">浜哄憳璐﹀彿</el-tag>
+ <el-tag type="success" v-else-if="scope.row.handlerType === 'DEPT'">鍗曚綅</el-tag>
+ <el-tag type="info" v-else-if="scope.row.handlerType === 'ROLE'">瑙掕壊</el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
prop="handlerUnitName"
label="澶勭悊鍗曚綅"
+ :formatter="unitFormatter"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="handlerName"
+ label="鍊欓�夊鐞嗕汉"
+ :formatter="candidateFormatter"
>
</el-table-column>
<el-table-column
prop="handlerName"
label="瀹為檯澶勭悊浜�"
+ :formatter="finalFinishedFormatter"
>
</el-table-column>
<el-table-column
+ align="center"
prop="taskStatus"
label="浠诲姟鐘舵��"
>
@@ -100,6 +119,75 @@
</el-pagination>
</div>
</div>
+
+ <el-dialog
+ :title="`${this.queryParams.processName}锛氭祦绋嬪浘`"
+ :visible.sync="processImgShow"
+ :fullscreen="true"
+ :close-on-click-modal="false"
+ :destroy-on-close="true"
+ >
+ <div>
+ <bpmn-viewer :flowData="flowData" :procInsId="queryParams.processInsId"/>
+ </div>
+ </el-dialog>
+
+ <el-dialog
+ :title="`${this.queryParams.processName}锛氭祦杞褰昤"
+ :visible.sync="processRecordShow"
+ :fullscreen="true"
+ :close-on-click-modal="false"
+ :destroy-on-close="true"
+ >
+ <div>
+ <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>
+
</div>
</template>
@@ -109,11 +197,24 @@
getProjectProcessDetailTaskList,
getTaskIsAuditing
} from "@/api/projectProcess/projectProcess";
+import {flowXmlAndNode} from "@/api/flowable/definition";
+import BpmnViewer from '@/components/Process/viewer';
+import {flowRecord} from "@/api/flowable/finished";
export default {
- name: "index",
+ name: "Detail",
+ components: {
+ BpmnViewer
+ },
data() {
return {
+ processRecordShow: false, // 娴佽浆璁板綍鏄剧ず
+ flowRecordList: [], // 娴佺▼娴佽浆鏁版嵁
+ recordLoading: false, // 娴佽浆璁板綍鍔犺浇
+ // 妯″瀷xml鏁版嵁
+ flowData: {},
+ processImgShow: false, // 娴佺▼鍥炬樉绀�
+ imgLoading: false, // 娴佺▼鍥惧姞杞�
loading: false,
tableLoading: false,
detailData: {},
@@ -127,27 +228,104 @@
currentPage: 1,
projectId: null,
processDefId: null,
+ processInsId: null,
+ deployId: null,
+ processName: '' // 娴佺▼鍚嶇О
}
}
},
mounted() {
- this.queryParams.projectId = this.$route.query.projectId
- this.queryParams.processDefId = this.$route.query.processDefId
+ console.log(this.$route.query, "鍙傛暟")
+ let params = JSON.parse(sessionStorage.getItem("projectProDetail"))
+ console.log(params, "鍙傛暟")
+ if (!params || ! params.projectId) {
+ this.queryParams.projectId = this.$route.query.projectId
+ this.queryParams.processDefId = this.$route.query.processDefId
+ this.queryParams.processInsId = this.$route.query.processInsId
+ this.queryParams.deployId = this.$route.query.deployId
+ this.queryParams.processName = this.$route.query.processName
+ sessionStorage.setItem("projectProDetail", JSON.stringify(this.queryParams))
+ } else {
+ this.queryParams = params
+ }
this.loading = true
this.getProjectProcessInfo()
},
methods: {
+ setIcon(val) {
+ if (val) {
+ return "el-icon-check";
+ } else {
+ return "el-icon-time";
+ }
+ },
+ setColor(val) {
+ if (val) {
+ return "#2bc418";
+ } else {
+ return "#b3bdbb";
+ }
+ },
+ openRecord() {
+ this.getFlowRecordList(this.queryParams.processInsId);
+ },
+ openProcessImg() {
+ this.imgLoading = true
+ flowXmlAndNode({processInsId:this.queryParams.processInsId,deployId:this.queryParams.deployId}).then(res => {
+ this.imgLoading = false
+ this.processImgShow = true
+ this.$nextTick(() => {
+ this.flowData = res.data;
+ })
+ })
+ },
+ /** 娴佺▼娴佽浆璁板綍 */
+ getFlowRecordList(procInsId) {
+ const params = {procInsId: procInsId}
+ this.recordLoading = true
+ flowRecord(params).then(res => {
+ this.flowRecordList = res.data.flowList;
+ this.recordLoading = false
+ this.processRecordShow = true
+ })
+ },
+ unitFormatter(row) {
+ if (row.handlerType === 'USER') {
+ return null;
+ } else if (row.handlerType === 'DEPT') {
+ return row.handlerUnitName.join("銆�")
+ } else if (row.handlerType === 'ROLE') {
+ return row.handlerUnitName.join('銆�')
+ }
+ },
+ candidateFormatter(row) {
+ if (row.handlerType === 'USER') {
+ return row.handlerName.join('銆�')
+ } else if (row.handlerType === 'DEPT') {
+ return row.handlerUnitName.join('銆�')
+ } else if (row.handlerType === 'ROLE') {
+ return row.handlerUnitName.join('銆�')
+ }
+ },
+ finalFinishedFormatter(row) {
+ // 涓嶆槸宸插畬鎴愮殑鐘舵�佹病鏈夊疄闄呭鐞嗕汉锛屽凡瀹屾垚鐨勭姸鎬佸彧鏈変竴涓汉
+ if (row.taskStatus !== '宸插畬鎴�') {
+ return null
+ } else {
+ return row.actualHandlerUserName
+ }
+ },
showHandle(row) {
- console.log(this.$store.state.user, "鐢ㄦ埛淇℃伅")
if (row.taskStatus === '寰呭姙') {
if (row.handlerType === "USER") {
- return this.$store.state.user.id === row.handlerId
+ console.log(row.handlerId.indexOf(this.$store.state.user.id) !== -1, "鎴戞槸涓嶆槸")
+ return row.handlerId.indexOf(this.$store.state.user.id) !== -1
} else if (row.handlerType === "DEPT") {
console.log(this.$store.state.user.deptId, "閮ㄩ棬id", row.handlerUnitId)
- return this.$store.state.user.deptId === row.handlerUnitId
+ return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1
// return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
} else if (row.handlerType === "ROLE") {
- return this.$auth.hasRole(row.handlerUnitName)
+ return row.handlerUnitId.some(roleId => this.$store.state.user.roleIds.indexOf(roleId) !== -1)
}
} else {
return false
@@ -160,12 +338,16 @@
taskId: row.taskId
}
getTaskIsAuditing(params).then(res => {
+ console.log("row",row)
this.$router.push({
path: '/flowable/task/myProcess/send/index',
query: {
deployId: row.deployId,
procDefId: row.processDefId,
+ procInsId: row.processInsId,
processName: row.taskName,
+ flowName: this.queryParams.processName,
+ projectName: this.detailData.projectName,
taskId: row.taskId,
showAuditing: res.data,
goBackParams: this.queryParams
@@ -176,6 +358,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,
@@ -184,22 +368,26 @@
},
search() {
this.queryParams.currentPage = 1;
+ this.tableLoading = true
this.getList()
},
sizeChange(pageSize) {
+ this.tableLoading = true
this.queryParams.pageSize = pageSize;
this.getList()
},
pageChange(pageNum) {
+ this.tableLoading = true
this.queryParams.currentPage = pageNum;
this.getList()
},
getList() {
+ this.tableLoading = true
// 鑾峰彇浠诲姟鍒楄〃
getProjectProcessDetailTaskList(this.queryParams).then(res => {
+ this.tableLoading =false
this.taskList = res.data
this.total = res.total
- this.tableLoading =false
})
},
// 鏌ヨ璇︽儏
@@ -212,14 +400,13 @@
})
},
changeTab(id, event) {
- this.tableLoading = true
let beforeId = this.selectTabId
this.selectTabId = id
this.queryParams.taskType = event
+ this.queryParams.currentPage = 1;
if (beforeId !== id) {
this.getList()
}
-
}
}
}
--
Gitblit v1.8.0