Browse Source

bug 修复

lilei 3 năm trước cách đây
mục cha
commit
aae821ef71

+ 2 - 1
src/views/salesManagement/salesQuery/chooseActive.vue

@@ -100,6 +100,7 @@ export default {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].qty = 1
+            data.list[i].promotionSourceSn = this.nowData.salesBillDetailSn
           }
           this.spinning = false
           return data
@@ -169,7 +170,7 @@ export default {
           origPrice: item.productPrice,
           packQty: item.packQty,
           productSn: item.productSn,
-          promotionSourceSn: this.salesBillDetailSn,
+          promotionSourceSn: item.promotionSourceSn,
           promotionActivitySn: item.promoRuleGoods.promoActiveSn,
           promotionActivityName: item.promoRuleGoods.promoActiveName,
           promotionRules: item.promoRuleGoods.promoRuleSn,

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

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

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

@@ -401,14 +401,21 @@ export default {
     closeActive () {
       this.nowData = null
       this.newActive = false
+    },
+    pageInit () {
+      this.getOrderDetail()
+      this.$refs.partQuery.resetSearchForm()
+      this.$refs.promotable.resetCurForm()
+      this.$refs.table.refresh(true)
     }
   },
   mounted () {
-    this.getOrderDetail()
+    this.pageInit()
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.salesBillSn = vm.$route.params.sn
+      vm.pageInit()
       // 获取促销活动
       vm.getPromoacActiveList()
       // 查询已选促销品

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

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