From 385e27c9b88f33088bb9dc5e81801c8e9de7e187 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 21 八月 2025 18:11:18 +0800
Subject: [PATCH] 430详情点进流转节点与流程图
---
src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue | 36 ++++++-----
src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue | 34 +++++-----
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue | 34 +++++-----
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue | 39 ++++++++++++
4 files changed, 92 insertions(+), 51 deletions(-)
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
index b699384..11a9a89 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
@@ -153,24 +153,23 @@
<a-tab-pane key='3' tab='娴佺▼鍥�'>
<img :src="imageSrc" v-if="imageSrc"/>
</a-tab-pane>
+
+ <a-tab-pane key='4' tab='娴佽浆鑺傜偣'>
+ <a-card>
+ <a-timeline style="padding:0 1% 0 12%" >
+ <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
+ <div class="bottom">
+ <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+ <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+ <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+ <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
+ </div>
+ </a-timeline-item>
+ </a-timeline>
+ </a-card>
+ </a-tab-pane>
</template>
-
- <a-tab-pane key='4' tab='娴佽浆鑺傜偣'>
- <a-card>
- <a-timeline style="padding:0 1% 0 12%" >
- <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
- <div class="bottom">
- <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
- <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
- <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
- <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
- <div class="left_qiu"><span>{{item.taskName}}</span></div>
- </div>
- </a-timeline-item>
- </a-timeline>
- </a-card>
- </a-tab-pane>
-
<a-button
v-if="activeTabKey=='1'||activeTabKey=='2'"
@@ -432,6 +431,7 @@
this.model = Object.assign({}, record)
this.getDayInspectionOrderListByApi(record.id)
this.getWeekInspectionOrderListByApi(record.standardId)
+ this.getFlowChartImageByApi(record)
this.getFlowTaskListByApi(record)
},
diff --git a/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue b/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue
index dc08948..279fecf 100644
--- a/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue
+++ b/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue
@@ -126,27 +126,29 @@
</a-tab-pane>
</template>
- <template v-if="selectShenpiData.processDefinitionKey">
+ <template v-if="selectShenpiData.procInstId">
<a-tab-pane key='3' tab='娴佺▼鍥�'>
<img :src="imageSrc" alt="Fetched Image"/>
</a-tab-pane>
+
+ <a-tab-pane key='4' tab='娴佽浆鑺傜偣'>
+ <a-card>
+ <a-timeline style="padding:0 1% 0 12%">
+ <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
+ <div class="bottom">
+ <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+ <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+ <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+ <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
+ </div>
+ </a-timeline-item>
+ </a-timeline>
+ </a-card>
+ </a-tab-pane>
</template>
- <a-tab-pane key='4' tab='娴佽浆鑺傜偣'>
- <a-card>
- <a-timeline style="padding:0 1% 0 12%">
- <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
- <div class="bottom">
- <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
- <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
- <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
- <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
- <div class="left_qiu"><span>{{item.taskName}}</span></div>
- </div>
- </a-timeline-item>
- </a-timeline>
- </a-card>
- </a-tab-pane>
+
</a-tabs>
</a-col>
@@ -420,12 +422,14 @@
/**
* 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
+ *
*/
handleDetail(record) {
this.activeTabKey = '1'
this.detail.dataSource1 = this.detail.dataSource2 = []
this.model = Object.assign({}, record)
this.getFlowTaskListByApi(record)
+ this.getFlowChartImageByApi(record)
this.loadDetail(record.id)
},
diff --git a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
index ba22c2a..e00179b 100644
--- a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
@@ -153,27 +153,26 @@
</j-vxe-table>
</a-tab-pane>
- <template v-if="selectShenpiData.processDefinitionKey">
+ <template v-if="selectShenpiData.procInstId">
<a-tab-pane key='3' tab='娴佺▼鍥�' style="overflow: auto">
<img :src="imageSrc" v-if="imageSrc"/>
</a-tab-pane>
+ <a-tab-pane key='4' tab='娴佽浆鑺傜偣'>
+ <a-card>
+ <a-timeline style="padding:0 1% 0 12%">
+ <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
+ <div class="bottom">
+ <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+ <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+ <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+ <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
+ </div>
+ </a-timeline-item>
+ </a-timeline>
+ </a-card>
+ </a-tab-pane>
</template>
-
- <a-tab-pane key='4' tab='娴佽浆鑺傜偣'>
- <a-card>
- <a-timeline style="padding:0 1% 0 12%">
- <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
- <div class="bottom">
- <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
- <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
- <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
- <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
- <div class="left_qiu"><span>{{item.taskName}}</span></div>
- </div>
- </a-timeline-item>
- </a-timeline>
- </a-card>
- </a-tab-pane>
<a-button
v-if="activeTabKey!=='3'"
@@ -484,6 +483,7 @@
this.activeTabKey = 1
this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
this.model = Object.assign({}, record)
+ this.getFlowChartImageByApi(record)
this.getFlowTaskListByApi(record)
this.loadDetail(record.id)
},
diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
index ad8c040..b62215c 100644
--- a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -143,6 +143,22 @@
<a-tab-pane key='3' tab='娴佺▼鍥�'>
<img :src="imageSrc" alt="Fetched Image"/>
</a-tab-pane>
+
+ <a-tab-pane key='4' tab='娴佽浆鑺傜偣'>
+ <a-card>
+ <a-timeline style="padding:0 1% 0 12%">
+ <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
+ <div class="bottom">
+ <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+ <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+ <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+ <p v-if="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
+ </div>
+ </a-timeline-item>
+ </a-timeline>
+ </a-card>
+ </a-tab-pane>
</template>
<template slot="tabBarExtraContent">
@@ -293,10 +309,12 @@
maintenanceDetail: '/eam/thirdMaintenanceOrderDetail/queryList',
sparePartsDetail: '/eam/eamThirdMaintenanceSpare/queryList',
approval: '/eam/thirdMaintenanceOrder/approval',
- diagramView: '/assign/flow/diagramView'
+ diagramView: '/assign/flow/diagramView',
+ queryHisTaskList: '/assign/flow/queryHisTaskList'
},
disableSubmit: false,
selectedRowKeys: [],
+ hitaskDataSource: [],
detail: {
maintenanceDetailList: [],
sparePartsDetailList: [],
@@ -443,6 +461,7 @@
this.detail.maintenanceDetailList = this.detail.sparePartsDetailList = []
this.getBasicInformationByApi(record)
this.getFlowChartImageByApi(record)
+ this.getFlowTaskListByApi(record)
},
/**
@@ -460,6 +479,8 @@
}, record)
this.handleDynamicColumns()
this.loadMaintenanceDetail(record.id)
+ this.getFlowChartImageByApi(record)
+ this.getFlowTaskListByApi(record)
this.loadSparePartsDetail(record.id)
},
@@ -500,6 +521,22 @@
},
/**
+ * 鑾峰彇娴佽浆鑺傜偣
+ * @param record
+ */
+ getFlowTaskListByApi(record) {
+ let parmhis = {
+ 'procInstId': record.procInstId
+ }
+ getAction(this.url.queryHisTaskList, parmhis).then(res => {
+ this.hitaskDataSource = res.result
+ }).finally(
+ this.visible = true,
+ console.log('this.approveData---->', this.approveData)
+ )
+ },
+
+ /**
* 鑾峰彇淇濆吇鏄庣粏
* @param orderId 宸ュ崟鍙�
*/
--
Gitblit v1.9.3