Merge branch 'main' into feature/v1.0.28

apps/mobile/src/components/search/Layout.vue

@@ -32,6 +32,11 @@ export default {
     event: 'input'
   },
   props: {
+    // 是否允许空值进行搜索，true表示允许，false表示不允许
+    emptySearch: {
+      type: Boolean,
+      default: false
+    },
     showButton: {
       type: Boolean,
       default: true
@@ -58,8 +63,12 @@ export default {
       if (type === 'input') {
         this.$emit('input', data)
       }
-      if (type === 'submit' && (typeof data !== 'string' || data === '')) {
-        return
+
+      // 是否允许空值进行提交
+      if (!this.emptySearch) {
+        if (type === 'submit' && (typeof data !== 'string' || data === '')) {
+          return
+        }
       }
       // 提交按钮防抖
       if (type === 'submit') {

apps/mobile/src/components/search/bidding/filterHistoryDialog.vue

@@ -9,7 +9,7 @@
     @close="onClose(false)"
     :before-close="beforeClose"
     show-cancel-button>
-    <CellCard>
+    <CellCard scroll>
       <template #header-left>
         <div class="card-left-header">
           <div class="card-item">
@@ -84,6 +84,7 @@ export default {
 }
 .card-item {
   display: flex;
+  padding: 0 12px;
   .item-label {
     white-space: nowrap;
   }

apps/mobile/src/components/search/bidding/filters.vue

@@ -166,6 +166,72 @@
               />
             </template>
           </JCell>
+          <JCell
+            class="more-filter-item"
+            title="采购单位"
+            @click="checkboxGroupClick({ disabled: noLoginOrFree })"
+            v-show="isLogin"
+          >
+            <template #title v-if="noLoginOrFree">
+              <span class="mr-6">采购单位</span>
+              <van-tag plain round type="danger" @click="onNoPower">
+                开通
+              </van-tag>
+            </template>
+            <template #label>
+              <KeywordsInputGroup
+                :readonly="noLoginOrFree"
+                v-model="cacheMoreFilters.buyerList"
+                inputMaxlength="30"
+                placeholder="输入采购单位名称，找其招标项目"
+                class="buyer-filter"
+              />
+            </template>
+          </JCell>
+          <JCell
+            class="more-filter-item"
+            title="中标企业"
+            @click="checkboxGroupClick({ disabled: noLoginOrFree })"
+            v-show="isLogin"
+          >
+            <template #title v-if="noLoginOrFree">
+              <span class="mr-6">中标企业</span>
+              <van-tag plain round type="danger" @click="onNoPower">
+                开通
+              </van-tag>
+            </template>
+            <template #label>
+              <KeywordsInputGroup
+                :readonly="noLoginOrFree"
+                v-model="cacheMoreFilters.winnerList"
+                inputMaxlength="30"
+                placeholder="输入中标企业名称，找其中标项目"
+                class="winner-filter"
+              />
+            </template>
+          </JCell>
+          <JCell
+            class="more-filter-item"
+            title="招标代理机构"
+            @click="checkboxGroupClick({ disabled: noLoginOrFree })"
+            v-show="isLogin"
+          >
+            <template #title v-if="noLoginOrFree">
+              <span class="mr-6">招标代理机构</span>
+              <van-tag plain round type="danger" @click="onNoPower">
+                开通
+              </van-tag>
+            </template>
+            <template #label>
+              <KeywordsInputGroup
+                :readonly="noLoginOrFree"
+                v-model="cacheMoreFilters.agencyList"
+                inputMaxlength="30"
+                placeholder="输入代理机构名称，找其代理项目"
+                class="winner-filter"
+              />
+            </template>
+          </JCell>
         </div>
       </DropdownLayout>
     </van-dropdown-item>
@@ -309,7 +375,10 @@ export default {
           fileExists: ['0'],
           winnerConcat: [''],
           buyerConcat: [''],
-          notKey: []
+          notKey: [],
+          buyerList: [],
+          winnerList: [],
+          agencyList: []
         }
       }
     },
@@ -334,7 +403,10 @@ export default {
           fileExists: ['0'],
           winnerConcat: [''],
           buyerConcat: [''],
-          notKey: []
+          notKey: [],
+          buyerList: [],
+          winnerList: [],
+          agencyList: []
         }
       }
     }
@@ -380,7 +452,10 @@ export default {
         fileExists: ['0'],
         winnerConcat: [''],
         buyerConcat: [''],
-        notKey: []
+        notKey: [],
+        buyerList: [],
+        winnerList: [],
+        agencyList: []
       }
     }
   },
