feat: 筛选器支持多选(方案B:下拉+checkbox)+ 后端 7 个接口改 OR 多值筛选

后端:
- MultiLike/MultiExact/MultiCsvContains 三个 Helper
- .NET Framework 4.6 无 TrimEntries,改用 Select(v=>v.Trim()) 手动去空格
- 7 个接口 where 条件从单值改多值 OR 模式

前端:
- material_delivery.html + delivery_dashboard_risk.html 各 4 个下拉改 MultiSelect 组件
- 原生 select 隐藏,组件同步 .value 为逗号分隔,原页面 JS 零改动
- 支持动态 options 刷新 + reset/setValuesMulti/refreshMulti
This commit is contained in:
Gaussian committed 2026-11-10 11:08:42 +08:00
1 parent de4516ab5d
commit 9888c03193
6 files changed
+5013 -37

No files matched your search

+101 -11
View File
@@ -9,6 +9,34 @@
<style>
* { box-sizing: border-box; margin: 0; padding: 0; }
body { font-family: 'Microsoft YaHei','PingFang SC',sans-serif; background: #f3f5fa; color: #2c3e50; padding: 14px 18px; }
/* ===== MultiSelect 多选下拉组件(方案B:下拉+checkbox)===== */
.ms-wrap{position:relative;display:inline-block;vertical-align:middle}
.ms-native{display:none}
.ms-trigger{display:flex;align-items:center;justify-content:space-between;min-width:150px;padding:0 28px 0 10px;height:30px;background:#fff;border:1px solid #dcdfe6;border-radius:6px;font-size:13px;color:#333;cursor:pointer;user-select:none;transition:border-color .2s}
.ms-trigger:hover{border-color:#409eff}
.ms-trigger.active{border-color:#409eff;box-shadow:0 0 0 2px rgba(64,158,255,.15)}
.ms-trigger .ms-arrow{position:absolute;right:8px;top:50%;transform:translateY(-50%);width:0;height:0;border-left:4px solid transparent;border-right:4px solid transparent;border-top:5px solid #999;pointer-events:none}
.ms-trigger .ms-placeholder{color:#999}
.ms-trigger .ms-tags{display:flex;flex-wrap:wrap;gap:4px;margin-right:12px;max-width:240px}
.ms-trigger .ms-tag{display:inline-flex;align-items:center;gap:3px;background:#ecf5ff;color:#409eff;padding:0 6px;height:20px;border-radius:3px;font-size:12px;line-height:1}
.ms-trigger .ms-tag .ms-tag-close{cursor:pointer;font-size:14px;line-height:1;margin-top:-1px}
.ms-trigger .ms-tag .ms-tag-close:hover{color:#337ecc}
.ms-trigger .ms-more{color:#999;font-size:12px;padding:0 4px}
.ms-dropdown{display:none;position:absolute;top:calc(100% + 4px);left:0;min-width:200px;max-height:280px;background:#fff;border:1px solid #e8e8e8;border-radius:6px;box-shadow:0 6px 16px rgba(0,0,0,.12);z-index:100;overflow:hidden}
.ms-dropdown.active{display:block}
.ms-search{padding:8px;border-bottom:1px solid #f0f0f0}
.ms-search input{width:100%;height:26px;padding:0 8px;border:1px solid #d9d9d9;border-radius:3px;font-size:12px;outline:none}
.ms-search input:focus{border-color:#409eff}
.ms-options{max-height:220px;overflow-y:auto;padding:4px 0}
.ms-options label{display:flex;align-items:center;gap:8px;padding:5px 10px;cursor:pointer;font-size:13px;color:#333;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.ms-options label:hover{background:#f5f5f5}
.ms-options input[type=checkbox]{cursor:pointer}
.ms-footer{display:flex;justify-content:space-between;padding:6px 10px;border-top:1px solid #f0f0f0;font-size:12px}
.ms-footer .ms-btn{padding:2px 10px;border:1px solid #d9d9d9;border-radius:3px;background:#fff;cursor:pointer;color:#555}
.ms-footer .ms-btn:hover{border-color:#409eff;color:#409eff}
.ms-footer .ms-btn.primary{background:#409eff;border-color:#409eff;color:#fff}
.ms-footer .ms-btn.primary:hover{background:#337ecc}
/* ===== MultiSelect 结束 ===== */
.head { display: flex; align-items: center; margin-bottom: 12px; gap: 12px; }
.head h2 { font-size: 20px; }
@@ -56,18 +84,18 @@ body { font-family: 'Microsoft YaHei','PingFang SC',sans-serif; background: #f3f
<div class="filter">
<span>产品类型:</span>
<select id="filterProductType"><option value="">全部</option></select>
<select id="filterProductType" class="ms-native"><option value="">全部</option></select>
<span>风险:</span>
<select id="filterRisk">
<select id="filterRisk" class="ms-native">
<option value="">全部</option>
<option value="断线">断线</option>
<option value="预警">预警</option>
<option value="安全">安全</option>
</select>
<span>供应商:</span>
<select id="filterSupplier"><option value="">全部</option></select>
<select id="filterSupplier" class="ms-native"><option value="">全部</option></select>
<span>采购员:</span>
<select id="filterPurchaser"><option value="">全部</option></select>
<select id="filterPurchaser" class="ms-native"><option value="">全部</option></select>
<input type="text" id="filterKeyword" placeholder="搜索物料编码/名称/产品编码" />
<button onclick="loadData(1)">查询</button>
<button class="gray" onclick="resetFilter()">重置</button>
@@ -161,7 +189,9 @@ function loadFilterOptions() {
opt.value = t; opt.textContent = t;
sel.appendChild(opt);
});
sel.value = initProductType;
// MultiSelect: 重建 checkbox → 恢复初始选中(支持逗号分隔多值)
if (sel.refreshMulti) { sel.refreshMulti(); sel.setValuesMulti(initProductType); }
else sel.value = initProductType;
}
});
// 供应商/采购员(从当前列表数据汇总,所以首次加载完成后再调用)
@@ -261,8 +291,11 @@ function refreshDropdowns(data) {
[...purchaserSet].sort().forEach(v => {
const opt = document.createElement('option'); opt.value = v; opt.textContent = v; purchaserSel.appendChild(opt);
});
supplierSel.value = currentSupplier;
purchaserSel.value = currentPurchaser;
// MultiSelect: refresh 重建 checkbox → 恢复选中
if (supplierSel.refreshMulti) { supplierSel.refreshMulti(); supplierSel.setValuesMulti(currentSupplier); }
else supplierSel.value = currentSupplier;
if (purchaserSel.refreshMulti) { purchaserSel.refreshMulti(); purchaserSel.setValuesMulti(currentPurchaser); }
else purchaserSel.value = currentPurchaser;
}
function prevPage() { if (currentPage > 1) loadData(currentPage - 1); }
@@ -281,10 +314,10 @@ function goPage(p) {
}
function resetFilter() {
document.getElementById('filterRisk').value = initRisk;
document.getElementById('filterProductType').value = initProductType;
document.getElementById('filterSupplier').value = '';
document.getElementById('filterPurchaser').value = '';
document.getElementById('filterRisk').setValuesMulti(initRisk || '');
document.getElementById('filterProductType').setValuesMulti(initProductType || '');
document.getElementById('filterSupplier').resetMulti();
document.getElementById('filterPurchaser').resetMulti();
document.getElementById('filterKeyword').value = '';
document.getElementById('pageSize').value = '50';
loadData(1);
@@ -350,6 +383,63 @@ document.getElementById('filterKeyword').addEventListener('keydown', e => { if (
loadFilterOptions();
loadData(1);
setTimeout(() => Grid.bind('grid'), 200);
/* ===== MultiSelect 组件初始化(方案B:下拉+checkbox)===== */
function initMultiSelect(selectEl, placeholder){
var wrap=document.createElement('div');wrap.className='ms-wrap';
var trigger=document.createElement('div');trigger.className='ms-trigger';
trigger.innerHTML='<span class="ms-tags"></span><span class="ms-placeholder">'+placeholder+'</span><span class="ms-arrow"></span>';
var dropdown=document.createElement('div');dropdown.className='ms-dropdown';
var sw=document.createElement('div');sw.className='ms-search';
var si=document.createElement('input');si.type='text';si.placeholder='搜索...';sw.appendChild(si);
var ow=document.createElement('div');ow.className='ms-options';
var ft=document.createElement('div');ft.className='ms-footer';
ft.innerHTML='<button class="ms-btn" data-action="clear">清空</button><button class="ms-btn primary" data-action="ok">确定</button>';
dropdown.appendChild(sw);dropdown.appendChild(ow);dropdown.appendChild(ft);
wrap.appendChild(trigger);wrap.appendChild(dropdown);
selectEl.parentNode.insertBefore(wrap, selectEl);
var orig=selectEl.querySelectorAll('option'),list=[];
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});
});
function vals(){return list.filter(i=>i.cb.checked).map(i=>i.cb.value);}
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';}
else{ph.style.display='none';
if(v.length<=2){ts.innerHTML=v.map(function(x){var l=selectEl.querySelector('option[value="'+x+'"]');return'<span class="ms-tag">'+(l?l.textContent:x)+'<span class="ms-tag-close" data-val="'+x+'">×</span></span>';}).join('');}
else{ts.innerHTML='<span class="ms-tag">'+(selectEl.querySelector('option[value="'+v[0]+'"]')?.textContent||v[0])+'<span class="ms-tag-close" data-val="'+v[0]+'">×</span></span><span class="ms-more">+'+(v.length-1)+'</span>';}
}
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');}});
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();};
render();return selectEl;
}
document.addEventListener('DOMContentLoaded',function(){
initMultiSelect(document.getElementById('filterProductType'),'产品类型:全部');
initMultiSelect(document.getElementById('filterRisk'),'风险:全部');
initMultiSelect(document.getElementById('filterSupplier'),'供应商:全部');
initMultiSelect(document.getElementById('filterPurchaser'),'采购员:全部');
// 恢复初始值(支持 URL 参数逗号分隔多值)
var rp=new URLSearchParams(window.location.search);
document.getElementById('filterRisk').setValuesMulti(rp.get('risk')||'');
document.getElementById('filterProductType').setValuesMulti(rp.get('productType')||'');
});
</script>
<!-- 公共组件 -->
<script src="../common/grid.js"></script>