lilei il y a 3 ans
Parent
commit
72805e95cf
30 fichiers modifiés avec 192 ajouts et 43 suppressions
  1. 2 2
      src/layouts/RouteView.vue
  2. 9 1
      src/views/allocationManagement/chainTransferIn/detail.vue
  3. 10 2
      src/views/allocationManagement/chainTransferIn/edit.vue
  4. 4 2
      src/views/allocationManagement/chainTransferIn/list.vue
  5. 4 1
      src/views/allocationManagement/chainTransferOut/detail.vue
  6. 11 2
      src/views/allocationManagement/chainTransferOut/edit.vue
  7. 4 2
      src/views/allocationManagement/chainTransferOut/list.vue
  8. 7 2
      src/views/allocationManagement/storeTransferOut/detail.vue
  9. 15 4
      src/views/allocationManagement/storeTransferOut/edit.vue
  10. 4 2
      src/views/allocationManagement/storeTransferOut/list.vue
  11. 4 1
      src/views/allocationManagement/warehouseAllocation/detail.vue
  12. 17 5
      src/views/allocationManagement/warehouseAllocation/edit.vue
  13. 4 2
      src/views/allocationManagement/warehouseAllocation/list.vue
  14. 7 1
      src/views/financialManagement/companyCollectionPayment/detail.vue
  15. 1 0
      src/views/financialManagement/companyCollectionPayment/list.vue
  16. 1 0
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  17. 7 0
      src/views/financialManagement/companyReceivablePayable/detail.vue
  18. 7 0
      src/views/financialManagement/expenseManagement/list.vue
  19. 7 1
      src/views/financialManagement/warehousingAudit/detail.vue
  20. 1 0
      src/views/financialManagement/withdrawalManagement/list.vue
  21. 4 1
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  22. 8 0
      src/views/purchasingManagement/purchaseOrder/detail.vue
  23. 12 1
      src/views/purchasingManagement/purchaseOrder/edit.vue
  24. 4 2
      src/views/purchasingManagement/purchaseOrder/list.vue
  25. 4 1
      src/views/purchasingManagement/purchaseReturn/detail.vue
  26. 14 1
      src/views/purchasingManagement/purchaseReturn/edit.vue
  27. 4 2
      src/views/purchasingManagement/purchaseReturn/list.vue
  28. 5 3
      src/views/salesManagement/salesQuery/list.vue
  29. 8 0
      src/views/salesManagement/salesReturn/detail.vue
  30. 3 2
      src/views/salesManagement/salesReturn/list.vue

+ 2 - 2
src/layouts/RouteView.vue

@@ -26,8 +26,8 @@ export default {
     // if (!getters.multiTab && !meta.keepAlive) {
     // if (!getters.multiTab && !meta.keepAlive) {
     //   return notKeep
     //   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>
 </script>

+ 9 - 1
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -88,6 +88,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         const params = Object.assign(parameter, { allocationLinkagePutSn: this.$route.params.sn })
         const params = Object.assign(parameter, { allocationLinkagePutSn: this.$route.params.sn })
+        this.spinning = true
         return allocLinkagePutDetailList(params).then(res => {
         return allocLinkagePutDetailList(params).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -98,6 +99,7 @@ export default {
           }
           }
           this.getDetailCount(params)
           this.getDetailCount(params)
           this.localDataSource = data.list
           this.localDataSource = data.list
+          this.spinning = false
           return data
           return data
         })
         })
       },
       },
@@ -176,9 +178,15 @@ export default {
       }
       }
     }
     }
   },
   },
+  mounted () {
+    this.getDetail()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getDetail()
+      if (!vm.spinning) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

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

@@ -81,6 +81,7 @@
           :rowKey="(record) => record.id"
           :rowKey="(record) => record.id"
           :columns="columns"
           :columns="columns"
           :data="loadData"
           :data="loadData"
+          :defaultLoadData="false"
           :scroll="{ x: 1110 }"
           :scroll="{ x: 1110 }"
           bordered>
           bordered>
           <!-- 仓库仓位 -->
           <!-- 仓库仓位 -->
@@ -346,10 +347,17 @@ export default {
       }
       }
     }
     }
   },
   },
+  mounted () {
+    this.getDetail()
+    this.getWarehouseCascade()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getDetail()
-      vm.getWarehouseCascade()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.getWarehouseCascade()
+        vm.resetSearchForm()
+      }
     })
     })
   }
   }
 }
 }

