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

src/views/order/components/bigOrder.vue

@@ -55,8 +55,8 @@
                 <FormItem label="付费类型" required>
                     <RadioGroup v-model="member.recordPayType" @on-change="recordPayTypeChange">
                         <Radio label="1" :disabled="newpayDis || paytypeAlldis">购买</Radio>
-                        <Radio label="2" :disabled="paytypeAlldis || !newpayDis">续费</Radio>
-                        <Radio label="3" :disabled="paytypeAlldis || !newpayDis">升级</Radio>
+                        <Radio label="2" :disabled="paytypeAlldis || nopayDis">续费</Radio>
+                        <Radio label="3" :disabled="paytypeAlldis || nopayDis">升级</Radio>
                         <Radio label="4" :disabled="newpayDis || paytypeAlldis">试用</Radio>
                     </RadioGroup>
                 </FormItem>
@@ -485,6 +485,10 @@ export default {
             // 购买主体为“个人”，产品类型为“大会员”，如已有大会员权限
             return this.member.products == '1' && this.member.buySubject == '1' && (this.bigStas == 1 || this.bigStas == 2)
         },
+        nopayDis(){
+            // 购买主体为“个人”，产品类型为“大会员”，无大会员权限
+        return this.member.products == '1' && this.member.buySubject == '1' && (this.bigStas != 1 && this.bigStas != 2)
+       },
         paytypeAlldis(){
             return this.member.products == '2' || this.member.products == '3'
         },

src/views/order/components/bigOrderEdit.vue

@@ -64,8 +64,8 @@
           <FormItem label="付费类型" required>
                     <RadioGroup v-model="member.recordPayType" @on-change="recordPayTypeChange">
                         <Radio label="1" :disabled="newpayDis || paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis">购买</Radio>
-                        <Radio label="2" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis || !newpayDis">续费</Radio>
-                        <Radio label="3" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis || !newpayDis">升级</Radio>
+                        <Radio label="2" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis || nopayDis">续费</Radio>
+                        <Radio label="3" :disabled="paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis || nopayDis">升级</Radio>
                         <Radio label="4" :disabled="newpayDis || paytypeAlldis || member.order_status == '1' || pass_all_incomplete_dis">试用</Radio>
                     </RadioGroup>
             </FormItem>
@@ -521,6 +521,10 @@ export default {
             // 购买主体为“个人”，产品类型为“大会员”，如已有大会员权限
         return this.member.products == '1' && this.member.buySubject == '1' && (this.bigStas == 1 || this.bigStas == 2)
     },
+    nopayDis(){
+            // 购买主体为“个人”，产品类型为“大会员”，无大会员权限
+        return this.member.products == '1' && this.member.buySubject == '1' && (this.bigStas != 1 && this.bigStas != 2)
+    },
     paytypeAlldis(){
         return this.member.products == '2' || this.member.products == '3'
     },
@@ -2589,7 +2593,7 @@ export default {
         }  
       })
       // saleMoneyData一个人员时金额数据无法更新问题处理
-      if(saleMoneyData && saleMoneyData.length>0 && saleMoneyData.length < 3){ //只有一个销售人员时 
+      if(saleMoneyData && saleMoneyData.length>0 && saleMoneyData.length < 2){ //只有一个销售人员时 
         saleMoneyData.forEach(v => {
           v.money = this.fixedNum(this.member.payMoney)
         })