Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/orderManage/modules/edit.vue

@@ -338,6 +338,7 @@ export default {
         }
       })
       console.log(res)
+      this.$emit('onSuccess')
       this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
       res.msg === '成功' ?this.data.rebateamount = res.data:''
     },

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -482,6 +482,7 @@ export default {
           "rebateamount":rebatebalance > amount ? amount : rebatebalance//返利金使用金额
         }
       })
+      this.$emit('onSuccess')
       // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
 
     }

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -298,7 +298,7 @@ export default {
     },
     async rebateUsedChange(){
       console.log(this.data)
-      if(this.data.status != '新建') return 1
+      if(this.data.status != '新建') return false
       let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
       let rebatebalance = this.data.rebatebalance; //返利金账户余额
       const res = await this.$api.requested({
@@ -309,7 +309,7 @@ export default {
           "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
         }
       })
-      console.log(res)
+      this.$emit('onSuccess')
       // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
     },
     onShow () {