Merge branch 'dev/v4.8.70_tsz' of qmx/jy into feature/v4.8.70

src/web/templates/pc/dataExport_sieve.html

@@ -985,7 +985,7 @@
                 <div class="user-input">
                     <input oninput="getDataExportSearch('1')" class="w" type="text" placeholder="请输入采购单位" maxlength="50" id="buyerInput"
                            onblur="addDelInputB(this,1)">
-                    <div class="pre-search-list" style="display: none;" v-show="buyerSearchListShow">
+                    <div class="pre-search-list buyer-search-list" style="display: none;">
                       <div
                           class="pre-search-item ellipsis"
                           v-for="(item,index) in buyerSearch.list"
@@ -1012,7 +1012,7 @@
                 <div class="user-input">
                     <input oninput="getDataExportSearch('2')" class="w" type="text" placeholder="请输入中标单位" maxlength="50" id="winnerInput"
                            onblur="addDelInputB(this,2)">
-                    <div class="pre-search-list" style="display: none;" v-show="winnerSearchListShow">
+                    <div class="pre-search-list winner-search-list" style="display: none;">
                       <div
                           class="pre-search-item ellipsis"
                           v-for="(item,index) in winnerSearch.list"
@@ -1390,7 +1390,7 @@
       <div class="custom-service-wx">
         <span class="customWx" style="color: #2ABED1;text-decoration: underline;cursor: pointer;">客服微信</span>
         <div class="custom-service-wximg" style="display: none;">
-          <img src="" alt="">
+          <img class="custom-service-wximg-img" src="" alt="">
           <span style="color: #1D1D1D;margin-top: 8px;">客服微信</span>
           <div class="triangle"></div>
         </div>
@@ -1410,7 +1410,7 @@
       <div class="custom-service-wx">
         <span class="customWx" style="color: #2ABED1;text-decoration: underline;cursor: pointer;">客服微信</span>
         <div class="custom-service-wximg" style="display: none;">
-          <img src="" alt="">
+          <img class="custom-service-wximg-img" src="" alt="">
           <span style="color: #1D1D1D;margin-top: 8px;">客服微信</span>
           <div class="triangle"></div>
         </div>
@@ -1484,13 +1484,11 @@
         "党政机关事业单位": ['人大', '政协', '党委办', '组织', '宣传', '统战', '纪委', '政府办', '发改', '财政', '教育', '科技', '工信', '民政', '民宗', '人社', '公安', '检察院', '法院', '司法', '应急管理', '军队', '自然资源', '生态环境', '住建', '市政', '城管', '交通', '水利', '农业', '气象', '文旅', '卫健委', '医疗', '学校', '档案', '体育', '政务中心', '机关事务', '国资委', '海关', '税务', '市场监管', '商务', '人行', '银保监', '证监', '审计', '出版广电', '统计', '公共资源交易', '社会团体'],
         "企业": ['传媒', '采矿业', '电信行业', '金融业', '建筑业', '能源化工', '农林牧渔', '批发零售', '信息技术', '运输物流', '制造业', '住宿餐饮']
       },
-      winnerSearchListShow: false,
       winnerSearch: {
           hover: false,
           focus: false,
           list: []
       },
-      buyerSearchListShow: false,
       buyerSearch: {
           hover: false,
           focus: false,
@@ -1602,10 +1600,10 @@
       toDetail (data, str) {
         if(str === '1') {
           $('#buyerInput').val(data.name)
-          this.buyerSearchListShow = false
+          $('.buyer-search-list').hide()
         } else if(str === '2') {
           $('#winnerInput').val(data.name)
-          this.winnerSearchListShow = false
+          $('.winner-search-list').hide()
         }
         this.$forceUpdate()
       },
@@ -1836,7 +1834,7 @@
           'projectname.pname,purchasing': '项目名称/标的物'
         }
         var selectType = val.replace(/\，/g, ',').split(',')
-        selectType = selectType.filter(item => item.trim() !== "")
+        selectType = Array.from(new Set(selectType))
         selectType.forEach((v, i) => {
           if(v === 'projectname.pname' || v === 'purchasing') {
             selectType.splice(i, 1)
@@ -1848,6 +1846,7 @@
           var newArr = selectType.map(function(item){
             return temp[item]
           })
+          newArr = newArr.filter(item => item !== "" && item)
           return newArr.toString().replace(/,/g, "，")
         } else {
           // 中文转英文
@@ -2277,6 +2276,15 @@
     }
   })
   $('.customWx').mouseenter(function () {
+    if(window.customers && window.customers.length) {
+      window.customers.forEach(function(item) {
+        var $item = $(item)
+        var $img = $('.custom-service-wximg-img')
+        if(item.name === '高静') {
+          $img.attr('src', item.wxer)
+        }
+      })
+    }
     $('.custom-service-wximg').show()
   })
   $('.customWx').mouseleave(function () {
@@ -2402,6 +2410,7 @@
             })
         });
 
+
         $(document).on("click", function () {
             if ($(".edit-user-input").css("display") === "block") {
                 // console.log("!!!!!");
@@ -2539,17 +2548,22 @@
                     if(str === '1') {
                       dataNode.buyerSearch.list = res.data.list || []
                       dataNode.buyerSearchListShow = true
+                      $('.buyer-search-list').show()
                     } else if(str === '2') {
                       dataNode.winnerSearch.list = res.data.list || []
-                      dataNode.winnerSearchListShow = true
+                      $('.winner-search-list').show()
                     }
                   } else {
-                    dataNode.winnerSearchListShow = false
-                    dataNode.buyererSearchListShow = false
+                    setTimeout(() => {
+                      $('.buyer-search-list').hide()
+                      $('.winner-search-list').hide()
+                    }, 1000)
                   }
                 } else {
-                  dataNode.winnerSearchListShow = false
-                  dataNode.buyererSearchListShow = false
+                  setTimeout(() => {
+                    $('.buyer-search-list').hide()
+                    $('.winner-search-list').hide()
+                  }, 1000)
                 }
               } else {
                   // this.checkLogin()