diff --git a/src/components/index.js b/src/components/index.js index cb817aa18..099c29b90 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -27,6 +27,7 @@ import SQTree from './SQTree' import OrgTable from './OrgTable' import MySelect from './mySelect' import PhoneHistortTable from './phoneHistortTable' +import processNodeInformation from './processNodeInformation' import phoneRole from './phoneRole' @@ -57,6 +58,7 @@ const install = function (Vue) { Vue.component('MySelect', MySelect) Vue.component('phoneRole', phoneRole) Vue.component('PhoneHistortTable', PhoneHistortTable) + Vue.component('processNodeInformation', processNodeInformation) } export default { diff --git a/src/components/processNodeInformation/index.vue b/src/components/processNodeInformation/index.vue new file mode 100644 index 000000000..ab3f8ffce --- /dev/null +++ b/src/components/processNodeInformation/index.vue @@ -0,0 +1,558 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index eea930efe..d4c51d96e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -170,61 +170,67 @@ -
- - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ this.histortData = res + this.loading = false }, e => {}) }, upload(row, title) { @@ -380,7 +389,7 @@ export default { } }, mounted () { - this.getHistoryData() + // this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 29595f68f..f872f08d0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -115,67 +115,73 @@
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ this.histortData = res; + this.loading = false }, e => { }); }, @@ -428,7 +437,7 @@ export default { } }, mounted() { - this.getHistoryData(); + // this.getHistoryData(); this.getData(); } }; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index ddda7b3b8..fa0d445ba 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -195,67 +195,72 @@
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ if(ev.key === 'freshClueNum'){ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index 520704048..146dad5cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -216,68 +216,74 @@
-
- - - +
+ + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ this.histortData = res; + this.loading = false }, e => { }); }, @@ -758,7 +767,7 @@ export default { } }, mounted() { - this.getHistoryData(); + // this.getHistoryData(); this.getData(); } }; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 354d2fab1..6da501993 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -211,67 +211,72 @@
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-->
-
- - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
模块信息
-->
审批历史
-
+
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue index 3c19e32b5..89e693696 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue @@ -9,7 +9,7 @@
会签评分
审批历史
-
+
-
-
- - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index bd8d08ac6..e3f8eb3df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -9,7 +9,7 @@
审批历史
-
+
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index ce9eae7ca..b400df8d6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -10,7 +10,7 @@
审批历史
-
+
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index d7d823b21..81f63a766 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -10,7 +10,7 @@
审批历史
-
+
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 9be5589c5..d761cabe8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -11,7 +11,7 @@
审批历史
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ this.tablePHeight = $('.content').height() diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 5c5a6f145..322c60fd7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -10,7 +10,7 @@
审批历史
-
+
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 096d24c61..7253830e4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -1,4 +1,5 @@ -
-
-
- - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index e3c08f776..cbd8ce5a7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -11,7 +11,7 @@
审批历史
-
+
-
-
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index a753c669f..57e5b6d50 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -9,7 +9,7 @@
审批历史
-
+
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index d19d610ec..29c7682db 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -10,7 +10,7 @@
审批历史
-
+
-
-
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index cbef35337..1b59576b1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -11,7 +11,7 @@
审批历史
-
+
-->
-
-
- - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index c63ce5882..65a713a7e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -10,7 +10,7 @@
审批历史
-
+
-
+
-->
-
-
- - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index ee8fad2e6..e4a31ec0d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -11,7 +11,7 @@
审批历史
-
+
-
-
- - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index 5d8bae2b5..612ed4bff 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -9,7 +9,7 @@
审批历史
-
+
-
+
-
-
- - - - - - - - - - - - - - - - - - - - - 流程列表加载中 -
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{ diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 0790dbef4..103c9e93d 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -1,1379 +1,1864 @@ diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index a7adeaa6c..0192f60ea 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('2024-01-25 23:59:59').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..bdf5918f5 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('2024-01-25 23:59:59').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..95977ca37 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('2024-01-25 23:59:59').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..74ce704f1 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 @@ 办理 - 转办 + 转办
@@ -348,6 +348,15 @@ export default { } break case 'buss1': + let oldAndNewBuss = '' + const currentDateBuss = new Date('2024-01-25 23:59:59').getTime(); + const dateBuss = new Date(row.creatTime); + const timestampBuss = dateBuss.getTime(); + if (currentDateBuss > timestampBuss){ + oldAndNewBuss = 'old' + }else{ + oldAndNewBuss = 'new' + } if (row.taskInfo === '企标编写') { routeUrl = this.$router.resolve({ name: 'bussLibrary2', @@ -356,7 +365,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '企标编写汇总') { @@ -367,7 +377,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '重新起草') { @@ -378,7 +389,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '标准化初审') { @@ -389,7 +401,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '重新企标编写汇总') { @@ -400,7 +413,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '征求意见') { @@ -411,7 +425,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '技术委员会评审、评审意见修改') { @@ -422,7 +437,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '标准化复审') { @@ -433,7 +449,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '重新技术委员会评审、评审意见修改') { @@ -444,7 +461,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '起草单位高级经理审核') { @@ -455,7 +473,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '标准法规部高级经理审核') { @@ -466,7 +485,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '审定') { @@ -477,7 +497,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '批准') { @@ -488,7 +509,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '主起草人培训') { @@ -499,7 +521,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) }else if (row.taskInfo === '发布') { @@ -510,7 +533,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNewBuss } }) } @@ -937,6 +961,15 @@ export default { } break; case '3': + let oldAndNew = '' + const currentDate = new Date('2024-01-25 23:59:59').getTime(); + const date = new Date(row.creatTime); + const timestamp = date.getTime(); + if (currentDate > timestamp){ + oldAndNew = 'old' + }else{ + oldAndNew = 'new' + } if (row.taskInfo === '任务分发') { routeUrl = this.$router.resolve({ name: 'bzzqyjStep2', @@ -945,7 +978,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见反馈') { @@ -956,7 +990,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见汇总报批') { @@ -967,7 +1002,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见审批') { @@ -978,7 +1014,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '管理员') { @@ -989,7 +1026,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '意见处理') { @@ -1000,7 +1038,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '会签') { @@ -1011,7 +1050,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '审核') { @@ -1022,7 +1062,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '审定' ) { @@ -1033,7 +1074,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) } else if (row.taskInfo === '批准') { @@ -1044,7 +1086,8 @@ export default { prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, - prcType: row.prcType + prcType: row.prcType, + oldAndNew: oldAndNew } }) }