Browse Source

bug 修复

lilei 3 years ago
parent
commit
7b7b17859a

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1653903130069
+  "version": 1653967746065
 }

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

@@ -49,7 +49,7 @@
                 <a-input-number
                   id="discount"
                   size="small"
-                  v-model="detailData.discountAmount"
+                  v-model.trim="detailData.discountAmount"
                   :min="0"
                   :precision="2"
                   :max="999999"/>
@@ -446,12 +446,9 @@ export default {
     },
     // 打折
     salesDiscount () {
-      if (this.detailData.discountAmount < 0) {
-        return
-      }
       this.spinning = true
       salesWriteDiscount({
-        discountAmount: this.detailData.discountAmount,
+        discountAmount: this.detailData.discountAmount || 0,
         salesBillSn: this.detailData.salesBillSn,
         id: this.detailData.id
       }).then(res => {

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

@@ -269,7 +269,7 @@ export default {
               _this.$message.info('该产品暂时不能添加')
             } else {
               event.stopPropagation()
-              _this.$emit('add', record)
+              _this.$emit('add', record, 'new')
             }
           }
         }

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

@@ -375,12 +375,9 @@ export default {
     },
     // 打折
     salesReturnDiscount () {
-      if (this.ordeDetail.discountAmount < 0) {
-        return
-      }
       this.spinning = true
       salesReturnDiscount({
-        discountAmount: this.ordeDetail.discountAmount,
+        discountAmount: this.ordeDetail.discountAmount || 0,
         salesReturnSn: this.ordeDetail.salesReturnSn,
         id: this.ordeDetail.id
       }).then(res => {
@@ -480,6 +477,9 @@ export default {
       this.spinning = true
       salesReturnSaveProduct(params).then(res => {
         this.resetSearchForm(type == 'edit')
+        if (type == 'new') {
+          this.getOrderDetail()
+        }
         this.isInster = false
         this.spinning = false
       })

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

@@ -361,12 +361,9 @@ export default {
     },
     // 打折
     salesReturnDiscount () {
-      if (this.ordeDetail.discountAmount < 0) {
-        return
-      }
       this.spinning = true
       salesReturnDiscount({
-        discountAmount: this.ordeDetail.discountAmount,
+        discountAmount: this.ordeDetail.discountAmount || 0,
         salesReturnSn: this.ordeDetail.salesReturnSn,
         id: this.ordeDetail.id
       }).then(res => {
@@ -464,6 +461,9 @@ export default {
       this.spinning = true
       salesReturnSaveProduct(params).then(res => {
         this.resetSearchForm(type == 'edit')
+        if (type == 'new') {
+          this.getOrderDetail()
+        }
         this.isInster = false
         this.spinning = false
       })