From fa648d96793d21a376782e08528dbdc112afae66 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 25 Apr 2022 18:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8F=A1=E6=89=8B=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/circulationHistory.vue           | 17 +++++++++++++++++
 .../processForm/handshakeProcess/index.vue      |  2 +-
 .../tabComponents/alreadyProcess/index.vue      |  9 +++++----
 .../tabComponents/processCenter/index.vue       |  3 ++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index 464baaa39..75271d501 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -20,6 +20,8 @@
 </template>
 
 <script>
+  import { getAction, postAction } from '@/api/manage'
+
   export default {
     name: 'circulationHistory',
     data() {
@@ -59,6 +61,21 @@
           }
         ]
       }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      getList() {
+        let query = {
+          prcNum: this.$route.query.prcNum
+        }
+        getAction('/workFlow/get_list_by_instance', query).then((res) => {
+          if (res.success) {
+
+          }
+        })
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 788c63892..dcacd4398 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -159,7 +159,7 @@
     },
     mounted() {
       if (this.$route.query.mes) {
-        this.queryBy = eval('(' + JSON.parse(this.$route.query.mes) + ')')
+        this.queryBy = JSON.parse(this.$route.query.mes)
       }
       this.queryProjectLawsInventoryInfo()
     },
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 2b89fb51a..de3ab1bab 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue
@@ -143,10 +143,11 @@
       },
       // 打开查看
       classAdd(row) {
-        // this.$router.push({
-        //   path: '/handshakeProcess',
-        //   query: row
-        // })
+        let newUrl = this.$router.resolve({
+          path: '/handshakeProcess',
+          query: row
+        })
+        window.open(newUrl.href, '_blank')
       }
     },
     mounted() {
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 154148d17..49b75da1d 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue
@@ -133,10 +133,11 @@
         let index = row.taskIds.lastIndexOf(',')
         row.taskIds = row.taskIds.slice(0, index)
         if (row.prcType == '1') {
-          this.$router.push({
+          let newUrl = this.$router.resolve({
             path: '/handshakeProcess',
             query: row
           })
+          window.open(newUrl.href, '_blank')
         }
       },
       onChange(page, pageSize) {