提交筛选处理

src/web/staticres/css/dev2/biddingSearch.css

@@ -400,6 +400,13 @@ margin-left: 176px;
   /*价格区间*/
   padding: 17px 0px 10px;
   border-bottom: 1px dashed #e0e0e0;
+
+}
+#searchInner .searchControl .searchTender .Price.select {
+  padding: 0px;
+  border-bottom: none;
+  padding-top: 12px;
+  padding-left: 12px;
 }
 
 #searchInner .searchControl .searchTender .Price .Price-content {
@@ -411,17 +418,38 @@ margin-left: 176px;
   padding: 4px 7px;
   cursor: pointer;
   margin: 0 45px 4px 0;
+
+}
+#searchInner .searchControl .searchTender .Price.select .Price-content span {
+  padding: 0;
+  margin: 0;
+  display: block;
+  margin-bottom: 10px;
+  line-height: 20px;
+  font-size: 14px;
+  color: #1D1D1D !important;
+  padding-left: 25px;
+  background: url('/images/check_.png') no-repeat;
+  background-size: 20px;
+
 }
 
 #searchInner .searchControl .searchTender .Price .Price-content span.active {
   color: #FFFFFF;
   background-color: #2cb7ca;
   border-radius:2px;
+  
+  
+}
+#searchInner .searchControl .searchTender .Price.select .Price-content span.active {
+  background-color: #fff;
+  background-image:url('/images/checked_.png')!important;
+  
 }
 
 #searchInner .searchControl .searchTender .Price .Price-content .PriceInput {
   float: left;
-/*  margin-top: -2px;*/
+ /* margin-top: -2px; */
 }
 
 #searchInner .searchControl .searchTender .Price .Price-content .PriceInput input[type="text"] {
@@ -452,6 +480,16 @@ margin-left: 176px;
   padding: 0;
   margin: 12px 6px 0;
 }
+#searchInner .searchControl .searchTender .Price.select .Price-content .PriceInput span{
+  float: left;
+  width: 14px;
+  height: 1px;
+  line-height: 15px;
+  background-color: #E0E0E0;
+  padding: 0;
+  margin: 12px 6px 0;
+
+}
 
 #searchInner .searchControl .searchTender .Price .Price-content button {
   float: left;
@@ -463,7 +501,18 @@ margin-left: 176px;
   cursor: pointer;
 	border-radius:2px;
 }
-
+#searchInner .searchControl .searchTender .Price.select .Price-content button {
+  float: left;
+  width: 28px;
+  height: 22px;
+  margin: 7px 0 0 10px;
+  background-color: #fff;
+  color: #2cb7ca;
+  cursor: pointer;
+	border-radius:0px;
+  font-size: 14px;
+  padding: 0;
+}
 #searchInner .searchControl .searchTender .release-time {
   /*发布时间*/
   padding: 17px 0 10px;

src/web/staticres/css/dev2/superSearch-inside.css

@@ -160,13 +160,13 @@
 	position: absolute;
     left: 124px;
     top: 7.5px;
