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/MaintenanceStandard/MaintenanceStandardApprovalModal.vue | 76 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue b/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue
index dc08948..42a7c3a 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>
@@ -265,25 +267,19 @@
align: 'center',
width: 100
},
- // {
- // title: '淇濆吇椤瑰垎绫�',
- // key: 'itemCategory',
- // type: JVXETypes.slot,
- // slotName: 'itemCategory',
- // align: 'center',
- // disabled: true
- // },
{
title: '淇濆吇椤圭洰',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '淇濆吇瑙勮寖鎴栬姹�',
key: 'itemDemand',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
}
],
secondMaintenanceColumns: [
@@ -304,19 +300,12 @@
align: 'center',
width: 100
},
- // {
- // title: '淇濆吇椤瑰垎绫�',
- // key: 'itemCategory',
- // type: JVXETypes.slot,
- // slotName: 'itemCategory',
- // align: 'center',
- // disabled: true
- // },
{
title: '淇濆吇椤圭洰',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
}
],
thirdMaintenanceColumns: [
@@ -340,13 +329,15 @@
title: '淇濆吇鍐呭',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '楠屾敹鏍囧噯',
key: 'itemDemand',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
}
]
},
@@ -420,12 +411,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)
},
@@ -691,4 +684,13 @@
text-align: center;
margin: auto;
}
+ /* 淇濆吇椤圭洰鍒楄〃澶村眳涓� */
+ .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