@@ -543,7 +618,10 @@ export default {
             winnerConcat,
             buyerConcat,
             fileExists,
-            notKey
+            notKey,
+            buyerList,
+            winnerList,
+            agencyList
           } = this.defaultFilterState
           const sameList = []
 
@@ -584,6 +662,20 @@ export default {
           sameList.push(
             deepCompare(this.filters.notKey, notKey)
           )
+
+          // 采购单位
+          sameList.push(
+            deepCompare(this.filters.buyerList, buyerList)
+          )
+          // 中标单位
+          sameList.push(
+            deepCompare(this.filters.winnerList, winnerList)
+          )
+          // 代理机构
+          sameList.push(
+            deepCompare(this.filters.agencyList, agencyList)
+          )
+
           // 附件
           sameList.push(
             this.filters.fileExists === fileExists
@@ -638,7 +730,10 @@ export default {
             winnerConcat,
             buyerConcat,
             fileExists,
-            notKey
+            notKey,
+            buyerList,
+            winnerList,
+            agencyList
           } = this.filters
 
           // 更多关键词
@@ -671,6 +766,10 @@ export default {
 
           this.cacheMoreFilters.fileExists = fileExists
           this.cacheMoreFilters.notKey = notKey
+
+          this.cacheMoreFilters.buyerList = buyerList
+          this.cacheMoreFilters.winnerList = winnerList
+          this.cacheMoreFilters.agencyList = agencyList
           break
         }
       }
@@ -721,7 +820,10 @@ export default {
             winnerConcat,
             buyerConcat,
             fileExists,
-            notKey
+            notKey,
+            buyerList,
+            winnerList,
+            agencyList
           } = this.defaultFilterState
           // 更多关键词
           if (moreKeywordsMode) {
@@ -776,6 +878,18 @@ export default {
             this.cacheMoreFilters.notKey = notKey
             filters.notKey = notKey
           }
+          if (Array.isArray(buyerList)) {
+            filters.buyerList = buyerList
+            this.cacheMoreFilters.buyerList = buyerList
+          }
+          if (Array.isArray(winnerList)) {
+            filters.winnerList = winnerList
+            this.cacheMoreFilters.winnerList = winnerList
+          }
+          if (Array.isArray(agencyList)) {
+            filters.agencyList = agencyList
+            this.cacheMoreFilters.agencyList = agencyList
+          }
           break
         }
       }
@@ -828,6 +942,9 @@ export default {
             winnerConcat,
             buyerConcat,
             notKey,
+            buyerList,
+            winnerList,
+            agencyList,
             fileExists
           } = this.cacheMoreFilters
           const { price: defaultPrice } = this.defaultFilterState
@@ -859,6 +976,9 @@ export default {
           filters.buyerConcat = buyerConcat
           filters.fileExists = fileExists
           filters.notKey = notKey
+          filters.buyerList = buyerList
+          filters.winnerList = winnerList
+          filters.agencyList = agencyList
           break
         }
       }

apps/mobile/src/components/selector/keyword-input-group/index.vue

@@ -15,7 +15,7 @@
       <van-form class="keywords-input-container" action="javascript:return true">
         <van-field
           class="keywords-input"
-          v-model="inputValue"
+          v-model.trim="inputValue"
           :formatter="formatter"
           :placeholder="placeholder"
           :maxlength="inputMaxlength"
