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

src/views/order/components/bigOrder.vue

@@ -111,7 +111,8 @@
                                             placeholder="请选择产品" style="width:120px;margin-right:10px;"
                                             v-if="two.list.length > 1" @on-change="chooseChange($event, 'select')">
                                             <Option v-for="(three, three_index) in two.list" :key="three_index"
-                                                :value="three.id" v-show="!three.hide">{{ three.s_count_year + three.dw }}</Option>
+                                                :value="three.id" v-show="!three.hide">{{ three.s_count_year + three.dw
+                                                }}</Option>
                                         </Select>
                                     </div>
                                 </div>
@@ -643,6 +644,7 @@ export default {
                             if (this.member.phone) {
                                 this.currentServer(this.member.phone, (res) => {
                                     let ids = res.data.list
+                                    this.currentServerid = res.data.list
                                     let time = dateFormatter(res.data.serviceEndTime, 'yyyy-MM-dd')
                                     this.echoServe(ids, 'hide', ids)
                                     this.Purchasedservices(time)
@@ -675,6 +677,7 @@ export default {
                                 if (this.member.phone) {
                                     this.currentServer(this.member.phone, (res) => {
                                         let ids = res.data.list
+                                        this.currentServerid = res.data.list
                                         this.echoServe(ids, 'allDis')
                                         this.getserveIdAndname()
                                     })
@@ -707,7 +710,7 @@ export default {
 
         },
         getNewservedata() {// 获取新服务列表   
-            this.$request('/order/getServerNew').data({sType: 2}).success((res) => { // 获取自定义套餐所有服务选项
+            this.$request('/order/getServerNew').data({ sType: 2 }).success((res) => { // 获取自定义套餐所有服务选项
                 let data = res.data.lists
                 // 处理为符合前端结构数据 
                 data.forEach(ele => {
@@ -745,7 +748,7 @@ export default {
                                         obj.id = e.id
                                     }
                                 } else if (e.s_new_name.includes('市场分析定制报告') || e.s_new_name.includes('企业分析') || e.s_new_name.includes('业主分析')) {
-                                    if (!e.s_count_year || e.s_count_year == 500){ // 企业分析count500是基础产品与一份下载包重合因此隐藏，其他两种的基础产品count是null
+                                    if (!e.s_count_year || e.s_count_year == 500) { // 企业分析count500是基础产品与一份下载包重合因此隐藏，其他两种的基础产品count是null
                                         e.hide = true
                                     }
                                     e.dw = '份' // 单位
@@ -860,13 +863,21 @@ export default {
                             } else {
                                 names.push('基础服务')
                             }
-                        } else if(e.name.includes('市场分析定制报告') || e.name.includes('企业分析') || e.name.includes('业主分析')){
-                             e.list.forEach(item =>{
+                        } else if (e.name.includes('市场分析定制报告') || e.name.includes('企业分析') || e.name.includes('业主分析')) {
+                            e.list.forEach(item => {
                                 if(e.id == item.id){
-                                    names.push(e.name.replace(',报告下载:','') + `(报告下载:${item.s_count_year}${item.dw})`)
-                                }
-                             })
-                        }else {
+                                    if (item.s_count_year) {
+                                        if (item.s_new_name.includes('企业分析') && item.s_count_year == 500) {
+                                            names.push(item.s_new_name)
+                                        } else {
+                                            names.push(item.s_new_name.replace(',报告下载:', '') + `(报告下载:${item.s_count_year}${item.dw})`)
+                                        }
+                                    } else {
+                                        names.push(item.s_new_name)
+                                    }
+                                }        
+                            })
+                        } else {
                             names.push(e.name)
                         }
                     }
@@ -884,13 +895,13 @@ export default {
             if (ids.includes(23) && !ids.includes(13)) {
                 ids.push(13)
             }
-            if(names_str.includes('市场分析定制报告') && !ids.includes(26)){ // 选中下载包的ID时则存在没有基础产品的ID，这里补上 基础产品和下载包是绑定的，但是有两个ID
+            if (names_str.includes('市场分析定制报告') && !ids.includes(26)) { // 选中下载包的ID时则存在没有基础产品的ID，这里补上 基础产品和下载包是绑定的，但是有两个ID
                 ids.push(26)
             }
-            if(names_str.includes('企业分析') && !ids.includes(4)){
+            if (names_str.includes('企业分析') && !ids.includes(4)) {
                 ids.push(4)
             }
-            if(names_str.includes('业主分析') && !ids.includes(5)){
+            if (names_str.includes('业主分析') && !ids.includes(5)) {
                 ids.push(5)
             }
             // console.log(ids,names)
@@ -925,7 +936,10 @@ export default {
                 ele.lists.forEach(e => {
                     e.list.forEach(item => {
                         if (data.includes(item.id)) {
-                            e.id = item.id
+                            if(item.id != 4 && item.id!=5 && item.id!=26){ // 企业分析 业主分析 市场分析定制报告 这三个基础服务不选中ID  （捆绑的有下载包 选中下载包的ID）
+                                e.id = item.id
+                                e.id = item.id
+                            }  
                             e.choose = true
                             if (type == 'dis') { // 禁用已勾选
                                 e.disabled = true
@@ -4048,6 +4062,7 @@ export default {
                 { v: 0, n: '免费' },
                 { v: 1, n: '收费' }
             ],
+            currentServerid:''
 
 
         }

src/views/order/components/bigOrderEdit.vue

@@ -785,6 +785,7 @@ export default {
               if (this.member.phone) {
                 this.currentServer(this.member.phone, (res) => {
                   let ids = res.data.list
+                  this.currentServerid = res.data.list
                   this.echoServe(ids, 'hide', ids)
                   let time = dateFormatter(res.data.serviceEndTime, 'yyyy-MM-dd') || '-'
                   this.Purchasedservices(time)
@@ -818,6 +819,7 @@ export default {
                 if (this.member.phone) {
                   this.currentServer(this.member.phone, (res) => {
                     let ids = res.data.list
+                    this.currentServerid = res.data.list
                     this.echoServe(ids, 'allDis')
                     this.getserveIdAndname()
                   })
@@ -925,6 +927,7 @@ export default {
           if (this.member.createType == '2') { // 补充服务
             this.currentServer(this.member.phone, (res) => {
               let ids = res.data.list
+              this.currentServerid = res.data.list
               this.echoServe(this.curIds, 'hide', ids)
               let time = dateFormatter(res.data.serviceEndTime, 'yyyy-MM-dd') || '-'
               this.Purchasedservices(time)
@@ -940,6 +943,7 @@ export default {
           if (this.member.createType == '2') { // 补充服务
             this.currentServer(this.member.phone, (res) => {
               let ids = res.data.list
+              this.currentServerid = res.data.list
               let time = dateFormatter(res.data.serviceEndTime, 'yyyy-MM-dd') || '-'
               this.echoServe(this.curIds, 'hide_dis', ids)
               this.Purchasedservices(time)
@@ -1022,7 +1026,15 @@ export default {
             } else if (e.name.includes('市场分析定制报告') || e.name.includes('企业分析') || e.name.includes('业主分析')) {
               e.list.forEach(item => {
                 if (e.id == item.id) {
-                  names.push(e.name.replace(',报告下载:','') + `(报告下载:${item.s_count_year}${item.dw})`)
+                  if(item.s_count_year){
+                    if(item.s_new_name.includes('企业分析') && item.s_count_year == 500){
+                      names.push(item.s_new_name)
+                    }else{
+                      names.push(item.s_new_name.replace(',报告下载:','') + `(报告下载:${item.s_count_year}${item.dw})`)
+                    }      
+                   }else{
+                    names.push(item.s_new_name)
+                   }   
                 }
               })
             } else {
@@ -1084,7 +1096,10 @@ export default {
         ele.lists.forEach(e => {
           e.list.forEach(item => {
             if (data.includes(item.id)) {
-              e.id = item.id
+              if(item.id != 4 && item.id!=5 && item.id!=26){ // 企业分析 业主分析 市场分析定制报告 这三个基础服务不选中ID  （捆绑的有下载包 选中下载包的ID）
+                  e.id = item.id
+                  e.id = item.id
+               } 
               e.choose = true
               if (type == 'dis') { // 禁用已勾选
                 e.disabled = true
@@ -4513,6 +4528,7 @@ export default {
         { v: 0, n: '免费' },
         { v: 1, n: '收费' }
       ],
+      currentServerid:''
     }
   }
 }