From 9858f5713f5293725e365d44dddefa153a9aec53 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 25 Mar 2022 11:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E8=BD=AC=20sxm=202022-3-25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shopOrder/shopOrder/shopOrder.vue | 5 +++++
 src/views/modules/yieldReport/produce_order.vue     | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index 76d7df6..e397a1d 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -1643,6 +1643,9 @@
         handler: function(val, oldVal){
           this.$router.onReady(() => {
             this.modelData.orderNo = this.$route.query.order
+            this.modelData.site = this.$route.query.site
+            this.modelData.user = this.$route.query.user
+            this.tableHanddle(this.modelData)
           })
         },
         // 深度观察监听
@@ -1908,6 +1911,8 @@
     created() {
       this.$router.onReady(() => {
         this.modelData.orderNo = this.$route.query.order
+        this.modelData.site = this.$route.query.site
+        this.tableHanddle(this.modelData)
       })
     }
   }
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 3af4636..ed65202 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1233,7 +1233,9 @@ export default {
         this.$router.push({
           path: '/shopOrder-shopOrder/shopOrder',
           query: {
-            order: this.currentRow.orderNo
+            order: this.currentRow.orderNo,
+            site: this.currentRow.site,
+            user: this.$store.state.user.name
           }
         })
       }