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

src/web/staticres/dataExport/css/conditions.css

@@ -1096,6 +1096,11 @@ input.sm {
   /*滚动条整体样式*/
   width: 8px!important;
 }
+.filter-dialog .el-dialog__headerbtn{
+  width: auto;
+  right: 56px;
+  top: 10px;
+}
 .filter-data-container {
   scrollbar-width: thin
 }

src/web/templates/pc/dataExport_sieve.html

@@ -2526,6 +2526,7 @@
         }
         $("#purchaseSel").append($(purchasehtml))
     });
+    var searchTimer = null
     function getDataExportSearch (str) {
         var unit = ''
         if (str === '1') {
@@ -2537,39 +2538,41 @@
             name: unit.trim()
         }
         if (data.name.length < 2) return
-        $.ajax({
-          url: '/bigmember/search/ent/association',
-          method: 'POST',
-          data: data,
-          success: function (res) {
-              if (res.error_code === 0) {
-                if (res.data) {
-                  if (res.data.list && res.data.list.length > 0) {
-                    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 || []
-                      $('.winner-search-list').show()
-                    }
-                  } else {
-                    setTimeout(() => {
+        // 清除之前的定时器
+        if (searchTimer) {
+          clearTimeout(searchTimer);
+        }
+        searchTimer = setTimeout(() => {
+          $.ajax({
+            url: '/bigmember/search/ent/association',
+            method: 'POST',
+            data: data,
+            success: function (res) {
+                if (res.error_code === 0) {
+                  if (res.data) {
+                    if (res.data.list && res.data.list.length > 0) {
+                      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 || []
+                        $('.winner-search-list').show()
+                      }
+                    } else {
                       $('.buyer-search-list').hide()
                       $('.winner-search-list').hide()
-                    }, 1000)
-                  }
-                } else {
-                  setTimeout(() => {
+                    }
+                  } else {
                     $('.buyer-search-list').hide()
                     $('.winner-search-list').hide()
-                  }, 1000)
+                  }
+                } else {
+                    // this.checkLogin()
                 }
-              } else {
-                  // this.checkLogin()
-              }
-          }.bind(this)
-        })
+            }.bind(this)
+          })
+        }, 1000)
     }
 
     //重置开始时间 结束时间