From 6e4b54ef350de163e4101558889d043d437e793c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 05 九月 2025 15:40:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
index ad8c040..137e59a 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: [],
@@ -331,14 +349,16 @@
key: 'itemName',
type: JVXETypes.normal,
width: 120,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '楠屾敹鏍囧噯',
key: 'itemDemand',
type: JVXETypes.normal,
width: 120,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '淇濆吇缁撴灉',
@@ -443,6 +463,7 @@
this.detail.maintenanceDetailList = this.detail.sparePartsDetailList = []
this.getBasicInformationByApi(record)
this.getFlowChartImageByApi(record)
+ this.getFlowTaskListByApi(record)
},
/**
@@ -460,6 +481,8 @@
}, record)
this.handleDynamicColumns()
this.loadMaintenanceDetail(record.id)
+ this.getFlowChartImageByApi(record)
+ this.getFlowTaskListByApi(record)
this.loadSparePartsDetail(record.id)
},
@@ -497,6 +520,22 @@
this.loadSparePartsDetail(record.dataId)
})
+ },
+
+ /**
+ * 鑾峰彇娴佽浆鑺傜偣
+ * @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)
+ )
},
/**
@@ -839,4 +878,13 @@
}
}
}
+
+ .vxe-header--column[data-col="itemName"] .vxe-cell {
+ text-align: center !important;
+ }
+
+ .vxe-body--column[data-col="itemName"] .vxe-cell {
+ text-align: left !important;
+ }
+
</style>
--
Gitblit v1.9.3