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

src/views/bigMenber/bigCombo.vue

@@ -78,7 +78,7 @@
                                         <span style="margin-right: 10px;">{{ two.name }}</span>
                                         <Select v-model="two.id" :disabled="two.disabled || !two.choose" 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">{{three.s_count_year + three.dw}}</Option>
+                                            <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>
                                         </Select>
                                     </div>
                                 </div>
@@ -264,7 +264,7 @@ export default {
             }
         },
         getNewservedata(callback) {          
-        this.$request('/order/getServerNew').data({}).success((res) => { // 获取自定义套餐所有服务选项
+        this.$request('/order/getServerNew').data({sType: 1}).success((res) => { // 获取自定义套餐所有服务选项
             let data = res.data.lists
             // 处理为符合前端结构数据 
             data.forEach(ele => {
@@ -302,11 +302,17 @@ export default {
                                 obj.id = e.id
                             }
                         } else if(e.s_new_name.includes('市场分析定制报告')){
+                            if (!e.s_count_year){ // 企业分析count500是基础产品与一份下载包重合因此隐藏，其他两种的基础产品count是null
+                                e.hide = true
+                            }
                             e.dw = '份/年' // 单位
                             if(e.s_count_year == 1){ // 默认1
                                 obj.id = e.id // 勾选层级的ID赋值为规格为1的产品ID
                             }
                         }else if(e.s_new_name.includes('企业分析') || e.s_new_name.includes('业主分析')){
+                            if (!e.s_count_year || e.s_count_year == 500){ // 企业分析count500是基础产品与一份下载包重合因此隐藏，其他两种的基础产品count是null
+                               e.hide = true
+                            }
                             e.dw = '份/年' // 单位
                             if(e.s_count_year == 3){ // 默认3
                                 obj.id = e.id // 勾选层级的ID赋值为规格为3的产品ID
@@ -421,6 +427,15 @@ export default {
             if(ids.includes(23) && !ids.includes(13)){
                 ids.push(13)
             }
+            if(names.includes('市场分析定制报告') && !ids.includes(26)){ // 选中下载包的ID时则存在没有基础产品的ID，这里补上 基础产品和下载包是绑定的，但是有两个ID
+                ids.push(26)
+            }
+            if(names.includes('企业分析') && !ids.includes(4)){
+                ids.push(4)
+            }
+            if(names.includes('业主分析') && !ids.includes(5)){
+                ids.push(5)
+            }
             console.log(ids,names)
             this.form_serve =  {ids,names}
         },

src/views/order/components/bigOrder.vue

@@ -111,7 +111,7 @@
                                             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">{{ three.s_count_year + three.dw }}</Option>
+                                                :value="three.id" v-show="!three.hide">{{ three.s_count_year + three.dw }}</Option>
                                         </Select>
                                     </div>
                                 </div>
@@ -707,7 +707,7 @@ export default {
 
         },
         getNewservedata() {// 获取新服务列表   
-            this.$request('/order/getServerNew').data({}).success((res) => { // 获取自定义套餐所有服务选项
+            this.$request('/order/getServerNew').data({sType: 2}).success((res) => { // 获取自定义套餐所有服务选项
                 let data = res.data.lists
                 // 处理为符合前端结构数据 
                 data.forEach(ele => {
@@ -745,6 +745,9 @@ 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
+                                        e.hide = true
+                                    }
                                     e.dw = '份' // 单位
                                     if (e.s_count_year == 1) { // 默认1
                                         obj.id = e.id // 勾选层级的ID赋值为规格为1的产品ID
@@ -880,6 +883,15 @@ export default {
             if (ids.includes(23) && !ids.includes(13)) {
                 ids.push(13)
             }
+            if(names.includes('市场分析定制报告') && !ids.includes(26)){ // 选中下载包的ID时则存在没有基础产品的ID，这里补上 基础产品和下载包是绑定的，但是有两个ID
+                ids.push(26)
+            }
+            if(names.includes('企业分析') && !ids.includes(4)){
+                ids.push(4)
+            }
+            if(names.includes('业主分析') && !ids.includes(5)){
+                ids.push(5)
+            }
             // console.log(ids,names)
             if (type == 'getbuyserve') {
                 return { ids, names }

src/views/order/components/bigOrderEdit.vue

@@ -124,7 +124,7 @@
                       <Select v-model="two.id" :disabled="two.disabled || !two.choose" 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">
+                        <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>
                       </Select>
                     </div>
@@ -836,7 +836,7 @@ export default {
       }
     },
     getNewservedata(status) {
-      this.$request('/order/getServerNew').data({}).success((res) => { // 获取自定义套餐所有服务选项
+      this.$request('/order/getServerNew').data({sType: 2}).success((res) => { // 获取自定义套餐所有服务选项
         let data = res.data.lists
         // 处理为符合前端结构数据 
         data.forEach(ele => {
@@ -874,9 +874,12 @@ 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
+                    e.hide = true
+                  }
                   e.dw = '份' // 单位
                   if (e.s_count_year == 1) { // 默认1
-                    obj.id = e.id // 勾选层级的ID赋值为规格为3的产品ID
+                    obj.id = e.id // 勾选层级的ID赋值为规格为1的产品ID
                   }
                 } else {
                   e.dw = '个'
@@ -1039,6 +1042,15 @@ export default {
       if (ids.includes(23) && !ids.includes(13)) {
         ids.push(13)
       }
+      if(names.includes('市场分析定制报告') && !ids.includes(26)){ // 选中下载包的ID时则存在没有基础产品的ID，这里补上 基础产品和下载包是绑定的，但是有两个ID
+        ids.push(26)
+      }
+      if(names.includes('企业分析') && !ids.includes(4)){
+         ids.push(4)
+      }
+      if(names.includes('业主分析') && !ids.includes(5)){
+          ids.push(5)
+      }
       // console.log(ids,names)
       if (type == 'getbuyserve') {
         return { ids, names }