|
@@ -2028,8 +2028,16 @@ $(document).ready(() => {
|
|
|
spSpread.getActiveSheet().zh_setting.readOnly = posReadOnly;
|
|
|
const posData = stagePos.ledgerPos[itemsPre + node.id] || [];
|
|
|
const posMeasure = $('#pos-measure')[0].checked;
|
|
|
+ const posUnMeasure = $('#pos-un-measure')[0].checked;
|
|
|
posData.forEach(x => {
|
|
|
- x.visible = !posMeasure || (!!x.contract_qty || !!x.qc_qty || !!x.qc_minus_qty);
|
|
|
+ x.visible = true;
|
|
|
+ if (posMeasure && x.visible) {
|
|
|
+ x.visible = !!x.contract_qty || !!x.qc_qty || !!x.qc_minus_qty;
|
|
|
+ }
|
|
|
+ if (posUnMeasure && x.visible) {
|
|
|
+ // 不考虑不计价
|
|
|
+ x.visible = !x.end_contract_qty && !x.end_qc_qty && !x.end_gather_qty; // && !x.qc_minus_qty;
|
|
|
+ }
|
|
|
});
|
|
|
SpreadJsObj.loadSheetData(spSpread.getActiveSheet(), 'data', posData, posReadOnly);
|
|
|
getNodeList(node.id);
|
|
@@ -2482,6 +2490,7 @@ $(document).ready(() => {
|
|
|
}
|
|
|
};
|
|
|
$('#pos-measure').click(stagePosSpreadObj.loadCurPosData);
|
|
|
+ $('#pos-un-measure').click(stagePosSpreadObj.loadCurPosData);
|
|
|
// 加载上下窗口resizer
|
|
|
$.divResizer({
|
|
|
select: '#main-resize',
|