Browse Source

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

chenrui 3 năm trước cách đây
mục cha
commit
64da8ece8e

+ 1 - 2
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -349,13 +349,12 @@ export default {
   },
   mounted () {
     this.getDetail()
-    this.getWarehouseCascade()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.getWarehouseCascade()
       if (!vm.disabled) {
         vm.getDetail()
-        vm.getWarehouseCascade()
         vm.resetSearchForm()
       }
     })

+ 1 - 1
src/views/allocationManagement/chainTransferIn/list.vue

@@ -251,8 +251,8 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.getPutTenantList()
       if (!vm.disabled) {
-        vm.getPutTenantList()
         vm.$refs.table.refresh()
       }
     })

+ 1 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -313,8 +313,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.openModal = false
+      vm.getPutTenantList()
       if (!vm.disabled) {
-        vm.getPutTenantList()
         vm.$refs.table.refresh()
       }
     })

+ 1 - 1
src/views/allocationManagement/storeTransferOut/list.vue

@@ -298,8 +298,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.openModal = false
+      vm.getStoreCallOutTypeAllList()
       if (!vm.disabled) {
-        vm.getStoreCallOutTypeAllList()
         vm.$refs.table.refresh()
       }
     })

+ 2 - 4
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -543,16 +543,14 @@ export default {
   },
   mounted () {
     this.getDetail()
-    this.getProductBrand()
-    this.getProductType()
     this.chooseResetSearchForm()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.getProductBrand()
+      vm.getProductType()
       if (!vm.disabled) {
         vm.getDetail()
-        vm.getProductBrand()
-        vm.getProductType()
         vm.chooseResetSearchForm()
       }
     })

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -255,8 +255,8 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.getWarehouseList()
       if (!vm.disabled) {
-        vm.getWarehouseList()
         vm.$refs.table.refresh()
       }
     })

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -326,8 +326,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.openModal = false
+      vm.getSupplierList()
       if (!vm.disabled) {
-        vm.getSupplierList()
         vm.$refs.table.refresh()
       }
     })

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -356,8 +356,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.openModal = false
+      vm.getSupplierList()
       if (!vm.disabled) {
-        vm.getSupplierList()
         vm.$refs.table.refresh()
       }
     })

+ 1 - 3
src/views/customerManagement/customerInfo/edit.vue

@@ -343,9 +343,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (!vm.disabled) {
-        vm.initPage()
-      }
+      vm.initPage()
     })
   }
 }

+ 2 - 2
src/views/customerManagement/customerInfo/list.vue

@@ -344,9 +344,9 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.getArea('province')
+      vm.getCustTypeList()
       if (!vm.disabled) {
-        vm.getArea('province')
-        vm.getCustTypeList()
         vm.$refs.table.refresh()
       }
     })

+ 11 - 4
src/views/financialManagement/expenseManagement/edit.vue

@@ -188,10 +188,9 @@ export default {
     //  返回列表
     handleBack () {
       this.$router.push({ path: '/financialManagement/expenseManagement/list', query: { closeLastOldTab: true } })
-    }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
+    },
+    pageInit () {
+      const vm = this
       vm.$refs.ruleForm.resetFields()
       if (vm.$route.params.id) {
         //  编辑页
@@ -199,6 +198,14 @@ export default {
       }
       vm.getCostTypeList()
       vm.getSettleStyle()
+    }
+  },
+  mounted () {
+    // this.pageInit()
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.pageInit()
     })
   }
 }

+ 7 - 0
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -352,6 +352,13 @@ export default {
         _this.setTableH()
       }, 400)
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (!vm.disabled) {
+        vm.resetSearchForm()
+      }
+    })
   }
 }
 </script>

+ 3 - 0
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -446,6 +446,9 @@ export default {
     next(vm => {
       vm.getProductType()
       vm.getProductBrand()
+      if (!vm.disabled) {
+        vm.resetSearchForm()
+      }
     })
   }
 }

+ 5 - 1
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -197,7 +197,11 @@ export default {
     })
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.resetSearchForm()
+      }
+    })
   }
 }
 </script>

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -313,8 +313,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.openModal = false
+      vm.getSupperList()
       if (!vm.disabled) {
-        vm.getSupperList()
         vm.$refs.table.refresh()
       }
     })

+ 13 - 13
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -549,25 +549,25 @@ export default {
       link.setAttribute('download', fname + '.xlsx')
       document.body.appendChild(link)
       link.click()
+    },
+    pageInit () {
+      this.orderId = this.$route.params.id
+      this.orderSn = this.$route.params.sn
+      this.buyerSn = this.$route.params.buyerSn
+      this.getOrderDetail()
+      this.getWarehouseCascade()
+      if (!this.disabled) {
+        this.resetForm()
+        this.$refs.queryPart.resetSearchForm()
+      }
     }
   },
   mounted () {
-    this.orderId = this.$route.params.id
-    this.orderSn = this.$route.params.sn
-    this.buyerSn = this.$route.params.buyerSn
-    this.getOrderDetail()
-    this.getWarehouseCascade()
-    this.resetForm()
-    this.$refs.queryPart.resetSearchForm()
+    this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (!vm.disabled) {
-        vm.getOrderDetail()
-        vm.getWarehouseCascade()
-        vm.resetForm()
-        vm.$refs.queryPart.resetSearchForm()
-      }
+      vm.pageInit()
     })
   }
 }

+ 13 - 13
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -537,25 +537,25 @@ export default {
       link.setAttribute('download', fname + '.xlsx')
       document.body.appendChild(link)
       link.click()
+    },
+    pageInit () {
+      this.orderId = this.$route.params.id
+      this.orderSn = this.$route.params.sn
+      this.buyerSn = this.$route.params.buyerSn
+      this.getOrderDetail()
+      this.getWarehouseCascade()
+      if (!this.disabled) {
+        this.resetForm()
+        this.$refs.queryPart.resetSearchForm()
+      }
     }
   },
   mounted () {
-    this.orderId = this.$route.params.id
-    this.orderSn = this.$route.params.sn
-    this.buyerSn = this.$route.params.buyerSn
-    this.getOrderDetail()
-    this.getWarehouseCascade()
-    this.resetForm()
-    this.$refs.queryPart.resetSearchForm()
+    this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (!vm.disabled) {
-        vm.getOrderDetail()
-        vm.getWarehouseCascade()
-        vm.resetForm()
-        vm.$refs.queryPart.resetSearchForm()
-      }
+      vm.pageInit()
     })
   }
 }