lilei 3 лет назад
Родитель
Сommit
6305bd379b

+ 13 - 2
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -15,7 +15,7 @@
       </a-page-header>
       <!-- 基础信息 -->
       <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
-        <a-collapse :activeKey="['1']">
+        <a-collapse :activeKey="['1']" v-if="productTotal">
           <a-collapse-panel key="1">
             <template slot="header">
               基础信息
@@ -34,7 +34,7 @@
           <a-button id="bulkWarehousingOrderEdit-add" type="primary" class="button-error" @click="handleEdit()">新增产品</a-button>
         </div>
         <!-- 总计 -->
-        <a-alert type="info" style="margin-bottom:10px">
+        <a-alert type="info" v-if="productTotal" style="margin-bottom:10px">
           <div slot="message">
             入库数量 <strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ,
             入库金额 <strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? productTotal.totalPrice : '--' }}</strong>
@@ -48,6 +48,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :defaultLoadData="false"
           bordered>
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
@@ -167,11 +168,21 @@ export default {
           this.productTotal = null
         }
       })
+    },
+    pageInit () {
+      this.productTotal = null
+      this.$refs.table.refresh(true)
     }
   },
+  mounted () {
+    this.pageInit()
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.openModal = false
+      if (!vm.disabled) {
+        vm.pageInit()
+      }
     })
   }
 }

+ 3 - 1
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -286,7 +286,9 @@ export default {
       vm.openModal = false
       vm.openDetailModal = false
       vm.itemSn = null
-      vm.$refs.table.refresh()
+      if (!vm.disabled) {
+        vm.$refs.table.refresh()
+      }
     })
   }
 }

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

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

+ 5 - 4
src/views/salesManagement/salesQuery/edit.vue

@@ -69,6 +69,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :defaultLoadData="false"
           :scroll="{ x:840, y: 300 }"
           bordered>
           <!-- 产品名称 -->
@@ -405,7 +406,7 @@ export default {
     pageInit () {
       this.getOrderDetail()
       this.$refs.partQuery.resetSearchForm()
-      this.$refs.promotable.resetCurForm()
+      this.$refs.promotable.getData()
       this.$refs.table.refresh(true)
     }
   },
@@ -415,11 +416,11 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.salesBillSn = vm.$route.params.sn
-      vm.pageInit()
       // 获取促销活动
       vm.getPromoacActiveList()
-      // 查询已选促销品
-      vm.$refs.promotable.getData()
+      if (!vm.disabled) {
+        vm.pageInit()
+      }
     })
   }
 }

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

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

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

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

+ 12 - 4
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -229,19 +229,27 @@ export default {
     },
     setTableH () {
       this.tableHeight = window.innerHeight - 340
+    },
+    pageInit () {
+      this.orderSn = this.$route.params.sn
+      this.buyerSn = this.$route.params.buyerSn
+      this.getOrderDetail()
     }
   },
   mounted () {
-    this.orderSn = this.$route.params.sn
-    this.buyerSn = this.$route.params.buyerSn
-    this.getOrderDetail()
     const _this = this
+    _this.pageInit()
     this.$nextTick(() => { // 页面渲染完成后的回调
       _this.setTableH()
     })
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.pageInit()
+        vm.$refs.table.refresh(true)
+      }
+    })
   }
 }
 </script>

+ 15 - 6
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -13,9 +13,9 @@
           <a-button key="1" type="primary" id="salesReturnEdit-print-btn">快速打印</a-button>
         </template> -->
       </a-page-header>
-      <a-card size="small" :bordered="false" class="salesReturnEdit-cont" v-if="ordeDetail&&ordeDetail.salesReturnBillSource=='SALES'">
+      <a-card size="small" :bordered="false" class="salesReturnEdit-cont" v-show="ordeDetail&&ordeDetail.salesReturnBillSource=='SALES'">
         <!-- 查询配件列表 -->
-        <queryPart :buyerSn="$route.params.buyerSn" grabFlag="0" :newLoading="isInster" @add="saveProduct"></queryPart>
+        <queryPart ref="partQuery" :buyerSn="$route.params.buyerSn" grabFlag="0" :newLoading="isInster" @add="saveProduct"></queryPart>
       </a-card>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
         <!-- alert -->
@@ -40,6 +40,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :defaultLoadData="false"
           :scroll="{ x: 910, y: 300 }"
           bordered>
           <!-- 本次退货数量 -->
@@ -305,16 +306,24 @@ export default {
           this.$refs.table.refresh(true)
         }
       })
+    },
+    pageInit () {
+      this.orderSn = this.$route.params.sn
+      this.buyerSn = this.$route.params.buyerSn
+      this.resetSearchForm(true)
+      this.$nextTick(() => {
+        this.$refs.partQuery.resetSearchForm()
+      })
     }
   },
   mounted () {
-    this.orderSn = this.$route.params.sn
-    this.buyerSn = this.$route.params.buyerSn
-    this.getOrderDetail()
+    this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      console.log('beforeRouteEnter')
+      if (!vm.disabled) {
+        vm.pageInit()
+      }
     })
   }
 }

+ 15 - 4
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -8,7 +8,7 @@
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" class="salesReturnEdit-cont" v-if="ordeDetail&&ordeDetail.salesReturnBillSource=='SALES'">
+      <a-card size="small" :bordered="false" class="salesReturnEdit-cont" v-show="ordeDetail&&ordeDetail.salesReturnBillSource=='SALES'">
         <!-- 查询配件列表 -->
         <queryPart ref="queryPart" :buyerSn="$route.params.buyerSn" grabFlag="1" :newLoading="isInster" @add="saveProduct"></queryPart>
       </a-card>
@@ -35,6 +35,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :defaultLoadData="false"
           :scroll="{ x: 1270, y: 300 }"
           bordered>
           <!-- 本次退货数量 -->
@@ -298,14 +299,24 @@ export default {
           this.$refs.table.refresh(true)
         }
       })
+    },
+    pageInit () {
+      this.orderSn = this.$route.params.sn
+      this.buyerSn = this.$route.params.buyerSn
+      this.getOrderDetail()
+      this.$refs.queryPart.resetSearchForm()
+      this.$refs.table.refresh(true)
     }
   },
   mounted () {
-    this.orderSn = this.$route.params.sn
-    this.buyerSn = this.$route.params.buyerSn
+    this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.pageInit()
+      }
+    })
   }
 }
 </script>

+ 8 - 1
src/views/salesManagement/waitDispatch/edit.vue

@@ -384,6 +384,11 @@ export default {
         this.loading = false
         this.spinning = false
       })
+    },
+    pageInit () {
+      this.getOrderDetail()
+      this.$refs.partQuery.resetSearchForm()
+      this.$refs.table.refresh(true)
     }
   },
   mounted () {
@@ -391,8 +396,10 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      console.log('beforeRouteEnter')
       vm.salesBillSn = vm.$route.params.salesBillSn
+      if (!vm.disabled) {
+        vm.pageInit()
+      }
     })
   }
 }