From efb577ff32d8c103f1b0e0db1c73f0005f5fd480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 18 Apr 2023 09:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/certificationList/index.vue         | 14 +++++++-------
 .../components/listOfRegulations.vue               |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 47a745ca8..540d1b48f 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -647,7 +647,7 @@
             title: this.$t('category'),
             align: 'left',
             dataIndex: 'category',
-            width: 180,
+            width: 120,
             ellipsis: true,
             fixed: 'left',
             sorter: true
@@ -672,7 +672,7 @@
             title: 'WVTA ID',
             align: 'left',
             dataIndex: 'wvtaId',
-            width: 180,
+            width: 120,
             ellipsis: true
           },
           {
@@ -688,28 +688,28 @@
             title: this.$t('areaOfResponsibility'),
             align: 'left',
             dataIndex: 'dutyTerritoryName',
-            width: 180,
+            width: 120,
             ellipsis: true
           },
           {
             title: this.$t('certificationType'),
             align: 'left',
             dataIndex: 'attestationTypeName',
-            width: 180,
+            width: 120,
             ellipsis: true
           },
           {
             title: this.$t('engineeringInterfacePerson'),
             align: 'left',
             dataIndex: 'sdtName',
-            width: 180,
+            width: 120,
             ellipsis: true
           },
           {
             title: this.$t('personLiable'),
             align: 'left',
             dataIndex: 'dutyPersonName',
-            width: 180,
+            width: 120,
             ellipsis: true
           },
           {
@@ -740,7 +740,7 @@
             title: this.$t('closingDate'),
             align: 'left',
             dataIndex: 'endTime',
-            width: 180,
+            width: 120,
             sorter: true,
             ellipsis: true
           },
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 184af3aac..53dade147 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -812,6 +812,7 @@
                 dataIndex: 'designFlowStatusName',
                 align: 'left',
                 ellipsis: true,
+                sorter: true,
                 width: 140,
                 scopedSlots: { customRender: 'designFlowStatusName' }
               },
@@ -859,6 +860,7 @@
                 align: 'left',
                 ellipsis: true,
                 width: 180,
+                sorter: true,
                 scopedSlots: { customRender: 'verifyFlowStatusName' }
               },
               {
@@ -2254,6 +2256,10 @@
           this.orderByField = 'designDutyId'
         } else if (sorter.columnKey == 'verifyDutyIdName') {
           this.orderByField = 'verifyDutyId'
+        }  else if (sorter.columnKey == 'verifyFlowStatusName') {
+          this.orderByField = 'verifyFlowStatus'
+        }  else if (sorter.columnKey == 'designFlowStatusName') {
+          this.orderByField = 'designFlowStatus'
         } else {
           this.orderByField = sorter.columnKey
         }