-    color: #ccc;
+    color: #1D1D1D;
 }
 .maxwy{
 	position: absolute;
     right: 8px;
     top: 7.5px;
-    color: #ccc;
+    color: #1D1D1D;
 }
 .PriceInput{
 	position:relative;

src/web/staticres/css/dev2/superSearch.css

@@ -8,7 +8,15 @@
 .pricefat{
 	float: left;
 	margin-top: -9px;
-	/* border: 1px solid #fff; */
+	border: 1px solid #fff;
+    background-color: #F5F6F7;
+	padding: 5px 5px;
+	border-radius:2px;
+}
+.pricefat.seleted_{
+	float: left;
+	margin-top: 0;
+	border: 1px solid #fff;
     background-color: #F5F6F7;
 	padding: 5px 5px;
 	border-radius:2px;

src/web/staticres/css/selectArea.css → src/web/staticres/css/selectCommon.css

@@ -1,5 +1,5 @@
 .el-popper .select_box.selectArea{
-  width: 360px;
+  min-width: 360px;
   height: 360px;
   box-sizing: border-box;
   display: flex;
@@ -39,6 +39,9 @@
   z-index: 0;
   padding-left:16px;
   box-sizing: border-box;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 #selectArea_ .valueBox span{
   line-height: 30px;
@@ -142,10 +145,124 @@ margin-left: 4px;
   right: 4px;
   top: 7.5px;
 }
-.el-popper .select_box.selectArea .box_ .active{
+.el-popper .select_box.selectArea .box_ .active_{
   background-color: #ECECEC;
 }
 .el-select-dropdown.el-popper{
   z-index: 99!important;
 
+}
+.el-popper .select_box.moneyBox{
+  min-width: 425px;
+  height: 104px;
+  box-sizing: border-box;
+}
+.selectbtn.pricebut{
+  display: block!important;
+}
+.notkeyBox.select_box{
+  min-width: 400px;
+  min-height: 157px;
+  box-sizing: border-box;
+
+}
+.selectNotkey .notkeyBox.select_box .el-tag {
+  margin-top: 6px;
+  height: 24px;
+  line-height: 22px;
+  padding: 0 8px;
+  background: #F5F6F7;
+  border: 1px solid #ECECEC;
+  border-radius: 4px;
+  margin-right: 16px;
+  color: #1D1D1D;
+  font-size: 14px;
+  margin-left: 0px;
+}
+.selectNotkey .notkeyBox.select_box .el-icon-close:before {
+  content: "\e6db";
+}
+.selectNotkey .notkeyBox.select_box  .el-tag .el-icon-close::before {
+  display: block;
+}
+.el-tag .el-icon-close::before {
+  display: block;
+}
+.el-icon-close:before {
+  content: "\e6db";
+}
+
+.selectNotkey .notkeyBox.select_box .el-tag .el-tag__close {
+  color: #AAAAAA;
+}
+.selectNotkey .notkeyBox.select_box .el-tag__close.el-icon-close {
+  font-weight: 700;
+}
+.selectNotkey .notkeyBox.select_box .el-tag .el-tag__close {
+  color: #AAAAAA;
+}
+
+
+.selectNotkey .notkeyBox.select_box  .el-tag__close.el-icon-close {
+    font-weight: 700;
+}
+.selectNotkey .notkeyBox.select_box  .el-tag .el-icon-close {
+    border-radius: 50%;
+    text-align: center;
+    position: relative;
+    cursor: pointer;
+    font-size: 12px;
+    height: 16px;
+    width: 16px;
+    line-height: 16px;
+    vertical-align: middle;
+    top: -1px;
+    right: -5px;
+}
+
+
+.selectNotkey .notkeyBox.select_box  .el-tag:hover {
+    color: #2CB7CA;
+    border: 1px solid #2ABED1;
+    background: #fff;
+}
+
+.selectNotkey .notkeyBox.select_box  .el-tag__close.el-icon-close{
+  background-color:rgba(255, 255, 255, 0)!important;
+
+}
+
+
+.selectNotkey .notkeyBox.select_box .el-tag:hover .el-tag__close {
+    background-color: transparent;
+    color: #2CB7CA;
+}
+.selectNotkey .notkeyBox.select_box .key_box{
+  padding-top: 12px;
+  margin-left: 16px;
+}
+.selectNotkey .notkeyBox.select_box .el-input__inner {
+  width: 308px !important;
+  height: 36px;
+  font-size: 14px!important;
+  color: #1D1D1D!important;
+}
+.selectNotkey .notkeyBox.select_box .add-keyword-tags{
+  width: 100%;
+  margin-top: 16px;
+}
+.selectNotkey .notkeyBox.select_box  .el-input.is-disabled .el-input__inner{
+  background-color: #F2F2F4!important;
+  border-color: #ECECEC;
+}
+.select-novip-box{
+   min-height: 50px;
+    padding: 12px;
+    background: linear-gradient(90deg, #FFF7DC 0%, rgba(255, 247, 220, 0) 100%);
+    border: 1px dashed #C98F37;
+    box-sizing: border-box;
+    border-radius: 4px;
+    display: flex;
+    align-items: center;
+    box-sizing: border-box;
 }

src/web/staticres/js/selector/area-city-data.js

@@ -1,11 +1,11 @@
 var selectArea_temp = `<div id="selectArea_">
   <div class="valueBox"><span v-text="valueLabel"></span><span v-text="num" class="hightlight" v-show="num&&num!='全国'&&num!='全部'"></span><span v-show="num&&num!='全国'&&num!='全部'">个</span></div>
-  <el-select ref="selectchoose" :placeholder="placeholderValue" :value="selectValue" :append-to-body="false" class="select_common" @visible-change="change">
+  <el-select ref="selectchoose" :placeholder="placeholderValue" :value="selectValue"  class="select_common" @visible-change="change">
     <div slot="empty" class="select_box selectArea">
       <div class="left">
         <p class="title_" v-text="leftTit"></p>
-        <div class="box_">
-          <div class="item_" v-for= "(item,index) in leftList" @click.self="leftclick(item,index)" :class="{active:active == index}">
+        <div class="box_" onmousewheel="var event = window.event || arguments.callee.caller.arguments[0];if(event.preventDefault) event.preventDefault();var delta = event.wheelDelta || event.originalEvent.wheelDelta || event.originalEvent.detail;var k = delta? delta:-delta*10;this.scrollTop = this.scrollTop - k;return false;">
+          <div class="item_" v-for= "(item,index) in leftList" @click.self="leftclick(item,index)" :class="{active_:active == index}">
            <img class="icon_more" src='/images/more_.png' alt="">
             <el-checkbox v-model = "item.selected" @change="handleCheckChange($event,item,index)" :indeterminate="item.indeterminate" :disabled="item.disabled"></el-checkbox>
             <p class="name_" v-text="item.label" @click.self="leftclick(item,index)"></p>
@@ -17,7 +17,7 @@ var selectArea_temp = `<div id="selectArea_">
        <p class="title_" v-text="rightTit"></p>
        <img class="area-icon-vip" src="/images/biddingSearch/VIP.png" alt="" v-if="type=='area'&&login&&!vipState"/>
        </div>
-        <div class="box_" >
+        <div class="box_" onmousewheel="var event = window.event || arguments.callee.caller.arguments[0];if(event.preventDefault) event.preventDefault();var delta = event.wheelDelta || event.originalEvent.wheelDelta || event.originalEvent.detail;var k = delta? delta:-delta*10;this.scrollTop = this.scrollTop - k;return false;">
           <div class="item_" v-for= "(item1,index2) in rightList">
           <el-checkbox v-model = "item1.selected" @change ="handleCheckChange_right($event,item1,index2)" :indeterminate="item1.indeterminate" :disabled="item1.disabled"></el-checkbox>
           <p class="name_" v-text="item1.label"></p>
@@ -128,7 +128,24 @@ var selectAreachoose = {
         }
         let arr = list
         // /_(.+)/.exec(ele)[1]
-        this.checkecho(arr) // 回显选中信息
+        this.checkecho(arr,'id') // 回显选中信息
+        
+      }else{
+        this.reactAll()// 置为全选
+      }
+      this.getData()
+    },
+    processingbuyerclass(data){ // 采购单位回显
+      if(data){
+        let list
+        if(Array.isArray(data)){
+          list =data
+        }else{
+          list = data.toString().split(',')
+        }
+        let arr = list
+        // /_(.+)/.exec(ele)[1]
+        this.checkecho(arr,'value') // 回显选中信息
         
       }else{
         this.reactAll()// 置为全选
@@ -148,11 +165,11 @@ var selectAreachoose = {
           })
         })
     },
