对接握手流程

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')
+            }
           }
         ]
       }

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

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>

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>

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'),