From 5de2c8aa04b54da5ac7375d6dfad984f4f0f3371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Wed, 31 Mar 2021 10:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8A=9F=E8=83=BD=E5=AE=8C?=
 =?UTF-8?q?=E5=96=840331?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkManage/checkOperation.vue | 14 ++++++++------
 src/views/historyMonitoring/index.vue    |  6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index a0a0a02..569e8a5 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -45,7 +45,8 @@
                          style="width:100%;display:flex;align-items:center;justify-content:space-between;flex-direction: column">
                         <div class="carousel-page"
                              v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
-                            <p class="carousel-page-title" @click="goHistory">工单号：{{checkObj.orderNum}}</p>
+                            <p class="carousel-page-title" @click="goHistory(checkObj.orderNum)" v-if="checkObj.orderNum">工单号：{{checkObj.orderNum}}</p>
+                            <p class="carousel-page-title" @click="goHistory()" v-else>工单号：暂无</p>
                             <div class="carousel-page-content">
                                 <div class="img-box">
                                     <img
@@ -132,7 +133,7 @@
                      style="width:100%;display:flex;align-items:center;justify-content:space-between;flex-direction: column">
                     <div class="carousel-page"
                          v-if="listrow == row && listcolumn == column">
-                        <p class="carousel-page-title" @click="goHistory">工单号：暂无</p>
+                        <p class="carousel-page-title" @click="goHistory()">工单号：暂无</p>
                         <div class="carousel-page-content">
                             <div class="img-box">
                                 <div
@@ -318,6 +319,8 @@ export default {
             console.log(value)
             this.select = value
             this.id = value
+            this.row = 1
+            this.column =1
             console.log(JSON.stringify(this.checkObj))
             this.getStreetList()
             for (var i = 0; i < this.listData.length; i++) {
@@ -339,8 +342,6 @@ export default {
                         this.selectType2 = 'out'
                         this.getStockInfo(1, 1, this.shelveId)
                     }
-
-
                 }
             }
         },
@@ -480,9 +481,10 @@ export default {
             this.visible = visible
             this.modelData = data
         },
-        goHistory(){
+        goHistory(orderNum){
             const href = this.$router.resolve({
-                name: 'historyMonitoring'
+                name: 'historyMonitoring',
+                params:{orderNum:orderNum}
             });
             window.open(href.href, '_blank');
         },
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index e53b3a0..0574ca6 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -168,9 +168,9 @@ export default {
     mounted() {
         this.handleGetHistoryList()
         console.log(this.imgUrl)
-        if (this.$route.query.orderNum) {
-            console.log(this.$route.query.orderNum)
-            this.queryParam.orderNum = this.$route.query.orderNum
+        if (this.$route.params.orderNum) {
+            console.log(this.$route.params.orderNum)
+            this.queryParam.orderNum = this.$route.params.orderNum
         }
     },
     methods: {