-    checkecho(arr){
+    checkecho(arr,key){
       arr.forEach(ele=>{
         this.leftList.forEach(e=>{
           e.children.forEach(item =>{
-            if(ele == item.id){
+            if(ele == item[key]){
               item.selected = true
             }
           })

src/web/staticres/js/selector/keyword-tags-new.js

@@ -0,0 +1,84 @@
+var keywordTagsComponentTemplate = `
+  <div class="add-keyword-container">
+    <div style="margin-top:6px;">
+      <el-input
+        class="add-keyword-input"
+        type="text"
+        :placeholder="list.length >= maxListLength?'排除词个数已达上限':placeholder"
+        v-model.trim="addKeywordVal"
+        :maxlength="maxLength"
+        :disabled="disabled || list.length >= maxListLength"
+        @keyup.native="onKeyup"
+      ></el-input>
+      <span class="add-keyword-btn" :class="{'focus': addKeywordVal}" @click="addKeyTags">添加</span>
+    </div>
+    <div class="add-keyword-tags">
+    <el-tag
+      :key="tag"
+      v-for="tag in list"
+      closable
+      :disable-transitions="false"
+      @close="handleClose(tag)">
+      {{tag}}
+    </el-tag>
+  </div>
+    <slot name="radio"></slot>
+  </div>
+`
+
+// var keywordTagsComponentTemplate = "\n<div class=\"selector-content select-list-content\" ref=\"selectContainer\">\n    <span class=\"action-button show-more\" @click=\"showMore = !showMore\" v-if=\"needShowMore\">\n        <span class=\"action-text\">{{ showMore ? '\u6536\u8D77' : '\u66F4\u591A' }}</span>\n        <span class=\"el-icon-arrow-down\" :class=\"showMore ? 'rotate180' : ''\"></span>\n    </span>\n    <div class=\"select-group-container\" v-if=\"selectButtonType === 'checkbox'\">\n        <el-checkbox\n            v-for=\"(item, index) in selectList\"\n            :key=\"index\"\n            :name=\"item.value\"\n            ref=\"selectItem\"\n            v-model=\"item.selected\"\n            v-show=\"showAll(item)\"\n            @change=\"changeState(item)\"\n        >{{ item.label }}</el-checkbox>\n    </div>\n    <div class=\"select-group-container\" v-else-if=\"selectButtonType === 'button'\">\n        <div\n            v-for=\"(item, index) in selectList\"\n            :key=\"index\"\n            ref=\"selectItem\"\n            class=\"j-button-item bgc\"\n            v-show=\"showAll(item)\"\n            :class=\"{\n                active: item.selected,\n                all: item.label === selectItemExp.label\n            }\"\n            @click=\"changeState(item)\"\n        >{{ item.label }}</div>\n    </div>\n</div>\n";
+
+var keywordTagsComponentnew = {
+    name: 'keyword-tags-pc',
+    template: keywordTagsComponentTemplate,
+    props: {
+      placeholder: {
+        type: String,
+        default: '请输入关键词'
+      },
+      // 输入框可输入最大长度
+      maxLength: {
+        type: Number,
+        default: 15
+      },
+      list: {
+        type: Array,
+        default: function () {
+          return []
+        }
+      },
+      // 数组最大长度
+      maxListLength: {
+        type: Number,
+        default: 5
+      },
+      // 输入框是否禁用
+      disabled: Boolean,
+      beforeChange: Function
+    },
+    data: function () {
+      return {
+        addKeywordVal: ''
+      }
+    },
+    mounted: function () {},
+    methods: {
+      addKeyTags: function () {
+        var beforeChange = this.beforeChange()
+        if (!beforeChange) return
+        if (!this.addKeywordVal) return
+        this.list.push(this.addKeywordVal.replace(/\s*$/g,''))
+        console.log(this.list);
+        this.$emit('change', this.list)
+        this.addKeywordVal = ''
+      },
+      handleClose: function (tag) {
+        this.list.splice(this.list.indexOf(tag), 1)
+        this.$emit('change', this.list)
+      },
+      onKeyup: function () {
+        // this.addKeywordVal = this.addKeywordVal.replace(/^\s+|\s+$/g, '')
+        this.addKeywordVal = this.addKeywordVal.trim().replace(/^\s*/g, '')
+      }
+    }
+}

src/web/staticres/js/superSearch.js

@@ -32,6 +32,16 @@ $(function() {
 	})
 	//
 	$(".pricebut").click(function(){
+    let selectMinPrices = $(".PriceInput [name='minprice']").val();
+		let selectMaxPrices =  $(".PriceInput [name='maxprice']").val();
+    console.log(selectMinPrices,selectMaxPrices)
+    
+    if(selectMinPrices && selectMaxPrices){
+      let val = selectMinPrices+'万'+'~'+selectMaxPrices+'万'
+      $('.selectorMoney .valueBox .title').text(val)
+    }else{
+      $('.selectorMoney .valueBox .title').text('价格区间')
+    }
 		priceCss();
 		beforeSubmit('filter-price');
 	})
@@ -1092,8 +1102,8 @@ function beforeSubmit(from){
         }
       }
     })
-    //采购单位类型
-    $("#zbSeatchT [name='buyerclass']").val(buyerTypeArr)
+    //采购单位类型   下拉组件回调赋值不在此处赋值
+    // $("#zbSeatchT [name='buyerclass']").val(buyerTypeArr)
     // $("#buyerInput").val(buyerTypeArr);
 	//采购单位联系方式有无
     $("#zbSeatchT [name='buyertel']").val($(".custom-input[name='buyertel']").attr('data-value'));

src/web/templates/pc/supsearch.html

@@ -14,7 +14,7 @@
   <link href='{{Msg "seo" "cdn"}}/css/dev2/biddingSearch.css?v={{Msg "seo" "version"}}' rel="stylesheet">
   <link href='{{Msg "seo" "cdn"}}/css/dev2/superSearch.css?v={{Msg "seo" "version"}}' rel="stylesheet">
   <link href='{{Msg "seo" "cdn"}}/css/dev2/newBidSearch.css?v={{Msg "seo" "version"}}' rel="stylesheet">
-  <link href='{{Msg "seo" "cdn"}}/css/selectArea.css?v={{Msg "seo" "version"}}' rel="stylesheet">
+  <link href='{{Msg "seo" "cdn"}}/css/selectCommon.css?v={{Msg "seo" "version"}}' rel="stylesheet">
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/public-nav-1200.css?v={{Msg "seo" "version"}}' />
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/js/jquery.cookie.js'></script>
@@ -300,6 +300,11 @@
         $("#maxprice").css({"border-color":""});
         $(".pricebut").hide();
         $(".pricefat").removeClass("customtime-active");
+        $("#zbSeatchT [name='minprice']").val("");
+			  $("#zbSeatchT [name='maxprice']").val("");
+        $(".PriceInput [name='minprice']").val('');
+			  $(".PriceInput [name='maxprice']").val('');
+        $('.selectorMoney .valueBox .title').text('价格区间')
         beforeSubmit('filter-price');
       })
       //
@@ -521,6 +526,13 @@
           maxnum = maxp;
         }
       })