+ 4 - 2
src/views/allocationManagement/chainTransferIn/list.vue

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

+ 4 - 1
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -193,7 +193,10 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      // vm.getDetail()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

+ 11 - 2
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -169,6 +169,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :columns="chooseColumns"
               :data="chooseLoadData"
               :data="chooseLoadData"
+              :defaultLoadData="false"
               :scroll="{ x: 1695, y: 300 }"
               :scroll="{ x: 1695, y: 300 }"
               bordered>
               bordered>
               <!-- 操作 -->
               <!-- 操作 -->
@@ -519,10 +520,18 @@ export default {
       }
       }
     }
     }
   },
   },
+  mounted () {
+    this.getDetail()
+    this.getWarehouseList()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getDetail()
-      vm.getWarehouseList()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.getWarehouseList()
+        vm.resetSearchForm()
+        vm.chooseResetSearchForm()
+      }
     })
     })
   }
   }
 }
 }

+ 4 - 2
src/views/allocationManagement/chainTransferOut/list.vue

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

+ 7 - 2
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -93,6 +93,7 @@ export default {
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
+        this.spinning = true
         return storeCallOutDetailList(Object.assign(parameter, { storeCallOutSn: this.outBizSn || this.$route.params.sn })).then(res => {
         return storeCallOutDetailList(Object.assign(parameter, { storeCallOutSn: this.outBizSn || this.$route.params.sn })).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -102,6 +103,7 @@ export default {
             data.list[i].costSubtotal = getOperationalPrecision(data.list[i].outCost, data.list[i].outQty)
             data.list[i].costSubtotal = getOperationalPrecision(data.list[i].outCost, data.list[i].outQty)
           }
           }
           this.localDataSource = data.list
           this.localDataSource = data.list
+          this.spinning = false
           return data
           return data
         })
         })
       },
       },
@@ -187,8 +189,11 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      // vm.getDetail()
-      // vm.getDetailCount()
+      if (!vm.spinning) {
+        vm.getDetail()
+        vm.getDetailCount()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

+ 15 - 4
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -150,6 +150,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :columns="chooseColumns"
               :data="chooseLoadData"
               :data="chooseLoadData"
+              :defaultLoadData="false"
               :scroll="{ x: 1335, y: 300 }"
               :scroll="{ x: 1335, y: 300 }"
               bordered>
               bordered>
               <!-- 调出数量 -->
               <!-- 调出数量 -->
@@ -507,12 +508,22 @@ export default {
       )
       )
     }
     }
   },
   },
+  mounted () {
+    this.getDetail()
+    this.getWarehouseList()
+    this.getProductBrand()
+    this.getProductType()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getDetail()
-      vm.getWarehouseList()
-      vm.getProductBrand()
-      vm.getProductType()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.getWarehouseList()
+        vm.getProductBrand()
+        vm.getProductType()
+        vm.resetSearchForm()
+        vm.chooseResetSearchForm()
+      }
     })
     })
   }
   }
 }
 }

+ 4 - 2
src/views/allocationManagement/storeTransferOut/list.vue

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

+ 4 - 1
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -179,7 +179,10 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      // vm.getHouse()
+      if (!vm.disabled) {
+        vm.getHouse()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

+ 17 - 5
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -179,6 +179,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :columns="chooseColumns"
               :data="chooseLoadData"
               :data="chooseLoadData"
+              :defaultLoadData="false"
               :scroll="{ x: 1130, y: 300 }"
               :scroll="{ x: 1130, y: 300 }"
               bordered>
               bordered>
               <!-- 产品分类 -->
               <!-- 产品分类 -->
@@ -288,7 +289,7 @@ export default {
         this.disabled = true
         this.disabled = true
         const params = Object.assign(parameter, this.queryParam)
         const params = Object.assign(parameter, this.queryParam)
         params.enabledFlag = 1
         params.enabledFlag = 1
-        params.warehouseSn = this.basicInfoData.outWarehouseSn
+        params.warehouseSn = this.basicInfoData ? this.basicInfoData.outWarehouseSn : ''
         return productQuery(params).then(res => {
         return productQuery(params).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -366,15 +367,17 @@ export default {
     },
     },
     // 基本信息
     // 基本信息
     getDetail () {
     getDetail () {
+      this.disabled = true
       allocWarehouseDetail({ id: this.$route.params.id }).then(res => {
       allocWarehouseDetail({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.basicInfoData = res.data
           this.basicInfoData = res.data
-          this.$refs.table.refresh(true)
+          this.resetSearchForm()
           this.getWarehouseLoc(res.data.putWarehouseSn, 'put')
           this.getWarehouseLoc(res.data.putWarehouseSn, 'put')
           this.getWarehouseLoc(res.data.outWarehouseSn, 'out')
           this.getWarehouseLoc(res.data.outWarehouseSn, 'out')
         } else {
         } else {
           this.basicInfoData = null
           this.basicInfoData = null
         }
         }
+        this.disabled = false
       })
       })
     },
     },
     //  添加/编辑
     //  添加/编辑
@@ -538,11 +541,20 @@ export default {
       )
       )
     }
     }
   },
   },