@@ -137,7 +137,7 @@ export default {
   },
   methods: {
     formatter (value) {
-      return value.replace(/\s{2,}/g, ' ')
+      return value.replace(/,/g, ' ').replace(/\s{2,}/g, ' ')
     },
     /**
      * 设置页面状态
@@ -247,8 +247,8 @@ export default {
   margin-bottom: 16px;
 }
 .keywords-input-tags {
-  max-height: 160px;
-  overflow-y: scroll;
+  // max-height: 160px;
+  // overflow-y: scroll;
   ::v-deep {
     .van-tag {
       padding: 6px 10px;

apps/mobile/src/ui/cell-card/index.vue

@@ -11,7 +11,13 @@
       </div>
     </div>
     <div class="card-content-container" @click="onClickContent">
-      <div class="card-content" :class="{ 'ellipsis inline': (!expand && overflowEllipsis) }">
+      <div
+        class="card-content"
+        :class="{
+          'ellipsis inline': !expand && overflowEllipsis,
+          'need-scroll': scroll
+        }"
+      >
         <slot name="default"></slot>
       </div>
       <button class="expand-button" v-if="showExpandButton" @click.stop="changeExpandState">
@@ -49,6 +55,11 @@ export default {
       type: Boolean,
       default: true
     },
+    // 是否需要滚动
+    scroll: {
+      type: Boolean,
+      default: false
+    },
     /**
      * 是否展示头部右侧箭头
      */
@@ -99,7 +110,7 @@ export default {
 }
 .card-content-container {
   position: relative;
-  padding: 8px 12px;
+  padding: 8px 0;
   min-height: 40px;
   line-height: 22px;
   font-size: 13px;
@@ -121,7 +132,13 @@ export default {
   border-radius: 4px;
   z-index: 2;
 }
-.card-content.inline > * {
-  display: inline-block;
+.card-content {
+  &.need-scroll {
+    max-height: 320px;
+    overflow-y: auto;
+  }
+  &.inline > * {
+    display: inline-block;
+  }
 }
 </style>

apps/mobile/src/utils/format/modules/filter-history-formatter.js

@@ -31,7 +31,10 @@ export function filterHistoryNotEmptyFormat (formatted) {
     winnerConcatText,
     buyerConcatText,
     fileExists,
-    notKey
+    notKey,
+    buyerList,
+    winnerList,
+    agencyList
   } = formatted
   let { infoTypeText } = formatted
 
@@ -133,6 +136,24 @@ export function filterHistoryNotEmptyFormat (formatted) {
       text: notKey.split(',').join(' ')
     })
   }
+  if (buyerList) {
+    formattedList.push({
+      label: '采购单位：',
+      text: buyerList.split(',').join(' ')
+    })
+  }
+  if (winnerList) {
+    formattedList.push({
+      label: '中标企业：',
+      text: winnerList.split(',').join(' ')
+    })
+  }
+  if (agencyList) {
+    formattedList.push({
+      label: '代理机构：',
+      text: agencyList.split(',').join(' ')
+    })
+  }
   return formattedList
 }
 

apps/mobile/src/views/search/filter-history/bidding.vue

@@ -84,6 +84,12 @@
                 <span class="item-text highlight-text">{{ history.winner }}</span>
               </template>
             </div>
+            <div class="card-item" v-if="history.agency">
+              <template>
+                <span class="item-label">招标代理机构：</span>
+                <span class="item-text highlight-text">{{ history.agency }}</span>
+              </template>
+            </div>
           </template>
           <template v-else>
             {{ desc_dispose(history) }}
