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,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" v-show="!three.hide">{{ three.s_count_year + three.dw
+                                                :value="three.id" v-show="!three.hide" :disabled="three.disabled">{{ three.s_count_year + three.dw
                                                 }}</Option>
                                         </Select>
                                     </div>
@@ -759,8 +759,16 @@ export default {
                                     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
+                                    // i_isserver 1 套餐下载包
+                                    if(e.i_isserver == 1){ // 隐藏套餐下载包
+                                        e.dw = '份/年' // 单位
+                                        e.disabled = true
+                                        e.hide = true
+                                    }else{
+                                        e.dw = '份' // 单位
+                                    }
+                                    
+                                    if (e.s_count_year == 1 && e.i_isserver != 1) { // 默认1份  非套餐的选项
                                         obj.id = e.id // 勾选层级的ID赋值为规格为1的产品ID
                                     }
                                 } else {

src/views/order/components/bigOrderEdit.vue

@@ -125,7 +125,7 @@
                         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">
+                          v-show="!three.hide" :disabled="three.disabled">
                           {{ three.s_count_year + three.dw }}</Option>
                       </Select>
                     </div>
@@ -888,10 +888,18 @@ export default {
                   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
-                  }
+                     // i_isserver 1 套餐下载包
+                  if(e.i_isserver == 1){ // 隐藏套餐下载包
+                      e.dw = '份/年' // 单位
+                      e.disabled = true
+                      e.hide = true
+                      }else{
+                       e.dw = '份' // 单位
+                      }
+                                    
+                      if (e.s_count_year == 1 && e.i_isserver != 1) { // 默认1份  非套餐的选项
+                          obj.id = e.id // 勾选层级的ID赋值为规格为1的产品ID
+                      }
                 } else {
                   e.dw = '个'
                   if (e.s_count_year == 100) {