Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/component/routers/route.js

@@ -151,7 +151,7 @@ const houseSelfCollectRouter = {
         shortcutEntrance: 'houseSelfCollect',
         module: 'acquisitionManagement.acquisitionPay',
         permissicon: [],
-        keepAlive: true
+        // keepAlive: true
       }
     },
     {

src/views/houseSelfCollect/paymentManagement.vue

@@ -476,13 +476,19 @@
         goodsName:"全部",
       }
     },
-    activated() {
+    mounted() {debugger
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-      
+
       this.getPassYearFormatDate()
       this.getWarehouse()
-      // this.getList()
     },
+    // activated() {
+    //   this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
+
+    //   this.getPassYearFormatDate()
+    //   this.getWarehouse()
+    //   // this.getList()
+    // },
     updated() {
 
       this.$nextTick(() => {