From 7fc732afb3c3cc9f8b5709744401c28d68bc7206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 29 Jan 2024 14:07:33 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processDetail/index.vue | 3097 +++++++++-------- .../tabComponents/alreadyProcess/index.vue | 14 +- .../tabComponents/alreadySend/index.vue | 14 +- .../tabComponents/monitorProcess/index.vue | 14 +- .../tabComponents/processCenter/index.vue | 2 +- 5 files changed, 1781 insertions(+), 1360 deletions(-) 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 @@ 办理 - 转办 + 转办 From ab224f7bca98b914b22ab12498e574f744ddcbcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 29 Jan 2024 16:42:47 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/processDetail/index.vue | 204 ++++++++++-------- .../tabComponents/alreadyProcess/index.vue | 2 +- .../tabComponents/alreadySend/index.vue | 2 +- .../tabComponents/monitorProcess/index.vue | 2 +- 4 files changed, 123 insertions(+), 87 deletions(-) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index c78e51861..0cec8a725 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -9,8 +9,7 @@
- -
+
开始
@@ -22,13 +21,27 @@ class="flow-group-process-arrow">
- 起草 + {{item.taskKeyName}}
-
- {{item.name}} + +
+
+ {{val1}} +
+
+
+
+
{{val}}
+
+
+ +
+
暂未选择处理人
结束
+
@@ -97,6 +111,77 @@
+ + + + + + + + + + + + + + + + + + + 流程列表加载中 { - // this.detailData = res + this.nameList = res + this.nameList.forEach(val=>{ + if (val.userNames){ + val.userNames = val.userNames.split(',') + } + }) this.$nextTick(() => { let flowGroupProcess = document.getElementsByClassName('flow-group-process') let num = (flowGroupProcess[0].offsetWidth - 100) / 248 @@ -358,7 +385,7 @@ const currentItem = this.detailData[this.approveRowIndex] row.currentItem = currentItem - const prcType = this.detailData[index].prcType // 流程类型 + const prcType = this.detailData[index].prcType || this.detailData[index].flowType // 流程类型 if (isEnd) { if (this.$store.state.detailMap !== '') { const lastDetailMap = this.$store.getters.getLastDetailMap @@ -1334,13 +1361,14 @@ processTable() { let url = '' let query = {} - if (this.$route.query.oldAndNew == 'new'){ + if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3') { url = '/lawss/activiti/queryFlowHistoryList' query = { actiProcInstId: this.$route.query.actiProcInstId, flowType: this.$route.query.flowType, } - }else{ + } else { + console.log(11111); url = 'lawss/activiti/get_list_by_instance' query = { prcNum: this.$route.query.prcNum, @@ -1499,17 +1527,17 @@ return false }, backdrop(status) { - if (status == 1) { + if (status == 'done') { return { background: '#bcddff', border: '1px #79c8ff solid', } - } else if (status == 2) { + } else if (status == 'todo') { return { background: '#ebfccf', border: '1px #8bcb71 solid', } - } else if (status == 3) { + } else { return { background: '#fff', border: '1px #d6d6d6 solid', @@ -1547,9 +1575,11 @@ } }, mounted() { - - this.getProcessList() - this.processNum() + if (this.$route.query.oldAndNew == 'new' && this.$route.query.flowType == '3'){ + this.getProcessList() + }else{ + this.processNum() + } this.processTable() this.getApproveShow() } @@ -1740,6 +1770,12 @@ width: 100%; font-size: 12px; line-height: 1.4; + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; /* 超出几行省略 */ + overflow: hidden; } .flow-group-process-arrow-dis { diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index 9514ed1f3..0192f60ea 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -240,7 +240,7 @@ export default { }, dealWith (row) { // 查看 let oldAndNew = '' - const currentDate = new Date().getTime(); + const currentDate = new Date('2024-01-25 23:59:59').getTime(); const date = new Date(row.creatTime); const timestamp = date.getTime(); if (currentDate > timestamp){ diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue index 86df48d0b..bdf5918f5 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue @@ -270,7 +270,7 @@ export default { }, dealWith (row) { // 查看 let oldAndNew = '' - const currentDate = new Date().getTime(); + const currentDate = new Date('2024-01-25 23:59:59').getTime(); const date = new Date(row.creatTime); const timestamp = date.getTime(); if (currentDate > timestamp){ diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue index 619d96d79..95977ca37 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue @@ -243,7 +243,7 @@ export default { }, dealWith (row) { // 查看 let oldAndNew = '' - const currentDate = new Date().getTime(); + const currentDate = new Date('2024-01-25 23:59:59').getTime(); const date = new Date(row.creatTime); const timestamp = date.getTime(); if (currentDate > timestamp){ From 9806c46e048ab84190e42f43cc74bd57dd6d59e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 30 Jan 2024 10:48:50 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-9.vue | 4 + .../pages/creatProcess/bzzqyj/step2.vue | 4 + .../pages/creatProcess/bzzqyj/step5-1.vue | 4 + .../pages/processDetail/index.vue | 107 ++++++++++++------ 4 files changed, 83 insertions(+), 36 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index eea930efe..39e2ce387 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -225,6 +225,7 @@ + 数据获取中
{ this.histortData = res + this.loading = false }, e => {}) }, upload(row, title) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 29595f68f..36c8d6fb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -176,6 +176,7 @@ + 数据获取中 { this.histortData = res; + this.loading = false }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue index 520704048..92e436032 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -278,6 +278,7 @@ + 数据获取中 { this.histortData = res; + this.loading = false }, e => { }); }, diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 0cec8a725..b5e7b6748 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -33,12 +33,13 @@ {{val1}} -
+
-
{{val}}
+
{{val}}
-
+
暂未选择处理人
@@ -134,18 +135,15 @@ prop="taskKeyShow" label="任务步骤" align="center" - sortable="custom" />