diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 0790dbef4..c78e51861 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -1,1379 +1,1764 @@ diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index a7adeaa6c..9514ed1f3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -239,11 +239,23 @@ export default { this.queryProcess() }, dealWith (row) { // 查看 + let oldAndNew = '' + const currentDate = new Date().getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } const routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { prcNum: row.prcNum, - tabsName: 'AlreadyProcess' + tabsName: 'AlreadyProcess', + actiProcInstId: row.prcId, + flowType: row.prcType, + oldAndNew:oldAndNew, } }) window.open(routeUrl.href, '_blank'); diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 7d79ec453..86df48d0b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -269,11 +269,23 @@ export default { this.queryProcess() }, dealWith (row) { // 查看 + let oldAndNew = '' + const currentDate = new Date().getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } const routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { prcNum: row.prcNum, - tabsName: 'AlreadySend' + tabsName: 'AlreadySend', + actiProcInstId: row.prcId, + flowType: row.prcType, + oldAndNew:oldAndNew, } }) window.open(routeUrl.href, '_blank'); diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index aabdfe5a8..619d96d79 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -242,12 +242,24 @@ export default { this.queryProcess() }, dealWith (row) { // 查看 + let oldAndNew = '' + const currentDate = new Date().getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } const routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { bpnId: row.id, prcNum: row.prcNum, - tabsName: 'MonitorProcess' + tabsName: 'MonitorProcess', + actiProcInstId: row.prcId, + flowType: row.prcType, + oldAndNew:oldAndNew, } }) window.open(routeUrl.href, '_blank'); diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 836fb7452..f7b3add7b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -156,7 +156,7 @@ 办理 - 转办 + 转办