+      console.log(maxnum,minnum,'金额')
+      if(minnum && maxnum){
+      let val = minnum+'万'+'~'+maxnum+'万'
+      $('.selectorMoney .valueBox .title').text(val)
+      }else{
+       $('.selectorMoney .valueBox .title').text('价格区间')
+      }
 
       // 采购单位类型
       if (buyclassArr) {
@@ -558,6 +570,13 @@
         $('.buyclass .buyclass-all').removeClass('active')
       } else {
         $('.buyclass .buyclass-all').addClass('active')
+      }
+      // 采购单位下拉组件回显
+      try{
+        searchInnerVue.$refs.selectBuyerclasschoose.processingbuyerclass(buyerclassVal)
+        
+      }catch(e){
+
       }
       // 回显模板里返回的其他筛选条件
       if (buyerTelVal){
@@ -1228,20 +1247,20 @@
             </div>
           </div> -->
           <!-- 高级筛选 -->
-          <div class="advanced-filter clearfix nologin-hide">
+          <!-- <div class="advanced-filter clearfix nologin-hide">
             <div class="advanced-title" {{if .T.bidField}}style="margin: 0;"{{end}}>
               <strong>高级筛选</strong>
               <img class="icon-vip" src="{{Msg "seo" "cdn"}}/images/biddingSearch/VIP.png" alt="" />  
-            </div>
+            </div> -->
             <!--领域化页面不展示-->
-            {{if not .T.bidField}}
+            <!-- {{if not .T.bidField}}
             <div class="leftTitle" style="width: 116px;">采购单位类型：</div>
             <div class="buyclass">
               <span class="buyclass-all active">全部</span>
               <div class="buyclass-content" style="display: none;"></div>
             </div>
             {{end}}
-          </div>
+          </div> -->
           <!-- 更多筛选条件 -->
           <div class="other-filter clearfix" style="display: none;">
             <div class="leftTitle lh-22">更多筛选：</div>
@@ -1273,13 +1292,51 @@
                       </el-select>
                      </div>
                    </div>
-                   
+                   <!-- 价格 -->
+                   <div class="selector-money">
+                    <div class="selectorMoney" id="selectArea_">
+                      <div class="valueBox">
+                        <span class="title">
+                          价格区间
+                        </span>
+                        <!-- <span  class="hightlight price_" >
+                        </span>
+                        <span class="value_">
+                        </span> -->
+                      </div>
+                      <el-select ref="selectchoose" :placeholder="''" :value="''" :popper-append-to-body="false" class="select_common">
+                        <div slot="empty" class="select_box moneyBox">
+                          <div class="Price clearfix select">
+                            <div class="Price-content clearfix">
+                              <span id="priceAll" class="active">全部</span>
+                              <div class="pricefat seleted_">
+                                <div class="PriceInput clearfix">
+                                  <input type="text" name="minprice" id="minprice" value="" placeholder="" />
+                                  <font class="minwy">万元</font>
+                                  <span></span>
+                                  <font class="maxwy">万元</font>
+                                  <input type="text" name="maxprice" id="maxprice" value="" placeholder="" />
+                                </div>
+                                
+                              </div>
+                              <button class="pricebut selectbtn">确定</button>
+                            </div>
+                          </div>
+                          
+                        </div>
+                      </el-select>
+                    </div>
+                   </div>
                 </div>
-                <div class="two-filter clearfix">
+                <div class="two-filter clearfix nologin-hide">
+                  <!--领域化页面不展示-->
+                  <!-- 采购单位筛选 -->
+                  {{if not .T.bidField}}
                   <div class="select-buyerclass mr-16">
-                    <select-areachoose ref='selectBuyerclasschoose' :list-data="industrylist_data" :value-label="'采购单位类型'" left-tit="一级分类" right-tit="二级分类" :login="islogin" :type="'industry'" @datachange = "buyerclassChange">
+                    <select-areachoose ref='selectBuyerclasschoose' :list-data="buyerclass_data" :value-label="'采购单位类型'" left-tit="一级分类" right-tit="二级分类" :login="islogin" :type="'industry'" @datachange = "buyerclassChange">
                     </select-areachoose>
                   </div>
+                  {{end}}
                   <div class="buy-select others">
                     <!-- <span style="float: left;line-height: 30px;margin-right: 12px;color: #686868;">采购单位联系方式</span> -->
                     <div style="float: left;position: relative;">
@@ -1306,7 +1363,26 @@
                       </ol>
                     </div>
                   </div>
+                  <div class="selector-notkey">
+                    <div class="selectNotkey" id="selectArea_">
+                      <div class="valueBox">
+                        <span class="title">排除词  </span><span class="hightlight num_" >${notkeyTags.length || 0}</span><span class="value_ hightlight">/5</span>
+                      </div>
+                      <el-select ref="selectchoose" :placeholder="''" :value="''" :popper-append-to-body="false" class="select_common">
+                        <div slot="empty" class="select_box notkeyBox">
+                          <div class="key_box clearfix">
+                            <keyword-tags-componentnew onClick="if(!vipState) return openVipDialog();" class="notkey-component" :before-change="onNotBeforeChange" :disabled="!vipState" :list="notkeyTags" placeholder="请输入不希望包含的关键词" @change="onNotKeyChange"></keyword-tags-componentnew>
+                          </div>
+                        </div>
+                      </el-select>
+                    </div>
+                   </div>
                 </div>
+                <!-- <div class="select-novip-box">
+                  <div class="select-novip-content">
+
+                  </div>
+                </div> -->
             </div>
           </div>
           <!-- 其他筛选条件 -->
@@ -1802,6 +1878,7 @@
 <script src='{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/selector/area-city-pc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/selector/keyword-tags.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/js/selector/keyword-tags-new.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/selector/area-city-data.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/pc-collect-user-info.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/selector/js/buyerClass.js?v={{Msg "seo" "version"}}'></script>
@@ -2129,10 +2206,17 @@
         return
       }
       e.stopPropagation()
