|
@@ -125,7 +125,7 @@ $(document).ready(() => {
|
|
|
{title: '本期计量数量|合同', colSpan: '3|1', rowSpan: '1|1', field: 'contract_qty', hAlign: 2, width: 120, type: 'Number'},
|
|
|
{title: '|数量变更', colSpan: '|1', rowSpan: '|1', field: 'qc_qty', hAlign: 2, width: 120, type: 'Number'},
|
|
|
{title: '|小计', colSpan: '|1', rowSpan: '|1', field: 'gather_qty', hAlign: 2, width: 120, type: 'Number'},
|
|
|
- {title: '本期差价', colSpan: '1', rowSpan: '2', field: 'total_jiacha', hAlign:3, width: 150, type: 'Number'}
|
|
|
+ {title: '本期价差', colSpan: '1', rowSpan: '2', field: 'total_jiacha', hAlign:3, width: 150, type: 'Number'}
|
|
|
],
|
|
|
emptyRows: 0,
|
|
|
headRows: 2,
|
|
@@ -715,7 +715,9 @@ $(document).ready(() => {
|
|
|
} else {
|
|
|
gclGatherModel.loadLedgerData(ledger, curLedgerData);
|
|
|
gclGatherModel.loadPosData(pos, curPosData);
|
|
|
- gclGatherData = gclGatherModel.gatherGclData();
|
|
|
+ gclGatherData = gclGatherModel.gatherGclData().filter(item => {
|
|
|
+ return item.qc_qty || item.contract_qty
|
|
|
+ });
|
|
|
}
|
|
|
SpreadJsObj.loadSheetData(ledgerSpread.getActiveSheet(), SpreadJsObj.DataType.Data, gclGatherData);
|
|
|
loadLeafXmjData(0);
|