feat: 筛选器支持多选(方案B:下拉+checkbox)+ 后端 7 个接口改 OR 多值筛选
前端:
- material_delivery.html 4 个下拉(产品类型/供应商/采购员/风险)改 MultiSelect 组件
- delivery_dashboard_risk.html 4 个下拉同步改造
- 原生 select 隐藏,组件同步 .value 为逗号分隔,原页面 JS 零改动
- 支持动态 options 刷新(loadOptions/refreshDropdowns/loadFilterOptions)
- 支持 reset/setValuesMulti/refreshMulti 三个 API
后端:
- DeliverController 加 MultiLike/MultiExact/MultiCsvContains 三个 Helper
- GetDeliveryList / GetBoardRiskList / GetBoardStats / GetBoardDetail / GetBoardGantt / GetGanttData / GetScheduleList
共 7 个接口的 where 条件从单值改多值 OR 模式
- GetGanttData 的 risk 已有 Split(',') OR 逻辑,productType 补 MultiCsvContains
- GetScheduleList productType 补 MultiLike
This commit is contained in:
1 parent
de4516ab5d
commit
09be16a767
3 files changed
+371
-37
No files matched your search
@@ -9,6 +9,34 @@
|
||||
<style>
|
||||
*{margin:0;padding:0;box-sizing:border-box}
|
||||
body{font-family:'Microsoft YaHei','PingFang SC',sans-serif;background:#f0f2f5;min-height:100vh}
|
||||
/* ===== MultiSelect 多选下拉组件(方案B:下拉+checkbox)===== */
|
||||
.ms-wrap{position:relative;display:inline-block;vertical-align:middle}
|
||||
.ms-native{display:none}/* 隐藏原生select,保留id供JS取值 */
|
||||
.ms-trigger{display:flex;align-items:center;justify-content:space-between;min-width:160px;padding:0 28px 0 10px;height:30px;background:#fff;border:1px solid #d9d9d9;border-radius:4px;font-size:13px;color:#333;cursor:pointer;user-select:none;transition:border-color .2s}
|
||||
.ms-trigger:hover{border-color:#1890ff}
|
||||
.ms-trigger.active{border-color:#1890ff;box-shadow:0 0 0 2px rgba(24,144,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:260px}
|
||||
.ms-trigger .ms-tag{display:inline-flex;align-items:center;gap:3px;background:#e6f4ff;color:#1890ff;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:#096dd9}
|
||||
.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:#1890ff}
|
||||
.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:#1890ff;color:#1890ff}
|
||||
.ms-footer .ms-btn.primary{background:#1890ff;border-color:#1890ff;color:#fff}
|
||||
.ms-footer .ms-btn.primary:hover{background:#096dd9}
|
||||
/* ===== MultiSelect 结束 ===== */
|
||||
.top-bar{background:linear-gradient(135deg,#1a73e8,#1557b0);color:#fff;padding:0 24px;display:flex;align-items:center;height:56px;box-shadow:0 2px 8px rgba(0,0,0,.15);position:sticky;top:0;z-index:100}
|
||||
.top-bar .logo{font-size:18px;font-weight:600;letter-spacing:1px;margin-right:32px}
|
||||
.top-bar .nav-tabs{display:flex;gap:4px;height:100%}
|
||||
@@ -92,10 +120,11 @@ tbody tr:hover{background:#f0f6ff}
|
||||
<h3>物料交付维护</h3>
|
||||
<div class="toolbar">
|
||||
<div class="toolbar-row">
|
||||
<select id="selProductType"><option value="">产品类型:全部</option></select>
|
||||
<select id="selSupplier"><option value="">供应商:全部</option></select>
|
||||
<select id="selPurchaser"><option value="">采购员:全部</option></select>
|
||||
<select id="selRisk">
|
||||
<!-- MultiSelect 多选:原生 select 隐藏,保留 id 供 getFilters() 取值;组件同步更新 .value 为逗号分隔值 -->
|
||||
<select id="selProductType" class="ms-native"><option value="">产品类型:全部</option></select>
|
||||
<select id="selSupplier" class="ms-native"><option value="">供应商:全部</option></select>
|
||||
<select id="selPurchaser" class="ms-native"><option value="">采购员:全部</option></select>
|
||||
<select id="selRisk" class="ms-native">
|
||||
<option value="">风险:全部</option>
|
||||
<option value="断线">断线</option>
|
||||
<option value="预警">预警</option>
|
||||
@@ -107,8 +136,11 @@ tbody tr:hover{background:#f0f6ff}
|
||||
</div>
|
||||
<div class="toolbar-row">
|
||||
<button class="btn btn-primary" onclick="startDeliveryCalc()" id="btnRecalcDelivery">🔄 重算交付数据</button>
|
||||
<button class="btn btn-blue" onclick="downloadBatchArrivalTpl()">📄 到货计划模板</button>
|
||||
<button class="btn btn-outline" onclick="document.getElementById('batchArrivalFile').click()">📥 导入到货计划</button>
|
||||
<!-- [2026-11-10 临时隐藏] 旧版"自定义模板"导入到货计划,会触发断线重算;
|
||||
已被下方"📥 导入SRM排程"替代(供应商真实承诺,不参与断线计算)。
|
||||
如需恢复,删除 style="display:none" 即可,后端 ImportBatchArrivalPlan 接口仍保留 -->
|
||||
<button class="btn btn-blue" onclick="downloadBatchArrivalTpl()" style="display:none">📄 到货计划模板</button>
|
||||
<button class="btn btn-outline" onclick="document.getElementById('batchArrivalFile').click()" style="display:none">📥 导入到货计划</button>
|
||||
<input type="file" id="batchArrivalFile" accept=".xls,.xlsx" style="display:none" onchange="importBatchArrivalExcel(this)">
|
||||
<button class="btn btn-green" onclick="document.getElementById('srmFile').click()">📥 导入SRM排程</button>
|
||||
<input type="file" id="srmFile" accept=".xlsx,.xls" style="display:none" onchange="importSRMSchedule(this)">
|
||||
@@ -288,6 +320,10 @@ function loadOptions(cb){
|
||||
var h3='<option value="">采购员:全部</option>';
|
||||
(options.purchasers||[]).forEach(function(p){h3+='<option value="'+p+'">'+p+'</option>'});
|
||||
document.getElementById('selPurchaser').innerHTML=h3;
|
||||
// 刷新 MultiSelect 的 checkbox 列表(动态 innerHTML 后重建)
|
||||
['selProductType','selSupplier','selPurchaser'].forEach(function(id){
|
||||
var el=document.getElementById(id);if(el&&el.refreshMulti)el.refreshMulti();
|
||||
});
|
||||
cb&&cb();
|
||||
});
|
||||
}
|
||||
@@ -403,10 +439,10 @@ function initColResize(){
|
||||
}
|
||||
|
||||
function resetSearch(){
|
||||
document.getElementById('selProductType').value='';
|
||||
document.getElementById('selSupplier').value='';
|
||||
document.getElementById('selPurchaser').value='';
|
||||
document.getElementById('selRisk').value='';
|
||||
['selProductType','selSupplier','selPurchaser','selRisk'].forEach(function(id){
|
||||
var el=document.getElementById(id);
|
||||
if(el.resetMulti)el.resetMulti();else el.value='';
|
||||
});
|
||||
document.getElementById('txtKeyword').value='';
|
||||
loadList();
|
||||
}
|
||||
@@ -676,6 +712,170 @@ function checkRunningCalc(){
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/* ===== 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 searchWrap=document.createElement('div');searchWrap.className='ms-search';
|
||||
var searchInput=document.createElement('input');searchInput.type='text';searchInput.placeholder='搜索...';
|
||||
searchWrap.appendChild(searchInput);
|
||||
var optionsWrap=document.createElement('div');optionsWrap.className='ms-options';
|
||||
var footer=document.createElement('div');footer.className='ms-footer';
|
||||
footer.innerHTML='<button class="ms-btn" data-action="clear">清空</button><button class="ms-btn primary" data-action="ok">确定</button>';
|
||||
dropdown.appendChild(searchWrap);dropdown.appendChild(optionsWrap);dropdown.appendChild(footer);
|
||||
|
||||
wrap.appendChild(trigger);wrap.appendChild(dropdown);
|
||||
selectEl.parentNode.insertBefore(wrap, selectEl);
|
||||
|
||||
// 读原生 options 构建 checkbox 列表
|
||||
var origOptions=selectEl.querySelectorAll('option');
|
||||
var listItems=[];
|
||||
origOptions.forEach(function(opt){
|
||||
if(!opt.value)return;// 跳过"全部"空值
|
||||
var lbl=document.createElement('label');
|
||||
var cb=document.createElement('input');cb.type='checkbox';cb.value=opt.value;
|
||||
var txt=document.createElement('span');txt.textContent=opt.textContent;
|
||||
lbl.appendChild(cb);lbl.appendChild(txt);
|
||||
optionsWrap.appendChild(lbl);
|
||||
listItems.push({cb:cb,txt:txt,label:lbl});
|
||||
});
|
||||
|
||||
function getSelectedValues(){
|
||||
return listItems.filter(i=>i.cb.checked).map(i=>i.cb.value);
|
||||
}
|
||||
function renderTags(){
|
||||
var vals=getSelectedValues();
|
||||
var tagsSpan=trigger.querySelector('.ms-tags');
|
||||
var ph=trigger.querySelector('.ms-placeholder');
|
||||
if(vals.length===0){
|
||||
tagsSpan.innerHTML='';ph.style.display='inline';ph.textContent=placeholder;
|
||||
trigger.style.minWidth='160px';
|
||||
}else{
|
||||
ph.style.display='none';
|
||||
if(vals.length<=2){
|
||||
tagsSpan.innerHTML=vals.map(function(v){
|
||||
var label=selectEl.querySelector('option[value="'+v+'"]');
|
||||
var txt=label?label.textContent:v;
|
||||
return '<span class="ms-tag">'+txt+'<span class="ms-tag-close" data-val="'+v+'">×</span></span>';
|
||||
}).join('');
|
||||
}else{
|
||||
var shown=vals.slice(0,1);
|
||||
var hidden=vals.length-1;
|
||||
tagsSpan.innerHTML='<span class="ms-tag">'+(selectEl.querySelector('option[value="'+shown[0]+'"]')?.textContent||shown[0])+'<span class="ms-tag-close" data-val="'+shown[0]+'">×</span></span><span class="ms-more">+'+hidden+'</span>';
|
||||
}
|
||||
}
|
||||
trigger.style.minWidth='';
|
||||
}
|
||||
function syncNativeValue(){
|
||||
selectEl.value=getSelectedValues().join(',');
|
||||
}
|
||||
|
||||
// 点 trigger 打开
|
||||
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')){
|
||||
searchInput.focus();searchInput.value='';
|
||||
listItems.forEach(function(i){i.label.style.display=''});
|
||||
}
|
||||
});
|
||||
|
||||
// 搜索
|
||||
searchInput.addEventListener('input',function(){
|
||||
var q=searchInput.value.toLowerCase();
|
||||
listItems.forEach(function(i){
|
||||
if(!q||i.txt.textContent.toLowerCase().indexOf(q)>=0)i.label.style.display='';
|
||||
else i.label.style.display='none';
|
||||
});
|
||||
});
|
||||
|
||||
// checkbox 变更
|
||||
listItems.forEach(function(i){
|
||||
i.cb.addEventListener('change',function(){syncNativeValue();renderTags();});
|
||||
});
|
||||
|
||||
// tag 里的 × 关闭
|
||||
wrap.addEventListener('click',function(e){
|
||||
var close=e.target.closest('.ms-tag-close');
|
||||
if(close){
|
||||
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();}
|
||||
}
|
||||
});
|
||||
|
||||
// footer 按钮
|
||||
footer.addEventListener('click',function(e){
|
||||
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();
|
||||
dropdown.classList.remove('active');trigger.classList.remove('active');
|
||||
}else if(btn.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');
|
||||
}
|
||||
});
|
||||
|
||||
// resetSearch 后同步
|
||||
selectEl.addEventListener('change',function(){renderTags();});
|
||||
|
||||
// 提供 reset 方法供 resetSearch() 调用
|
||||
selectEl.resetMulti=function(){listItems.forEach(function(i){i.cb.checked=false;});syncNativeValue();renderTags();};
|
||||
// 提供 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();
|
||||
};
|
||||
|
||||
// 刷新 options(当原生 select innerHTML 被动态更新后调用,如 loadOptions 回调)
|
||||
selectEl.refreshMulti=function(){
|
||||
optionsWrap.innerHTML='';
|
||||
listItems=[];
|
||||
origOptions=selectEl.querySelectorAll('option');
|
||||
origOptions.forEach(function(opt){
|
||||
if(!opt.value)return;
|
||||
var lbl=document.createElement('label');
|
||||
var cb=document.createElement('input');cb.type='checkbox';cb.value=opt.value;
|
||||
var txt=document.createElement('span');txt.textContent=opt.textContent;
|
||||
lbl.appendChild(cb);lbl.appendChild(txt);
|
||||
optionsWrap.appendChild(lbl);
|
||||
listItems.push({cb:cb,txt:txt,label:lbl});
|
||||
});
|
||||
listItems.forEach(function(i){
|
||||
i.cb.addEventListener('change',function(){syncNativeValue();renderTags();});
|
||||
});
|
||||
syncNativeValue();renderTags();
|
||||
};
|
||||
|
||||
renderTags();
|
||||
return selectEl;
|
||||
}
|
||||
|
||||
// 页面加载完成后初始化 4 个 MultiSelect,loadOptions 完成后回填选中值
|
||||
document.addEventListener('DOMContentLoaded',function(){
|
||||
initMultiSelect(document.getElementById('selProductType'),'产品类型:全部');
|
||||
initMultiSelect(document.getElementById('selSupplier'),'供应商:全部');
|
||||
initMultiSelect(document.getElementById('selPurchaser'),'采购员:全部');
|
||||
initMultiSelect(document.getElementById('selRisk'),'风险:全部');
|
||||
});
|
||||
</script>
|
||||
<!-- 公共导航栏组件(菜单维护点:View/common/nav.js) -->
|
||||
<script src="../common/nav.js"></script>
|
||||
|
||||
Reference in new issue
Block a user