fix：标讯收藏数据导出传参问题&移除行业其他分类逻辑处理

apps/bigmember_pc/src/components/push-list/PushList.vue

@@ -330,7 +330,6 @@ import {
   replaceKeyword,
   moneyUnit,
   openLinkInWorkspace,
-  formatFilterApiOther,
   scrollTargetView
 } from '@/utils/'
 import { getEventTarget } from '@/utils/jq-help'
@@ -928,10 +927,7 @@ export default {
         query.isEnt = true
       }
       // delete query.item  所有订阅列表都增加item参数
-      // PS:行业二级分类有“其他”的时候 提交时需要再增加个“其它”
-      if(query.industry) {
-        query.industry = formatFilterApiOther(query.industry)
-      }
+  
       return query
     },
     async getList(filters) {

apps/bigmember_pc/src/views/collection/model/base.js

@@ -488,7 +488,7 @@ export default function () {
   // 组合好的组件格式的筛选条件
   function packageFilter () {
     const originParams = Object.assign(
-      filterState.value
+      getFormatOfFilter()
     )
 
     return originParams

apps/bigmember_pc/src/views/collection/model/modules/data-export-actions.js

@@ -8,7 +8,7 @@ import {
 } from '@/api/modules/'
 
 import { useStore } from '@/store'
-import  { FilterHistoryViewModel2AjaxModel, openOuterLink, formatFilterApiOther } from '@/utils'
+import  { openOuterLink } from '@/utils'
 
 // 是否登录
 const isLogin = computed(() => {
@@ -25,19 +25,19 @@ export function dataExportActionsModel () {
   async function dataExport (config) {
     const { listState, selectCheckboxCount, selectIds, filter } = config
     const { selectTime, publishTime } = filter
-    if (selectTime.indexOf('_') > -1) {
-      filter.selectTime = selectTime.replace('_', '-')
-    }
-    if(publishTime.indexOf('_') > -1) {
-      filter.publishTime = publishTime.replace('_', '-')
-    }
+    // if (selectTime.indexOf('_') > -1) {
+    //   filter.selectTime = selectTime.replace('_', '-')
+    // }
+    // if(publishTime.indexOf('_') > -1) {
+    //   filter.publishTime = publishTime.replace('_', '-')
+    // }
     // 未登录跳转登录
     if (!isLogin.value) {
       $bus.$emit('bidding:goLogin')
       return
     }
     if (!listState.total) return
-    filterFormatParams.value = FilterHistoryViewModel2AjaxModel.formatAll(filter)
+    filterFormatParams.value = filter
     const _expand = filter._expand || {}
     Object.assign(filterFormatParams.value, _expand)
     exportLoading.value = true
@@ -67,20 +67,9 @@ export function dataExportActionsModel () {
     try {
       // 判断是否选择过企业。未选择过调用 selectEnt 选择一个默认的企业
       await defaultSelectEnt()
-      const { area, city, district } = FilterHistoryViewModel2AjaxModel.formatAreaCity(filterFormatParams.value.regionMap)
-      const dParams = {
-        scope: area, // 地区省份(数据导出接口用到)
-        area, // 地区省份(保存筛选接口用到)
-        city,
-        district,
-        ...filterFormatParams.value
-      }
-      let params = Object.assign(dParams, {
+      let params = Object.assign(filterFormatParams.value, {
         selectIds: selectIds ? selectIds.join(',') : null
       })
-      if (params.industry) {
-        params.industry = formatFilterApiOther(params.industry)
-      }
       const { data } = await biddingCollectExport(params)
       const { _id } = data
       if (!_id) return
@@ -106,7 +95,7 @@ export function dataExportActionsModel () {
   //携带当前检索跳转数据导出支付页面
   function toPayDataExport (config) {
    const { listState, selectCheckboxCount, selectIds, filter } = config
-   filterFormatParams.value = FilterHistoryViewModel2AjaxModel.formatAll(filter)
+   filterFormatParams.value = filter
     const _expand = filter._expand || {}
     filterFormatParams.value = Object.assign(filterFormatParams.value, _expand)
     // 未登录跳转登录

apps/bigmember_pc/src/views/collection/model/modules/filter.js

@@ -1,5 +1,5 @@
 import { ref } from 'vue'
-import { FilterHistoryViewModel2AjaxModel, infoTypeMapFormat, formatFilterApiOther } from '@/utils'
+import { FilterHistoryViewModel2AjaxModel, infoTypeMapFormat } from '@/utils'
 
 export function useSearchFilterModel(conf) {
   const { isFree,isInApp, isBidField } = conf
@@ -64,7 +64,7 @@ export function useSearchFilterModel(conf) {
       keyWords: filterState.value.keyWords,
       publishTime: rPublishTime,
       subtype: rSubtype,
-      industry: formatFilterApiOther(rIndustry),
+      industry: rIndustry,
       province: area,
       city,
       district,

apps/bigmember_pc/src/views/search/bidding/model/modules/data-export-actions.js

@@ -9,7 +9,7 @@ import {
 } from '@/api/modules/'
 
 import { useStore } from '@/store'
-import  { FilterHistoryViewModel2AjaxModel, openOuterLink, formatFilterApiOther } from '@/utils'
+import  { FilterHistoryViewModel2AjaxModel, openOuterLink } from '@/utils'
 
 // 是否登录
 const isLogin = computed(() => {
@@ -75,9 +75,6 @@ export function dataExportActionsModel () {
       const params = Object.assign(dParams, {
         selectIds: selectIds ? selectIds.join(',') : null
       })
-      if (params.industry) {
-        params.industry = formatFilterApiOther(params.industry)
-      }
       const { _id } = await searchIndexDataExport(params)
       if (!_id) return
       const link = `/front/dataExport/toCreateOrderPage/${_id}`

apps/bigmember_pc/src/views/search/bidding/model/modules/filter.js

@@ -2,8 +2,7 @@ import { ref, computed } from 'vue'
 import  {
   FilterHistoryViewModel2AjaxModel,
   areaObjTwoToSingle,
-  infoTypeMapFormat,
-  formatFilterApiOther
+  infoTypeMapFormat
 } from '@/utils'
 
 export function useSearchFilterModel(conf) {
@@ -114,7 +113,7 @@ export function useSearchFilterModel(conf) {
       buyer: filterState.value.buyer.join(','),
       winner: filterState.value.winner.join(','),
       agency: filterState.value.agency.join(','),
-      industry: formatFilterApiOther(rIndustry),
+      industry: rIndustry,
       province: area,
       city,
       district,