瀏覽代碼

bug 修复

lilei 3 年之前
父節點
當前提交
4a8a1d89fd

+ 10 - 3
src/views/salesManagement/salesQuery/edit.vue

@@ -61,7 +61,7 @@
         <div class="table-page-search-wrapper">
           <a-row :gutter="15">
             <a-col :span="18">
-              <a-form-model :model="productForm" layout="inline" @keyup.enter.native="$refs.table.refresh(true)" >
+              <a-form-model :model="productForm" ref="ruleForm" layout="inline" @keyup.enter.native="$refs.table.refresh(true)" >
                 <a-row :gutter="15">
                   <a-col :md="8" :sm="24">
                     <a-form-model-item label="产品编码">
@@ -105,6 +105,7 @@
           :columns="columns"
           :data="loadData"
           :scroll="{ x: 1300, y: 300 }"
+          :defaultLoadData="false"
           :rowClassName="(record, index) => record.cost > record.price ? 'redBg-row':''"
           bordered>
           <!-- 产品编码 -->
@@ -256,7 +257,7 @@ export default {
                   _this.spinning = false
                 }
               })
-            }else{
+            } else {
               _this.changeQty(record)
             }
           } else {
@@ -542,12 +543,18 @@ export default {
   },
   mounted () {
     this.getOrderDetail()
+    this.resetForm()
+    this.$refs.partQuery.resetSearchForm()
     this.orderId = this.$route.params.id
     this.salesBillSn = this.$route.params.sn
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      console.log('beforeRouteEnter')
+      if (!vm.disabled) {
+        vm.getOrderDetail()
+        vm.resetForm()
+        vm.$refs.partQuery.resetSearchForm()
+      }
     })
   }
 }

+ 1 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -101,6 +101,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :defaultLoadData="false"
         :scroll="{ x: 1400, y:tableHeight }"
         bordered>
         <!-- 销售单号 -->

+ 1 - 0
src/views/salesManagement/salesQuery/queryPart.vue

@@ -105,6 +105,7 @@
       :columns="columns"
       :data="loadData"
       :customRow="handleClickRow"
+      :defaultLoadData="false"
       :scroll="{ x: tableWidth, y: 300 }"
       bordered>
       <!-- 售价 -->

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

@@ -73,6 +73,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
+        :defaultLoadData="false"
         :scroll="{ x: 1360, y: tableHeight }"
         bordered>
         <!-- 单号 -->

+ 2 - 1
src/views/salesManagement/salesReturn/queryPart.vue

@@ -46,6 +46,7 @@
       :columns="columns"
       :data="loadData"
       :customRow="handleClickRow"
+      :defaultLoadData="false"
       :scroll="{ x: grabFlag == '1' ? 1620 : 1040, y: 300 }"
       bordered>
       <!-- 价格 -->
@@ -184,7 +185,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
+      this.$refs.rangeDate && this.$refs.rangeDate.resetDate()
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.salesBillNo = ''

+ 18 - 2
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -26,7 +26,13 @@
       </a-page-header>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- 查询配件列表 -->
-        <queryPart :buyerSn="$route.params.buyerSn" :priceType="ordeDetail&&ordeDetail.priceType||''" grabFlag="0" :newLoading="isInster" @add="saveProduct"></queryPart>
+        <queryPart
+          ref="queryPart"
+          :buyerSn="$route.params.buyerSn"
+          :priceType="ordeDetail&&ordeDetail.priceType||''"
+          grabFlag="0"
+          :newLoading="isInster"
+          @add="saveProduct"></queryPart>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap">
         <!-- alert -->
@@ -98,6 +104,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :defaultLoadData="false"
           :scroll="{ x: 1620, y: 300 }"
           bordered>
           <!-- 本次退货数量 -->
@@ -550,9 +557,18 @@ export default {
     this.buyerSn = this.$route.params.buyerSn
     this.getOrderDetail()
     this.getWarehouseCascade()
+    this.resetForm()
+    this.$refs.queryPart.resetSearchForm()
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.getOrderDetail()
+        vm.getWarehouseCascade()
+        vm.resetForm()
+        vm.$refs.queryPart.resetSearchForm()
+      }
+    })
   }
 }
 </script>

+ 11 - 1
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -104,6 +104,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
+          :defaultLoadData="false"
           :scroll="{ x: 1840, y: 300 }"
           bordered>
           <!-- 本次退货数量 -->
@@ -544,9 +545,18 @@ export default {
     this.buyerSn = this.$route.params.buyerSn
     this.getOrderDetail()
     this.getWarehouseCascade()
+    this.resetForm()
+    this.$refs.queryPart.resetSearchForm()
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {})
+    next(vm => {
+      if (!vm.disabled) {
+        vm.getOrderDetail()
+        vm.getWarehouseCascade()
+        vm.resetForm()
+        vm.$refs.queryPart.resetSearchForm()
+      }
+    })
   }
 }
 </script>