浏览代码

bug 修复

lilei 3 年之前
父节点
当前提交
6783c6f778

+ 5 - 0
src/App.vue

@@ -33,6 +33,11 @@ export default {
     window.addEventListener('beforeunload', () => {
       sessionStorage.setItem('store', JSON.stringify(this.$store.state))
     })
+    this.$message.config({
+      top: `100px`,
+      duration: 3,
+      maxCount: 3
+    })
   }
 }
 </script>

+ 2 - 2
src/layouts/RouteView.vue

@@ -26,8 +26,8 @@ export default {
     // if (!getters.multiTab && !meta.keepAlive) {
     //   return notKeep
     // }
-    // return this.keepAlive || getters.multiTab || meta.keepAlive ? inKeep : notKeep
-    return meta.keepAlive ? inKeep : notKeep
+    return this.keepAlive || getters.multiTab || meta.keepAlive ? inKeep : notKeep
+    // return meta.keepAlive ? inKeep : notKeep
   }
 }
 </script>

+ 8 - 3
src/views/allocationManagement/transferOut/detail.vue

@@ -75,6 +75,7 @@ export default {
       spinning: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
+        this.spinning = true
         return allocateBillDetailList(Object.assign(parameter, { allocateSn: this.outBizSn || this.$route.params.sn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -82,6 +83,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.localDataSource = data.list
+          this.spinning = false
           return data
         })
       },
@@ -92,7 +94,7 @@ export default {
   },
   computed: {
     isEdit () {
-      return this.basicInfoData && ((this.basicInfoData.state == 'WAIT_SUBMIT') || (this.basicInfoData.state == 'WAIT_AUDIT') || (this.basicInfoData.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')
+      return this.basicInfoData && ((this.basicInfoData.state == 'WAIT_SUBMIT') || (this.basicInfoData.state == 'WAIT_AUDIT') || (this.basicInfoData.state == 'AUDIT_REJECT')) && this.$hasPermissions('M_transferOut_edit')
     },
     columns () {
       const arr = [
@@ -182,8 +184,11 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      // vm.getDetail()
-      // vm.getDetailCount()
+      if (!vm.spinning) {
+        vm.getDetail()
+        vm.getDetailCount()
+        vm.$refs.table.refresh()
+      }
     })
   }
 }

+ 15 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -51,6 +51,7 @@
               :rowKey="(record) => record.stockSn"
               :columns="columns"
               :customRow="handleClickRow"
+              :defaultLoadData="false"
               :data="loadData"
               :scroll="{ x: 990, y: 300 }"
               bordered>
@@ -111,6 +112,7 @@
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :data="chooseLoadData"
+              :defaultLoadData="false"
               :scroll="{ x: 1160, y: 300 }"
               bordered>
               <!-- 售价 -->
@@ -468,10 +470,22 @@ export default {
         window.frames['printf'].focus()
         window.frames['printf'].print()
       }
+    },
+    pageInit () {
+      this.resetSearchForm()
+      this.chooseResetSearchForm()
     }
   },
+  mounted () {
+    this.pageInit()
+  },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      // 获取促销活动
+      if (!vm.disabled) {
+        vm.pageInit()
+      }
+    })
   }
 }
 </script>

+ 3 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -317,7 +317,9 @@ export default {
     next(vm => {
       vm.openModal = false
       vm.getAllocateTypeAllList()
-      vm.$refs.table.refresh()
+      if (!vm.disabled) {
+        vm.$refs.table.refresh()
+      }
     })
   }
 }

+ 5 - 0
src/views/basicData/warehouse/list.vue

@@ -161,6 +161,11 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
     })
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.$refs.table.refresh()
+    })
   }
 }
 </script>

+ 5 - 0
src/views/basicData/warehouse/storingLocation/list.vue

@@ -171,6 +171,11 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
     })
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.resetSearchForm()
+    })
   }
 }
 </script>

+ 5 - 1
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -291,7 +291,11 @@ export default {
     })
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.$refs.table.refresh(true)
+      }
+    })
   }
 }
 </script>

+ 15 - 3
src/views/inventoryManagement/intelligentReplenishment/edit.vue

@@ -224,6 +224,19 @@ export default {
     },
     setTableH () {
       this.tableHeight = window.innerHeight - 550
+    },
+    pageInit () {
+      this.form = {
+        stockPredictRange: 1,
+        saleEnsureNum: '',
+        trendSn: '',
+        serviceLevel: '',
+        safetyFactor: ''
+      }
+      this.$refs.ruleForm.resetFields()
+      this.getDetail()
+      this.getTrendSn()
+      this.current = 0
     }
   },
   mounted () {
@@ -231,12 +244,11 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
     })
+    this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getDetail()
-      vm.getTrendSn()
-      vm.current = 0
+      vm.pageInit()
     })
   }
 }

+ 5 - 1
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -217,6 +217,7 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
     })
+    this.getWarehouseList()
   },
   watch: {
     advanced (newValue, oldValue) {
@@ -228,7 +229,10 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getWarehouseList()
+      if (!vm.disabled) {
+        vm.getWarehouseList()
+        vm.$refs.table.refresh()
+      }
     })
   }
 }

+ 5 - 0
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -214,6 +214,11 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
     })
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.$refs.table.refresh()
+    })
   }
 }
 </script>