Merge branch 'dev/v2.4.18' of jianyu/qmx_page_admin into feature/v2.4.18

src/views/order/components/bigOrder.vue

@@ -1568,7 +1568,6 @@ export default {
                     strs1 += v.price * v.count
                 }
             })
-            console.log(parseInt(strs1))
             this.member.supplyMoney = parseInt(strs1) + parseInt(strs2)
             if (this.member.supplyMoney == 0 || this.allDis) {
                 this.supplyDis = true

src/views/order/components/otherOrder.vue

@@ -769,7 +769,7 @@ export default {
         this.$Notice.warning({title: '应付金额不能为空'})
         return
       }
-      if(this.others.paybackCompany === ''){
+      if (!this.others.paybackCompany) {
         this.$Notice.warning({title: '请选择签约主体'})
         return
       }
@@ -853,6 +853,7 @@ export default {
      resetCalesValue () {
       this.$refs.casRef.values = []
       this.others.saleCodeModel = []
+      this.others.paybackCompany = 'h01'
     },
     visibleChange(val) {
       if (val == false) {