-      $('.custom-select').css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
-      $('.custom-select').siblings().hide()
-      $(this).css("border-color", '#2cb7ca').siblings().show()
-      $(this).children('.icon-arrow').addClass('up')
+      // $('.custom-select').css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
+      // $('.custom-select').siblings().hide()
+      if($(this).siblings().css('display') == 'none'){
+        $(this).css("border-color", '#2cb7ca').siblings().show()
+        $(this).children('.icon-arrow').addClass('up')
+      }else{
+        $(this).css("border-color", '#e0e0e0').children('.icon-arrow').removeClass('up')
+        $(this).siblings().hide()
+      }
+      
+      console.log($(this).siblings().css('display'))
       $('.custom-option li').off('click').bind('click',function(e) {
         e.stopPropagation()
         $(this).parent().hide().siblings().children('.icon-arrow').removeClass('up')
@@ -2736,7 +2820,8 @@ function checkTagDisabled () {
     components: {
       areaCityComponent: areaCityComponent,
       keywordTagsComponent: keywordTagsComponent,
-      selectAreachoose:selectAreachoose
+      selectAreachoose:selectAreachoose,
+      keywordTagsComponentnew:keywordTagsComponentnew
     },
     data: function () {
       return {
@@ -2839,7 +2924,8 @@ function checkTagDisabled () {
         vipStateVue:false,
         selectorlist:[{value:'0',label:'附件'},{value:'1',label:'有附件'},{value:'-1',label:'无附件'}],
         province_city_data:[],
-        industrylist_data:[]
+        industrylist_data:[],
+        buyerclass_data:[]
       }
     },
     computed: {
@@ -2967,8 +3053,8 @@ function checkTagDisabled () {
       },
       getIndustryData(){ // 行业初始数据处理
         // sortArray 行业模版变量-全部一级数组  industry 行业模版变量-选中的数据 industrylist 行业模版变量map结构数据
-        let stair = sortArray
-        let map = industrylist
+        let stair = sortArray? sortArray : []
+        let map = industrylist? industrylist : {}
         let data = []
         stair.forEach(ele =>{
           let item = {}
@@ -3000,12 +3086,34 @@ function checkTagDisabled () {
         this.industrylist_data = datas
       },
       getBuyerclassData(){
-        console.log(buyclassArr,'1111111111111111111111')
-       console.log(buyerclassVal,'22222222222222',buyerTelVal,'111111111111111111111111111111111111')
-       
+        console.log(buyclassArr,'采购单位全部数据')
+        console.log(buyerclassVal,'采购单位模版变量回显') 
+
        let map = buyclassArr
        let data = []
-
+       for (let key in map) {
+         let obj = {}
+         obj.value = key
+         obj.label = key
+         let child =[]
+         map[key].forEach(ele =>{
+          let obj2 = {}
+          obj2.value = ele
+          obj2.label = ele
+          obj2.parent = key
+          obj2.id = key+'_'+ele
+          child.push(obj2)
+         })
+         obj.children = child
+         data.push(obj)
+       }
+        data.unshift({label:'全部',value:'全部',children:[]})
+        data.forEach(ele =>{
+          ele.children.unshift({label:'全部',value:'全部',parent:ele.value})
+        })  
+        let keysToAdd = [{ 'selected': false},{'indeterminate':false},{'disabled':false}];
+        let datas = this.deleteAndAddKeys(data,[],keysToAdd); 
+        this.buyerclass_data = datas 
       },
       areadataChange:debounce(function(data){ // 地区提交搜索
         
@@ -3066,9 +3174,14 @@ function checkTagDisabled () {
   
       },200),
       buyerclassChange :debounce(function(data){ //采购单位提交搜索
-        
-        $("#zbSeatchT [name='industry']").val(data.oneAndtwo.toString())
-        beforeSubmit('filter-industry')
+        let val 
+        if(data.two_noall.length>=data.alltwo.length){
+          val = ''
+        }else{
+          val = data.two_noall
+        }  
+        $("#zbSeatchT [name='buyerclass']").val(val.toString())
+        beforeSubmit('filter-buyerclass')
   
       },200),
       // 搜索到的标讯总数
@@ -3980,6 +4093,7 @@ function checkTagDisabled () {
         $("#maxprice").val('');
         $("#minprice").css({"border-color":"#e0e0e0"});
         $("#maxprice").css({"border-color":"#e0e0e0"});
+        $('.selectorMoney .valueBox .title').text('价格区间')
         $(".timerInput").removeClass("active");
         $("#starttime").val('');
         $("#endtime").val('')
@@ -4002,6 +4116,13 @@ function checkTagDisabled () {
           this.$refs.selectIndustrychoose.processingindustry(null)
         }catch(e){
          console.log(e)
+        }
+        // 采购单位下拉组件 重置
+        try{
+          searchInnerVue.$refs.selectBuyerclasschoose.processingbuyerclass(null)
+        
+        }catch(e){
+
         }
         $('.buyclass .buyclass-all').addClass('active').siblings().find('.buy-list').removeClass('active')
         // $('.custom-input[name="buyertel"]').val('不限')
@@ -4012,7 +4133,7 @@ function checkTagDisabled () {
         // $(".not-key-input-group input").val('')
         this.notkeyTags = []
         // 重置附件
-        this.attachVal = 0
+        this.attachVal = '0'
       },
       // 回显页面选中条件、表单隐藏域val值
       getEchoData: function(item) {
@@ -4135,6 +4256,12 @@ function checkTagDisabled () {
           $("#minprice").css({"border-color":"#e0e0e0"});
           $("#maxprice").css({"border-color":"#e0e0e0"});
         }
+        if(item.minprice  && item.maxprice){
+         let val = item.minprice+'万'+'~'+item.maxprice+'万'
+         $('.selectorMoney .valueBox .title').text(val)
+        }else{
+         $('.selectorMoney .valueBox .title').text('价格区间')
+        }
         // 回显发布时间
         if(item.publishtime){
           $("#timerAll").removeClass("active");
@@ -4243,6 +4370,12 @@ function checkTagDisabled () {
         } else {
           $('.buyclass .buyclass-all').addClass('active')
         }
+        // 采购单位下拉组件回显
+        try{
+         this.$refs.selectBuyerclasschoose.processingbuyerclass(item.buyerclass)
+         }catch(e){
+
+         }
         // 回显采购单位联系方式
         if (item.buyertel){
           var text = item.buyertel == 'y' ? '有采购单位联系方式' : '无采购单位联系方式'