|
|
@@ -168,8 +168,8 @@ $(document).ready(() => {
|
|
|
gclGatherData = gclGatherModel.gatherGclData();
|
|
|
gclGatherModel.checkDiffer(gclGatherData);
|
|
|
for (const gcl of gclGatherData) {
|
|
|
- gcl.compare_qty = ZhCalc.sub(gcl.deal_bills_qty, gcl.quantity);
|
|
|
- gcl.compare_tp = ZhCalc.sub(gcl.deal_bills_tp, gcl.total_price);
|
|
|
+ gcl.compare_qty = ZhCalc.sub(gcl.quantity, gcl.deal_bills_qty);
|
|
|
+ gcl.compare_tp = ZhCalc.sub(gcl.total_price, gcl.deal_bills_tp);
|
|
|
gcl.compare_differ = !checkZero(gcl.compare_qty) || !checkZero(gcl.compare_tp);
|
|
|
}
|
|
|
SpreadJsObj.loadSheetData(gclSheet, SpreadJsObj.DataType.Data, gclGatherData);
|
|
|
@@ -256,7 +256,7 @@ $(document).ready(() => {
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'deal_bills_tp', hAlign: 2, width: 80, type: 'Number'},
|
|
|
{title: '台账|数量', colSpan: '2|1', rowSpan: '1|1', field: 'quantity', hAlign: 2, width: 80, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'total_price', hAlign: 2, width: 80, type: 'Number'},
|
|
|
- {title: '签约－台账|数量', colSpan: '2|1', rowSpan: '1|1', field: 'compare_qty', hAlign: 2, width: 80, type: 'Number'},
|
|
|
+ {title: '台账－签约|数量', colSpan: '2|1', rowSpan: '1|1', field: 'compare_qty', hAlign: 2, width: 80, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'compare_tp', hAlign: 2, width: 80, type: 'Number'},
|
|
|
{title: '单位工程', colSpan: '1', rowSpan: '2', field: 'dwgc', hAlign: 0, width: 80, formatter: '@'},
|
|
|
{title: '分部工程', colSpan: '1', rowSpan: '2', field: 'fbgc', hAlign: 0, width: 80, formatter: '@'},
|
