|
@@ -114,7 +114,7 @@ $(document).ready(function () {
|
|
SpreadJsObj.reLoadSheetData(gclSpread.getActiveSheet());
|
|
SpreadJsObj.reLoadSheetData(gclSpread.getActiveSheet());
|
|
});
|
|
});
|
|
|
|
|
|
- postData(preUrl + '/load', { filter: 'ledger;pos;dealBills,spec' }, function (result) {
|
|
|
|
|
|
+ postData(preUrl + '/load', { filter: 'ledger;pos;dealBills;spec' }, function (result) {
|
|
// 解析清单汇总数据
|
|
// 解析清单汇总数据
|
|
gclGatherModel.loadLedgerData(result.ledgerData);
|
|
gclGatherModel.loadLedgerData(result.ledgerData);
|
|
gclGatherModel.loadPosData(result.posData);
|
|
gclGatherModel.loadPosData(result.posData);
|
|
@@ -126,7 +126,7 @@ $(document).ready(function () {
|
|
SpreadJsObj.loadSheetData(gclSpread.getActiveSheet(), SpreadJsObj.DataType.Data, gclGatherData);
|
|
SpreadJsObj.loadSheetData(gclSpread.getActiveSheet(), SpreadJsObj.DataType.Data, gclGatherData);
|
|
loadLeafXmjData(0);
|
|
loadLeafXmjData(0);
|
|
// 章节合计
|
|
// 章节合计
|
|
- const chapterData = gclGatherModel.gatherChapterData(chapter, data.spec, ['total_price', 'contract_tp', 'qc_tp', 'pre_contract_tp', 'pre_qc_tp']);
|
|
|
|
|
|
+ const chapterData = gclGatherModel.gatherChapterData(chapter, result.spec, ['total_price', 'contract_tp', 'qc_tp', 'pre_contract_tp', 'pre_qc_tp']);
|
|
for (const c of chapterData) {
|
|
for (const c of chapterData) {
|
|
c.gather_tp = ZhCalc.add(c.contract_tp, c.qc_tp);
|
|
c.gather_tp = ZhCalc.add(c.contract_tp, c.qc_tp);
|
|
c.end_contract_tp = ZhCalc.add(c.contract_tp, c.pre_contract_tp);
|
|
c.end_contract_tp = ZhCalc.add(c.contract_tp, c.pre_contract_tp);
|