Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

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
           },

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -861,6 +861,7 @@
                 ellipsis: true,
                 sorter: true,
                 width: 180,
+                sorter: true,
                 scopedSlots: { customRender: 'verifyFlowStatusName' }
               },
               {
@@ -2256,6 +2257,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
         }