Merge branch 'dev/v2.4.32.1_wmh' of jianyu/qmx_page_admin into hotfix/v2.4.32.2

src/views/order/components/bigOrder.vue

@@ -121,10 +121,10 @@
                         <div v-if="buyserveName"><span style="color: #e13d13;">注：服务到期时间：{{ serveEndtime }}，</span><span
                                 style="font-weight:bold">该客户已购买：</span>{{ buyserveName }}</div>
                     </FormItem>
-                    <FormItem label="购买数量" required v-if="!(creAuth == '3' && this.member.buySubject == '1')">
+                    <FormItem label="购买数量" required v-if="!(creAuth == '3' && member.buySubject == '1')">
                         <Input v-model="member.buyCount" type="tel" maxlength="4" @on-keyup="buyHandler"
                             @on-change="payChange" placeholder="请填写购买数量"
-                            :disabled="vipDis && this.member.products != 2"></Input>
+                            :disabled="vipDis && member.products != 2"></Input>
                         <span v-if="member.products == '1'">(注：主账号+子账号数量之和)</span>
                     </FormItem>
                     <!-- <div v-if="creAuth !== '3'">
@@ -2215,7 +2215,7 @@ export default {
                     return
                 }
             }
-            if (this.member.buySubject == '2') {
+            if (!(this.creAuth == '3' && this.member.buySubject == '1')) { // 不是个人且补充包类型都做校验
                 if (this.member.buyCount == '') {
                     this.$Notice.warning({ title: '请输入购买数量' })
                     return

src/views/order/components/bigOrderEdit.vue

@@ -156,10 +156,10 @@
                        :readonly="interested"></Input>
               </FormItem>
             </div> -->
-            <FormItem label="购买数量" required v-if="!(creAuth == '3' && this.member.buySubject == '1')">
+            <FormItem label="购买数量" required v-if="!(creAuth == '3' && member.buySubject == '1')">
               <Input v-model="member.buyCount" type="tel" maxlength="4" @on-keyup="buyHandler" @on-change="payChange"
                 placeholder="请填写购买数量"
-                :disabled="finish_dis || (vipDis && this.member.products != 2) || pass_all_incomplete_dis"></Input>
+                :disabled="finish_dis || (vipDis && member.products != 2) || pass_all_incomplete_dis"></Input>
               <span v-if="member.products == '1'">(注：主账号+子账号数量之和)</span>
             </FormItem>
             <div v-if="creAuth !== '2'">
@@ -2464,7 +2464,7 @@ export default {
           return
         }
       }
-      if (this.member.buySubject == '2') {
+      if (!(this.creAuth == '3' && this.member.buySubject == '1')) {
         if (this.member.buyCount == '') {
           this.$Notice.warning({ title: '请输入购买数量' })
           return
@@ -2582,6 +2582,13 @@ export default {
         } else {
           newlevel = JSON.parse(this.member.level).id ? JSON.parse(this.member.level).id : 5// 5自定义
         }
+        let saleMoneyData = this.saleTableData
+        if(saleMoneyData && saleMoneyData.length>0 && saleMoneyData.length < 3){ //只有一个销售人员时 
+          saleMoneyData.forEach(v => {
+            v.money = this.member.payMoney
+          })
+        }
+        
         let obj = {
           contract_nature: this.member.contract_nature,
           orderCode: this.member.orderCode,
@@ -2633,7 +2640,7 @@ export default {
           salesPersonId: saleId,
           payType: this.member.payType,
           saleDep: this.saleCode,
-          saleMoney: JSON.stringify({ data: this.saleTableData }),
+          saleMoney: JSON.stringify({ data: saleMoneyData }),
           // 电子协议相关
           e_contract_type: this.member.e_contract_type, // 电子协议类型
           e_contract_userA_type: this.member.e_contract_userA_type, // 协议甲方类型
@@ -2694,7 +2701,7 @@ export default {
           salesPersonId: saleId,
           payType: this.member.payType,
           saleDep: this.saleCode,
-          saleMoney: JSON.stringify({ data: this.saleTableData }),
+          saleMoney: JSON.stringify({ data: saleMoneyData }),
           paybackExpectDate: this.member.paybackNum == 1 ? this.member.paybackExpectDate : "", // 回款日期
           paybackWorkDayNum: this.member.paybackNum == 1 ? this.member.paybackWorkDayNum : "", // 回款天数
           paybackOpenServer: this.member.paybackOpenServer, // 回款开通服务  
@@ -2746,7 +2753,7 @@ export default {
           salesPersonId: saleId,
           payType: this.member.payType,
           saleDep: this.saleCode,
-          saleMoney: JSON.stringify({ data: this.saleTableData }),
+          saleMoney: JSON.stringify({ data: saleMoneyData }),
           paybackExpectDate: this.member.paybackNum == 1 ? this.member.paybackExpectDate : "", // 回款日期
           paybackWorkDayNum: this.member.paybackNum == 1 ? this.member.paybackWorkDayNum : "", // 回款天数
           paybackOpenServer: this.member.paybackOpenServer, // 回款开通服务