From da085b5fcd24a31689d3380434a911417a06b035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 13 Apr 2023 09:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=EF=BC=8C=E4=BB=BB=E5=8A=A1=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectRegulationTasks/components/SentList.vue         | 7 +++++--
 .../projectRegulationTasks/components/dealtWith.vue        | 4 ++--
 .../projectRegulationTasks/components/doneList.vue         | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 01d12004f..8b1b38271 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -83,6 +83,7 @@
             align: 'left',
             dataIndex: 'flowTypeShow',
             ellipsis: true,
+            sorter: true,
             width: 241
           },
           {
@@ -90,6 +91,7 @@
             align: 'left',
             dataIndex: 'taskDefinitionKeyName',
             ellipsis: true,
+            sorter: true,
             width: 208
           },
           {
@@ -118,6 +120,7 @@
             align: 'left',
             dataIndex: 'endTime',
             ellipsis: true,
+            sorter: true,
             width: 108
           },
           // {
@@ -349,9 +352,9 @@
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         if (sorter.columnKey == 'flowTypeShow') {
-          this.orderByField = 'flowType'
+          this.orderByField = 'flow_type'
         } else if (sorter.columnKey == 'taskDefinitionKeyName') {
-          this.orderByField = 'taskDefinitionKey'
+          this.orderByField = 'task_definition_key'
         } else {
           this.orderByField = sorter.columnKey
         }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index f91ea7c11..affe7fd17 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -426,9 +426,9 @@
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         if (sorter.columnKey == 'flowTypeShow') {
-          this.orderByField = 'flowType'
+          this.orderByField = 'flow_type'
         } else if (sorter.columnKey == 'taskDefinitionKeyName') {
-          this.orderByField = 'taskDefinitionKey'
+          this.orderByField = 'task_definition_key'
         } else {
           this.orderByField = sorter.columnKey
         }
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 680aff70c..193ffcaa8 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -88,6 +88,7 @@
             align: 'left',
             dataIndex: 'flowTypeShow',
             ellipsis: true,
+            sorter: true,
             width: 241
           },
           {
@@ -95,6 +96,7 @@
             align: 'left',
             dataIndex: 'taskDefinitionKeyName',
             ellipsis: true,
+            sorter: true,
             width: 208
           },
           {
@@ -116,6 +118,7 @@
             align: 'left',
             dataIndex: 'endTime',
             ellipsis: true,
+            sorter: true,
             width: 108
           },
           // {
@@ -342,9 +345,9 @@
       tableOnChange(pagination, filters, sorter) {
         this.orderBy = sorter.order == 'ascend' ? '1' : '2'
         if (sorter.columnKey == 'flowTypeShow') {
-          this.orderByField = 'flowType'
+          this.orderByField = 'flow_type'
         } else if (sorter.columnKey == 'taskDefinitionKeyName') {
-          this.orderByField = 'taskDefinitionKey'
+          this.orderByField = 'task_definition_key'
         } else {
           this.orderByField = sorter.columnKey
         }