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 | 40 +++++++++----------
src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue | 11 +++++
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue | 28 ++++++++++++--
src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue | 15 ++++++-
4 files changed, 66 insertions(+), 28 deletions(-)
diff --git a/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue b/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue
index 279fecf..42a7c3a 100644
--- a/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue
+++ b/src/views/flowable/workflow/MaintenanceStandard/MaintenanceStandardApprovalModal.vue
@@ -267,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: [
@@ -306,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: [
@@ -342,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'
}
]
},
@@ -695,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
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
index 984eca6..d2c63a9 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -411,7 +411,8 @@
title: '妫�鏌ラ」鐩�',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '妫�鏌ョ粨鏋�',
@@ -444,13 +445,15 @@
title: '妫�鏌ラ」鐩�',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '妫�鏌ュ瓙椤圭洰',
key: 'subItemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '鍏佸樊鍊�',
@@ -489,7 +492,8 @@
title: '妫�鏌ラ」鐩�',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '妫�鏌ョ粨鏋�',
@@ -762,4 +766,20 @@
}
}
}
+
+ .vxe-header--column[data-col="itemName"] .vxe-cell {
+ text-align: center !important;
+ }
+
+ .vxe-body--column[data-col="itemName"] .vxe-cell {
+ text-align: left !important;
+ }
+
+ .vxe-header--column[data-col="subItemName"] .vxe-cell {
+ text-align: center !important;
+ }
+
+ .vxe-body--column[data-col="subItemName"] .vxe-cell {
+ text-align: left !important;
+ }
</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
index e00179b..fe322c2 100644
--- a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
@@ -411,7 +411,8 @@
title: '淇濆吇椤�',
key: 'itemName',
type: JVXETypes.normal,
- align: 'center'
+ headerAlign: 'center',
+ align: 'left'
},
{
title: '淇濆吇缁撴灉',
@@ -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
diff --git a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
index b62215c..137e59a 100644
--- a/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -349,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: '淇濆吇缁撴灉',
@@ -876,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