+  mounted () {
+    this.getDetail()
+    this.getProductBrand()
+    this.getProductType()
+    this.chooseResetSearchForm()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getDetail()
-      vm.getProductBrand()
-      vm.getProductType()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.getProductBrand()
+        vm.getProductType()
+        vm.chooseResetSearchForm()
+      }
     })
     })
   }
   }
 }
 }

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

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

+ 7 - 1
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -117,9 +117,15 @@ export default {
       })
       })
     }
     }
   },
   },
+  mounted () {
+    this.getDetail()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getDetail()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

+ 1 - 0
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -216,6 +216,7 @@ export default {
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
       vm.getSettleStyle()
       vm.getSettleStyle()
+      vm.resetSearchForm()
     })
     })
   }
   }
 }
 }

+ 1 - 0
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -308,6 +308,7 @@ export default {
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
       vm.getSettleStyle()
       vm.getSettleStyle()
+      vm.chooseLoadData = []
     })
     })
   }
   }
 }
 }

+ 7 - 0
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -170,6 +170,13 @@ export default {
       document.body.appendChild(link)
       document.body.appendChild(link)
       link.click()
       link.click()
     }
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (!vm.disabled) {
+        vm.resetSearchForm()
+      }
+    })
   }
   }
 }
 }
 </script>
 </script>

+ 7 - 0
src/views/financialManagement/expenseManagement/list.vue

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

+ 7 - 1
src/views/financialManagement/warehousingAudit/detail.vue

@@ -149,9 +149,15 @@ export default {
       })
       })
     }
     }
   },
   },
+  mounted () {
+    this.getDetail()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getDetail()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

+ 1 - 0
src/views/financialManagement/withdrawalManagement/list.vue

@@ -149,6 +149,7 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
       _this.setTableH()
     })
     })
+    _this.getAccount()
   },
   },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {

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

@@ -217,7 +217,10 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getWarehouseList()
+      if (!vm.disabled) {
+        vm.getWarehouseList()
+        vm.resetSearchForm()
+      }
     })
     })
   }
   }
 }
 }

+ 8 - 0
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -259,6 +259,14 @@ export default {
   },
   },
   mounted () {
   mounted () {
     this.getDetail()
     this.getDetail()
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
+    })
   }
   }
 }
 }
 </script>
 </script>

+ 12 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -92,6 +92,7 @@
                 :rowKey="(record) => record.id"
                 :rowKey="(record) => record.id"
                 :columns="columns"
                 :columns="columns"
                 :data="loadData"
                 :data="loadData"
+                :defaultLoadData="false"
                 :scroll="{ x: 1030, y:300 }"
                 :scroll="{ x: 1030, y:300 }"
                 bordered>
                 bordered>
                 <!-- 产品图片 -->
                 <!-- 产品图片 -->
@@ -193,6 +194,7 @@
                 :rowKey="(record) => record.id"
                 :rowKey="(record) => record.id"
                 :columns="chooseColumns"
                 :columns="chooseColumns"
                 :data="chooseLoadData"
                 :data="chooseLoadData"
+                :defaultLoadData="false"
                 :scroll="{ x: 830, y: 300 }"
                 :scroll="{ x: 830, y: 300 }"
                 bordered>
                 bordered>
                 <!-- 采购数量 -->
                 <!-- 采购数量 -->
@@ -571,9 +573,18 @@ export default {
       this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
       this.$router.push({ path: '/purchasingManagement/purchaseOrder/list', query: { closeLastOldTab: true } })
     }
     }
   },
   },
+  mounted () {
+    this.getOrderDetail()
+    this.resetPurchaseForm()
+    this.resetSearchForm()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getOrderDetail()
+      if (!vm.disabled) {
+        vm.getOrderDetail()
+        vm.resetPurchaseForm()
+        vm.resetSearchForm()
+      }
     })
     })
   }
   }
 }
 }

