对接握手流程

修改文档库详情的标注分解单的显隐

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -245,7 +245,7 @@
           <a class="text" @click="download(record)">
                 {{$t('download')}}
           </a>
-          <a class="text" @click="breakdown(record)">
+          <a class="text" @click="breakdown(record)" v-if="record.splitFlag == 1">
                 {{$t('StandardBreakdown')}}
           </a>
         </span>
@@ -348,7 +348,7 @@
       clickButtonToUpload(item) {
         this.loading = true
         this.visibleFile = true
-        getAction('sys/common/getFileInfos', { id: item.join(',') }).then((res) => {
+        getAction('document/bussDocumentLibraryEO/getFileInfos', { id: item.join(',') }).then((res) => {
           if (res.success) {
             this.dataSourceFile = res.result
             this.loading = false

jero-web/src/views/processCenter/processList/index.vue

@@ -46,14 +46,15 @@
             title: this.$t('monitoringProcess'),
             name: 'MonitorProcess'
           },
-          {
+          // {
-            title: this.$t('draft'),
+          //   title: this.$t('draft'),
-            name: 'TaskDraft'
+          //   name: 'TaskDraft'
-          },
+          // },
           ]
       }
     },
     mounted() {
+
     },
     methods: {
       callback(key) {

jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue

@@ -85,7 +85,7 @@
           },
           {
             title: this.$t('ProcessingTime'),
-            dataIndex: 'createTime',
+            dataIndex: 'ProcessingTime',
             align: 'center',
             ellipsis: true
           },
@@ -143,10 +143,10 @@
       },
       // 打开查看
       classAdd(row) {
-        this.$router.push({
+        // this.$router.push({
-          path: '/handshakeProcess',
+        //   path: '/handshakeProcess',
-          query: row
+        //   query: row
-        })
+        // })
       }
     },
     mounted() {

jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue

@@ -11,6 +11,12 @@
       :loading="loading"
       :columns="columns"
     >
+      <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>
@@ -43,12 +49,16 @@
         pageNo: 1,
         pageSize: 10,
         selectedRowKeys: [],
+        prcTypeName: {
+          1: '任务确认流程'
+        },
         columns: [
           {
             title: this.$t('ProcessType'),
             dataIndex: 'prcType',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'prcType' }
           },
           {
             title: this.$t('Sponsor'),
@@ -79,7 +89,7 @@
           },
           {
             title: this.$t('CompletionTime'),
-            dataIndex: 'createTime',
+            dataIndex: 'CompletionTime',
             align: 'center',
             ellipsis: true,
             customRender: function(t, r, index) {
@@ -90,7 +100,8 @@
             title: this.$t('ProcessStatus'),
             dataIndex: 'isEnd',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'isEnd' }
           },
           {
             title: this.$t('cutoffTime'),

jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue

@@ -11,6 +11,9 @@
       :loading="loading"
       :columns="columns"
     >
+      <span slot="prcType" slot-scope="text,record">
+       {{prcTypeName[text]}}
+      </span>
       <span slot="operation" slot-scope="record">
           <a @click="classAdd(record)" style="margin-right:8px">{{$t('See')}}</a>
       </span>
@@ -43,12 +46,16 @@
         pageNo: 1,
         pageSize: 10,
         selectedRowKeys: [],
+        prcTypeName: {
+          1: '任务确认流程'
+        },
         columns: [
           {
             title: this.$t('ProcessType'),
             dataIndex: 'prcType',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'prcType' }
           },
           {
             title: this.$t('Sponsor'),
@@ -79,7 +86,7 @@
           },
           {
             title: this.$t('CompletionTime'),
-            dataIndex: 'createTime',
+            dataIndex: 'CompletionTime',
             align: 'center',
             ellipsis: true,
             customRender: function(t, r, index) {

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -11,6 +11,9 @@
       :loading="loading"
       :columns="columns"
     >
+       <span slot="prcType" slot-scope="text,record">
+       {{prcTypeName[text]}}
+      </span>
       <span slot="operation" slot-scope="record">
           <a @click="dealWith(record)" style="margin-right:8px">{{$t('Processing')}}</a>
       </span>
@@ -43,6 +46,9 @@
         pageNo: 1,
         pageSize: 10,
         selectedRowKeys: [],
+        prcTypeName: {
+          1: '任务确认流程'
+        },
         columns: [
           {
             title: this.$t('RelatedItems'),
@@ -66,7 +72,8 @@
             title: this.$t('ProcessType'),
             dataIndex: 'prcType',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'prcType' }
           },
           {
             title: this.$t('Sponsor'),