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/secondMaintenance/SecondMaintenanceApprovalModal.vue | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
index ba22c2a..fe322c2 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'"
@@ -412,7 +411,8 @@
title: '淇濆吇椤�',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '淇濆吇缁撴灉',
@@ -484,6 +484,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)
},
@@ -913,5 +914,13 @@
pointer-events: none;
text-decoration: none;
}
+ /* 淇濆吇椤圭洰鍒楄〃澶村眳涓� */
+ .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>
\ No newline at end of file
--
Gitblit v1.9.3