+ 4 - 2
src/views/purchasingManagement/purchaseOrder/list.vue

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

+ 4 - 1
src/views/purchasingManagement/purchaseReturn/detail.vue

@@ -131,7 +131,10 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      // vm.getDetail()
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

+ 14 - 1
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -46,6 +46,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="columns"
               :columns="columns"
               :data="loadData"
               :data="loadData"
+              :defaultLoadData="false"
               :scroll="{ x: 1080, y: 300 }"
               :scroll="{ x: 1080, y: 300 }"
               bordered>
               bordered>
               <!-- 自定义表头 -->
               <!-- 自定义表头 -->
@@ -100,6 +101,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :columns="chooseColumns"
               :data="chooseLoadData"
               :data="chooseLoadData"
+              :defaultLoadData="false"
               :scroll="{ x: 1110, y: 300 }"
               :scroll="{ x: 1110, y: 300 }"
               bordered>
               bordered>
               <!-- 退货数量 -->
               <!-- 退货数量 -->
@@ -206,6 +208,7 @@ export default {
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
       chooseLoadData: parameter => {
+        this.disabled = true
         return purchaseReturnDetailList(Object.assign(parameter, { purchaseReturnSn: this.$route.params.sn })).then(res => {
         return purchaseReturnDetailList(Object.assign(parameter, { purchaseReturnSn: this.$route.params.sn })).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
@@ -215,6 +218,7 @@ export default {
             data.list[i].remarksBackups = data.list[i].remarks
             data.list[i].remarksBackups = data.list[i].remarks
             data.list[i].refundableQty = data.list[i].purchaseBillRefundableQty + data.list[i].qty
             data.list[i].refundableQty = data.list[i].purchaseBillRefundableQty + data.list[i].qty
           }
           }
+          this.disabled = false
           return data
           return data
         })
         })
       }
       }
@@ -354,8 +358,17 @@ export default {
       )
       )
     }
     }
   },
   },
+  mounted () {
+    this.$refs.chooseTable.refresh()
+    this.resetSearchForm()
+  },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.resetSearchForm()
+        vm.$refs.chooseTable.refresh()
+      }
+    })
   }
   }
 }
 }
 </script>
 </script>

+ 4 - 2
src/views/purchasingManagement/purchaseReturn/list.vue

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

+ 5 - 3
src/views/salesManagement/salesQuery/list.vue

@@ -101,7 +101,6 @@
         :rowKey="(record) => record.id"
         :rowKey="(record) => record.id"
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
-        :defaultLoadData="false"
         :scroll="{ x: 1400, y:tableHeight }"
         :scroll="{ x: 1400, y:tableHeight }"
         bordered>
         bordered>
         <!-- 销售单号 -->
         <!-- 销售单号 -->
@@ -424,6 +423,7 @@ export default {
     this.$nextTick(() => { // 页面渲染完成后的回调
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
       _this.setTableH()
     })
     })
+    _this.getSettleStyle()
   },
   },
   watch: {
   watch: {
     advanced (newValue, oldValue) {
     advanced (newValue, oldValue) {
@@ -435,8 +435,10 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.getSettleStyle()
-      vm.$refs.table.refresh()
+      if (!vm.disabled) {
+        vm.getSettleStyle()
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }

+ 8 - 0
src/views/salesManagement/salesReturn/detail.vue

@@ -214,6 +214,14 @@ export default {
   },
   },
   mounted () {
   mounted () {
     this.getDetail()
     this.getDetail()
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
+    })
   }
   }
 }
 }
 </script>
 </script>

+ 3 - 2
src/views/salesManagement/salesReturn/list.vue

@@ -73,7 +73,6 @@
         :rowKey="(record) => record.id"
         :rowKey="(record) => record.id"
         :columns="columns"
         :columns="columns"
         :data="loadData"
         :data="loadData"
-        :defaultLoadData="false"
         :scroll="{ x: 1360, y: tableHeight }"
         :scroll="{ x: 1360, y: tableHeight }"
         bordered>
         bordered>
         <!-- 单号 -->
         <!-- 单号 -->
@@ -288,7 +287,9 @@ export default {
   },
   },
   beforeRouteEnter (to, from, next) {
   beforeRouteEnter (to, from, next) {
     next(vm => {
     next(vm => {
-      vm.$refs.table.refresh()
+      if (!vm.disabled) {
+        vm.$refs.table.refresh()
+      }
     })
     })
   }
   }
 }
 }