diff --git a/WebApi/View/Delivery/delivery_dashboard_risk.html b/WebApi/View/Delivery/delivery_dashboard_risk.html index c6a9cbc..5d4f6e4 100755 --- a/WebApi/View/Delivery/delivery_dashboard_risk.html +++ b/WebApi/View/Delivery/delivery_dashboard_risk.html @@ -97,7 +97,6 @@ body { font-family: 'Microsoft YaHei','PingFang SC',sans-serif; background: #f3f 采购员: -
@@ -207,10 +206,15 @@ function loadData(page) { status.textContent = '加载中...'; currentPageSize = parseInt(document.getElementById('pageSize').value) || 50; - const risk = document.getElementById('filterRisk').value; - const productType = document.getElementById('filterProductType').value; - const supplier = document.getElementById('filterSupplier').value; - const purchaser = document.getElementById('filterPurchaser').value; + function selVal(id){ + var el=document.getElementById(id); + if(el.getMultiValues)return el.getMultiValues().join(','); + return el.value||''; + } + const risk = selVal('filterRisk'); + const productType = selVal('filterProductType'); + const supplier = selVal('filterSupplier'); + const purchaser = selVal('filterPurchaser'); const keyword = document.getElementById('filterKeyword').value.trim(); const params = new URLSearchParams(); @@ -320,7 +324,7 @@ function resetFilter() { document.getElementById('filterPurchaser').resetMulti(); document.getElementById('filterKeyword').value = ''; document.getElementById('pageSize').value = '50'; - loadData(1); + // resetMulti 已触发自动搜索 } // ===== 导出Excel ===== @@ -406,6 +410,11 @@ function initMultiSelect(selectEl, placeholder){ list.push({cb:cb,txt:t,label:lbl}); }); function vals(){return list.filter(i=>i.cb.checked).map(i=>i.cb.value);} + var _msDebounce=null; + function triggerAutoSearch(){ + if(_msDebounce)clearTimeout(_msDebounce); + _msDebounce=setTimeout(function(){loadData(1);},300); + } function render(){ var v=vals(),ts=trigger.querySelector('.ms-tags'),ph=trigger.querySelector('.ms-placeholder'); if(v.length===0){ts.innerHTML='';ph.style.display='inline';ph.textContent=placeholder;trigger.style.minWidth='150px';} @@ -415,19 +424,19 @@ function initMultiSelect(selectEl, placeholder){ } trigger.style.minWidth=''; } - function sync(){selectEl.value=vals().join(',');} trigger.addEventListener('click',function(e){e.stopPropagation(); document.querySelectorAll('.ms-dropdown.active').forEach(function(d){if(d!==dropdown)d.classList.remove('active');document.querySelectorAll('.ms-trigger.active').forEach(function(t){t.classList.remove('active')});}); dropdown.classList.toggle('active');trigger.classList.toggle('active'); if(dropdown.classList.contains('active')){si.focus();si.value='';list.forEach(function(i){i.label.style.display=''});}}); si.addEventListener('input',function(){var q=si.value.toLowerCase();list.forEach(function(i){i.label.style.display=(!q||i.txt.textContent.toLowerCase().indexOf(q)>=0)?'':'none';});}); - list.forEach(function(i){i.cb.addEventListener('change',function(){sync();render();});}); - wrap.addEventListener('click',function(e){var c=e.target.closest('.ms-tag-close');if(c){e.stopPropagation();var v=c.getAttribute('data-val');var it=list.find(function(x){return x.cb.value===v;});if(it){it.cb.checked=false;sync();render();}}}); - ft.addEventListener('click',function(e){var b=e.target.closest('.ms-btn');if(!b)return;if(b.getAttribute('data-action')==='clear'){list.forEach(function(i){i.cb.checked=false;});sync();render();dropdown.classList.remove('active');trigger.classList.remove('active');}else if(b.getAttribute('data-action')==='ok'){dropdown.classList.remove('active');trigger.classList.remove('active');}}); + list.forEach(function(i){i.cb.addEventListener('change',function(){render();triggerAutoSearch();});}); + wrap.addEventListener('click',function(e){var c=e.target.closest('.ms-tag-close');if(c){e.stopPropagation();var v=c.getAttribute('data-val');var it=list.find(function(x){return x.cb.value===v;});if(it){it.cb.checked=false;render();triggerAutoSearch();}}}); + ft.addEventListener('click',function(e){var b=e.target.closest('.ms-btn');if(!b)return;if(b.getAttribute('data-action')==='clear'){list.forEach(function(i){i.cb.checked=false;});render();triggerAutoSearch();dropdown.classList.remove('active');trigger.classList.remove('active');}else if(b.getAttribute('data-action')==='ok'){dropdown.classList.remove('active');trigger.classList.remove('active');}}); document.addEventListener('click',function(e){if(!wrap.contains(e.target)){dropdown.classList.remove('active');trigger.classList.remove('active');}}); - selectEl.resetMulti=function(){list.forEach(function(i){i.cb.checked=false;});sync();render();}; - selectEl.setValuesMulti=function(csv){var a=(csv||'').split(',').filter(Boolean);list.forEach(function(i){i.cb.checked=a.indexOf(i.cb.value)>=0;});sync();render();}; - selectEl.refreshMulti=function(){ow.innerHTML='';list=[];orig=selectEl.querySelectorAll('option');orig.forEach(function(opt){if(!opt.value)return;var lbl=document.createElement('label'),cb=document.createElement('input');cb.type='checkbox';cb.value=opt.value;var t=document.createElement('span');t.textContent=opt.textContent;lbl.appendChild(cb);lbl.appendChild(t);ow.appendChild(lbl);list.push({cb:cb,txt:t,label:lbl});});list.forEach(function(i){i.cb.addEventListener('change',function(){sync();render();});});sync();render();}; + selectEl.resetMulti=function(){list.forEach(function(i){i.cb.checked=false;});render();triggerAutoSearch();}; + selectEl.setValuesMulti=function(csv){var a=(csv||'').split(',').filter(Boolean);list.forEach(function(i){i.cb.checked=a.indexOf(i.cb.value)>=0;});render();}; + selectEl.getMultiValues=function(){return vals();}; + selectEl.refreshMulti=function(){ow.innerHTML='';list=[];orig=selectEl.querySelectorAll('option');orig.forEach(function(opt){if(!opt.value)return;var lbl=document.createElement('label'),cb=document.createElement('input');cb.type='checkbox';cb.value=opt.value;var t=document.createElement('span');t.textContent=opt.textContent;lbl.appendChild(cb);lbl.appendChild(t);ow.appendChild(lbl);list.push({cb:cb,txt:t,label:lbl});});list.forEach(function(i){i.cb.addEventListener('change',function(){render();triggerAutoSearch();});});render();}; render();return selectEl; } document.addEventListener('DOMContentLoaded',function(){ @@ -439,6 +448,15 @@ document.addEventListener('DOMContentLoaded',function(){ var rp=new URLSearchParams(window.location.search); document.getElementById('filterRisk').setValuesMulti(rp.get('risk')||''); document.getElementById('filterProductType').setValuesMulti(rp.get('productType')||''); + // 搜索框防抖 + var _kwDebounce=null; + var kw=document.getElementById('filterKeyword'); + if(kw){ + kw.addEventListener('input',function(){ + if(_kwDebounce)clearTimeout(_kwDebounce); + _kwDebounce=setTimeout(function(){loadData(1);},300); + }); + } }); diff --git a/WebApi/View/Delivery/material_delivery.html b/WebApi/View/Delivery/material_delivery.html index e77ff8f..23e2c1b 100755 --- a/WebApi/View/Delivery/material_delivery.html +++ b/WebApi/View/Delivery/material_delivery.html @@ -131,7 +131,7 @@ tbody tr:hover{background:#f0f6ff} - +
@@ -329,10 +329,16 @@ function loadOptions(cb){ } function getFilters(){ - var t=document.getElementById('selProductType').value; - var s=document.getElementById('selSupplier').value; - var pu=document.getElementById('selPurchaser').value; - var r=document.getElementById('selRisk').value; + // 优先从 MultiSelect 组件读(数组),fallback 原生 .value + function multiValue(id){ + var el=document.getElementById(id); + if(el.getMultiValues)return el.getMultiValues().join(','); + return el.value||''; + } + var t=multiValue('selProductType'); + var s=multiValue('selSupplier'); + var pu=multiValue('selPurchaser'); + var r=multiValue('selRisk'); var kw=document.getElementById('txtKeyword').value.trim(); return {t:t,s:s,pu:pu,r:r,kw:kw}; } @@ -444,7 +450,7 @@ function resetSearch(){ if(el.resetMulti)el.resetMulti();else el.value=''; }); document.getElementById('txtKeyword').value=''; - loadList(); + // resetMulti 已触发 triggerAutoSearch(防抖 300ms 自动 loadList) } function openEdit(id){ @@ -749,6 +755,11 @@ function initMultiSelect(selectEl, placeholder){ function getSelectedValues(){ return listItems.filter(i=>i.cb.checked).map(i=>i.cb.value); } + var _msDebounce=null; + function triggerAutoSearch(){ + if(_msDebounce)clearTimeout(_msDebounce); + _msDebounce=setTimeout(function(){loadList(1);},300); + } function renderTags(){ var vals=getSelectedValues(); var tagsSpan=trigger.querySelector('.ms-tags'); @@ -772,9 +783,6 @@ function initMultiSelect(selectEl, placeholder){ } trigger.style.minWidth=''; } - function syncNativeValue(){ - selectEl.value=getSelectedValues().join(','); - } // 点 trigger 打开 trigger.addEventListener('click',function(e){ @@ -798,9 +806,9 @@ function initMultiSelect(selectEl, placeholder){ }); }); - // checkbox 变更 + // checkbox 变更 → 防抖自动筛选 listItems.forEach(function(i){ - i.cb.addEventListener('change',function(){syncNativeValue();renderTags();}); + i.cb.addEventListener('change',function(){renderTags();triggerAutoSearch();}); }); // tag 里的 × 关闭 @@ -810,7 +818,7 @@ function initMultiSelect(selectEl, placeholder){ e.stopPropagation(); var v=close.getAttribute('data-val'); var item=listItems.find(function(x){return x.cb.value===v}); - if(item){item.cb.checked=false;syncNativeValue();renderTags();} + if(item){item.cb.checked=false;renderTags();triggerAutoSearch();} } }); @@ -819,7 +827,7 @@ function initMultiSelect(selectEl, placeholder){ var btn=e.target.closest('.ms-btn');if(!btn)return; if(btn.getAttribute('data-action')==='clear'){ listItems.forEach(function(i){i.cb.checked=false;}); - syncNativeValue();renderTags(); + renderTags();triggerAutoSearch(); dropdown.classList.remove('active');trigger.classList.remove('active'); }else if(btn.getAttribute('data-action')==='ok'){ dropdown.classList.remove('active');trigger.classList.remove('active'); @@ -837,13 +845,15 @@ function initMultiSelect(selectEl, placeholder){ selectEl.addEventListener('change',function(){renderTags();}); // 提供 reset 方法供 resetSearch() 调用 - selectEl.resetMulti=function(){listItems.forEach(function(i){i.cb.checked=false;});syncNativeValue();renderTags();}; + selectEl.resetMulti=function(){listItems.forEach(function(i){i.cb.checked=false;});renderTags();triggerAutoSearch();}; // 提供 setValues 供 loadOptions 后回填 selectEl.setValuesMulti=function(csv){ var arr=(csv||'').split(',').filter(Boolean); listItems.forEach(function(i){i.cb.checked=arr.indexOf(i.cb.value)>=0;}); - syncNativeValue();renderTags(); + renderTags(); }; + // getFilters() 优先调用这个(数组),绕过原生 select .value + selectEl.getMultiValues=function(){return getSelectedValues();}; // 刷新 options(当原生 select innerHTML 被动态更新后调用,如 loadOptions 回调) selectEl.refreshMulti=function(){ @@ -860,21 +870,30 @@ function initMultiSelect(selectEl, placeholder){ listItems.push({cb:cb,txt:txt,label:lbl}); }); listItems.forEach(function(i){ - i.cb.addEventListener('change',function(){syncNativeValue();renderTags();}); + i.cb.addEventListener('change',function(){renderTags();triggerAutoSearch();}); }); - syncNativeValue();renderTags(); + renderTags(); }; renderTags(); return selectEl; } -// 页面加载完成后初始化 4 个 MultiSelect,loadOptions 完成后回填选中值 +// 搜索框:防抖 300ms 自动 loadList +var _kwDebounce=null; document.addEventListener('DOMContentLoaded',function(){ initMultiSelect(document.getElementById('selProductType'),'产品类型:全部'); initMultiSelect(document.getElementById('selSupplier'),'供应商:全部'); initMultiSelect(document.getElementById('selPurchaser'),'采购员:全部'); initMultiSelect(document.getElementById('selRisk'),'风险:全部'); + + var kw=document.getElementById('txtKeyword'); + if(kw){ + kw.addEventListener('input',function(){ + if(_kwDebounce)clearTimeout(_kwDebounce); + _kwDebounce=setTimeout(function(){loadList(1);},300); + }); + } });