@@ -238,6 +244,9 @@ export default {
       const formattedItem = {
         ...formatted,
         notKey: item.notkey,
+        buyerList: item.buyer,
+        winnerList: item.winner,
+        agencyList: item.agency,
         isPay: item.isPay,
         fileExists: [item.fileExists || '0'],
         price: {
@@ -501,6 +510,9 @@ export default {
       if (val.winner) {
         localStorage.setItem('winner', val.winner)
       }
+      if (val.agency) {
+        localStorage.setItem('agency', val.agency)
+      }
       localStorage.setItem('index','-1') 
       if (this.$envs.inWX) {
         window.location.replace(`${location.origin}/front/wx_dataExport/toSieve?from=filterList`)
@@ -523,6 +535,7 @@ export default {
       localStorage.removeItem('subTypes')
       localStorage.removeItem('buyer')
       localStorage.removeItem('winner')
+      localStorage.removeItem('agency')
     },
     selectType_dispose(selectType) { // 匹配类型转化
       let select = [];
@@ -593,6 +606,9 @@ export default {
         if (val.winner) {
           str += val.winner
         }
+        if (val.agency) {
+          str += val.agency
+        }
       }
       return str
     },
@@ -755,6 +771,7 @@ export default {
 
 .card-item {
   display: flex;
+  padding: 0 12px;
 
   &.close {
     margin-right: 4px;

apps/mobile/src/views/search/middle/bidding/index.vue

@@ -167,6 +167,9 @@ export default {
         ...formatted,
         isPay: item.isPay,
         notKey: item.notkey,
+        buyerList: item.buyer,
+        winnerList: item.winner,
+        agencyList: item.agency,
         fileExists: [item.fileExists || '0'],
         price: {
           start: item.minprice,
@@ -183,6 +186,14 @@ export default {
       const allKeywordsArr = [keywordsText].concat(additionalWords).filter(k => !!k)
       const allKeywordsText = allKeywordsArr.join(' ')
       const additionalWordsText = additionalWords.join(' ')
+
+      // 关键词为空时兼容
+      let label = allKeywordsArr.join('，')
+      if (label) {
+        label += '：'
+      }
+      label += labelList.join('，')
+
       return {
         id: item.id,
         ...formattedItem,
@@ -191,7 +202,8 @@ export default {
         allKeywordsText,
         allKeywordsArr,
         wordsModeText: additionalWordsText ? wordsModeText : '',
-        label: `${allKeywordsArr.join('，')}：${labelList.join('，')}`
+        // label: `${allKeywordsArr.join('，')}：${labelList.join('，')}`
+        label
       }
     },
     /**

apps/mobile/src/views/search/result/bidding/index.vue

@@ -403,7 +403,10 @@ export default {
           fileExists: ['0'],
           winnerConcat: [''],
           buyerConcat: [''],
-          notKey: []
+          notKey: [],
+          buyerList: [],
+          winnerList: [],
+          agencyList: []
         }
       },
       // 发送请求整理的数据
@@ -425,7 +428,10 @@ export default {
         winnerConcat: [''],
         buyerConcat: [''],
         fileExists: ['0'],
-        notKey: []
+        notKey: [],
+        winnerList: [],
+        buyerList: [],
+        agencyList: []
       },
       listState: {
         limit: 0,
@@ -894,6 +900,7 @@ export default {
     restoreStateFromRouteParams () {
       const { searchFilters = {} } = this.$refs
       const { filters } = this.$route.params
+      console.log(filters)
       if (!filters) return
       const { getScopeOptions = [], getTimeOptions = [] } = searchFilters
       this.topSearch.input = filters.keywords.join(' ')
@@ -967,6 +974,30 @@ export default {
           this.filters.notKey = filters.notKey.split(',')
         }
       }
+      if (filters.buyerList && !this.isFree) {
+        if (Array.isArray(filters.buyerList)) {
+          this.filters.buyerList = filters.buyerList
+        } else {
+          this.filters.buyerList = filters.buyerList.split(',')
+        }
+      }
+      if (filters.winnerList && !this.isFree) {
+        if (Array.isArray(filters.winnerList)) {
+          this.filters.winnerList = filters.winnerList
+        } else {
+          this.filters.winnerList = filters.winnerList.split(',')
+        }
+      }
+      if (filters.agencyList && !this.isFree) {
+        if (Array.isArray(filters.agencyList)) {
+          this.filters.agencyList = filters.agencyList
+        } else {
+          this.filters.agencyList = filters.agencyList.split(',')
+        }
+      }
+
+      console.log(filters.agencyList)
+
       // 信息类型
       if (filters.infoType) {
         const key = 'infoType'
@@ -1093,6 +1124,9 @@ export default {
         winnerTel: this.filters.winnerConcat.join(','),
         buyerTel: this.filters.buyerConcat.join(','),
         exclusionWords: this.filters.notKey.join(','),
+        buyer: this.filters.buyerList.join(','),
+        winner: this.filters.winnerList.join(','),
+        agency: this.filters.agencyList.join(','),
         fileExists: this.filters.fileExists.join(','),
         splitKeywords: this.pageState.splitKeywords
       }
@@ -1594,6 +1628,9 @@ export default {
         buyertel: this.filters.buyerConcat.join(','),
         fileExists: fileExists || '0',
         notkey: this.filters.notKey.join(','),
+        buyer: this.filters.buyerList.join(','),
+        winner: this.filters.winnerList.join(','),
+        agency: this.filters.agencyList.join(','),
         searchGroup,
         searchMode: this.filters.searchMode.join('') - 0,
         wordsMode,
@@ -1853,13 +1890,16 @@ export default {
       }
     },
     formatFilterItems (item) {
-      console.log('flag!!!!!!!!!!!!!')
+      console.log('flag!!!!!!!!!!!!!', item)
       item.scope = item.selectType
       item.infotype = item.subtype
       const formatted = FilterHistoryAjaxModel2ViewModel.formatAll(item)
       const formattedItem = {
         ...formatted,
         notKey: item.notkey,
+        buyerList: item.buyer,
+        winnerList: item.winner,
+        agencyList: item.agency,
         fileExists: [item.fileExists || '0'],
         price: {
           start: item.minprice,

apps/mobile/vite.config.js

@@ -35,6 +35,7 @@ export default defineConfig(({command}) => {
     base: '/jy_mobile/',
     build: {
       outDir: '../../dist/jy_mobile',
+      emptyOutDir: true,
       // terserOptions: {
       //   compress: {
       //     drop_console: false, // 默认为true