From dae12f618f8c9a538a1e1cbfb74919205c33c3ed Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 26 Apr 2022 14:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8F=A1=E6=89=8B=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/circulationHistory.vue           |  6 +++++-
 .../tabComponents/alreadyProcess/index.vue      |  2 +-
 .../tabComponents/alreadySend/index.vue         | 11 ++++++-----
 .../tabComponents/monitorProcess/index.vue      | 17 +++++++++++------
 .../tabComponents/processCenter/index.vue       |  5 +----
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index 679426d70..b70465423 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -21,6 +21,7 @@
 
 <script>
   import { getAction, postAction } from '@/api/manage'
+  import moment from 'moment'
 
   export default {
     name: 'circulationHistory',
@@ -57,7 +58,10 @@
           {
             title: this.$t('operationTime'),
             dataIndex: 'createTime',
-            align: 'center'
+            align: 'center',
+            customRender: function(t, r, index) {
+              return moment(t).format('YYYY-MM-DD HH:mm:ss')
+            }
           }
         ]
       }
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
index de3ab1bab..b2f4b5bdf 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
@@ -98,7 +98,7 @@
           },
           {
             title: this.$t('cutoffTime'),
-            dataIndex: 'endTime',
+            dataIndex: 'taskAffirmDueDate',
             align: 'center',
             ellipsis: true
           },
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
index c47c158c0..d7ca9c247 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -89,7 +89,7 @@
           },
           {
             title: this.$t('CompletionTime'),
-            dataIndex: 'CompletionTime',
+            dataIndex: 'endTime',
             align: 'center',
             ellipsis: true,
             customRender: function(t, r, index) {
@@ -105,12 +105,9 @@
           },
           {
             title: this.$t('cutoffTime'),
-            dataIndex: 'endTime',
+            dataIndex: 'taskAffirmDueDate',
             align: 'center',
             ellipsis: true,
-            customRender: function(t, r, index) {
-              return moment(t).format('YYYY-MM-DD HH:mm:ss')
-            }
           },
           {
             title: this.$t('operation'),
@@ -213,4 +210,8 @@
     position: relative;
     top: 1px;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 </style>
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
index e66377458..83b38fac5 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -14,6 +14,9 @@
       <span slot="prcType" slot-scope="text,record">
        {{prcTypeName[text]}}
       </span>
+      <span slot="isEnd" slot-scope="text,record">
+          {{text && text == 0 ? '未完成':'已完成'}}
+      </span>
       <span slot="operation" slot-scope="record">
           <a @click="classAdd(record)" style="margin-right:8px">{{$t('See')}}</a>
       </span>
@@ -86,7 +89,7 @@
           },
           {
             title: this.$t('CompletionTime'),
-            dataIndex: 'CompletionTime',
+            dataIndex: 'endTime',
             align: 'center',
             ellipsis: true,
             customRender: function(t, r, index) {
@@ -97,16 +100,14 @@
             title: this.$t('ProcessStatus'),
             dataIndex: 'isEnd',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'isEnd' }
           },
           {
             title: this.$t('cutoffTime'),
-            dataIndex: 'endTime',
+            dataIndex: 'taskAffirmDueDate',
             align: 'center',
             ellipsis: true,
-            customRender: function(t, r, index) {
-              return moment(t).format('YYYY-MM-DD HH:mm:ss')
-            }
           },
           {
             title: this.$t('operation'),
@@ -208,4 +209,8 @@
     position: relative;
     top: 1px;
   }
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
 </style>
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
index 49b75da1d..204a4839d 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -92,12 +92,9 @@
           },
           {
             title: this.$t('cutoffTime'),
-            dataIndex: 'endTime',
+            dataIndex: 'taskAffirmDueDate',
             align: 'center',
             ellipsis: true,
-            customRender: function(t, r, index) {
-              return moment(t).format('YYYY-MM-DD HH:mm:ss')
-            }
           },
           {
             title: this.$t('operation'),