Browse Source

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

wenmenghao 1 year ago
parent
commit
a05f3f9dcc

+ 2 - 2
src/views/order/components/bigOrder.vue

@@ -511,7 +511,7 @@ export default {
                     buyCount:this.member.buyCount,
                     phone:this.member.phone,
                     buySubject:this.member.buySubject,
-
+                    createType:1
                 }
                 let serveData = []
                 this.datas2.forEach(v => {
@@ -531,7 +531,7 @@ export default {
                     buyCount:this.member.buyCount,
                     phone:this.member.phone,
                     buySubject:this.member.buySubject,
-
+                    createType:1
                 }
             }
             if(this.member.products == '1'&&obj.phone&&obj.buyCount&&obj.buySubject){

+ 3 - 1
src/views/order/components/bigOrderEdit.vue

@@ -689,6 +689,7 @@ export default {
                     buyCount:this.member.buyCount,
                     phone:this.member.phone,
                     buySubject:this.member.buySubject,
+                    createType:1
 
                 }
                 if(this.datas2.length>0){
@@ -713,6 +714,7 @@ export default {
                     buyCount:this.member.buyCount,
                     phone:this.member.phone,
                     buySubject:this.member.buySubject,
+                    createType:1
 
                 }
             }
@@ -2832,7 +2834,7 @@ export default {
           contract_archive_status: this.member.agreementStatus == '1' ? this.member.contract_archive_status : '',
           contract_archive_time: this.member.agreementStatus == '1' ? this.member.contract_archive_time : '',
           contract_archive_num: this.member.agreementStatus == '1' ? this.member.contract_archive_num : '',
-          areaCount:this.member.single&&this.combo_id.id==6?this.member.areaCount:0,// 仅大会员商机版2.0时 单省版才有效
+          areaCount:this.member.single && (this.combo_id.id == 6 || this.combo_id.s_name.includes('单省版'))?this.member.areaCount:0,// 仅大会员商机版2.0时 单省版才有效
           updateType: this.noPass1 ? 0 : 1,
           salesPerson: saleName,
           salesPersonId: saleId,