diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index ba142e0dc..ef7eed81a 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -245,7 +245,7 @@
{{$t('download')}}
-
+
{{$t('StandardBreakdown')}}
@@ -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
diff --git a/jero-web/src/views/processCenter/processList/index.vue b/jero-web/src/views/processCenter/processList/index.vue
index 9a1ad8379..ed51e8ad0 100644
--- a/jero-web/src/views/processCenter/processList/index.vue
+++ b/jero-web/src/views/processCenter/processList/index.vue
@@ -46,14 +46,15 @@
title: this.$t('monitoringProcess'),
name: 'MonitorProcess'
},
- {
- title: this.$t('draft'),
- name: 'TaskDraft'
- },
+ // {
+ // title: this.$t('draft'),
+ // name: 'TaskDraft'
+ // },
]
}
},
mounted() {
+
},
methods: {
callback(key) {
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 f88194fa7..2b89fb51a 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/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({
- path: '/handshakeProcess',
- query: row
- })
+ // this.$router.push({
+ // path: '/handshakeProcess',
+ // query: row
+ // })
}
},
mounted() {
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 4fd010c96..c47c158c0 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue
@@ -11,6 +11,12 @@
:loading="loading"
:columns="columns"
>
+
+ {{prcTypeName[text]}}
+
+
+ {{text && text == 0 ? '未完成':'已完成'}}
+
{{$t('See')}}
@@ -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'),
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 04c65876e..e66377458 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue
@@ -11,6 +11,9 @@
:loading="loading"
:columns="columns"
>
+
+ {{prcTypeName[text]}}
+
{{$t('See')}}
@@ -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) {
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 87cd21000..154148d17 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -11,6 +11,9 @@
:loading="loading"
:columns="columns"
>
+
+ {{prcTypeName[text]}}
+
{{$t('Processing')}}
@@ -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'),