|
|
@@ -345,19 +345,24 @@ $(document).ready(function () {
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'total_price', hAlign: 2, width: 80, type: 'Number'},
|
|
|
{title: '本期合同计量|数量', colSpan: '2|1', rowSpan: '1|1', field: 'contract_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'contract_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
- {title: '本期数量变更|数量', colSpan: '2|1', rowSpan: '1|1', field: 'qc_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ {title: '本期数量变更|数量', colSpan: '3|1', rowSpan: '1|1', field: 'qc_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'qc_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ {title: '|不计价', colSpan: '|1', rowSpan: '|1', field: 'qc_minus_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ { title: '本期补差|原单价', colSpan: '2|1', rowSpan: '1|1', field: 'org_price', hAlign: 2, width: 60, type: 'Number' },
|
|
|
+ { title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'pc_tp', hAlign: 2, width: 60, type: 'Number' },
|
|
|
{title: '本期完成计量|数量', colSpan: '2|1', rowSpan: '1|1', field: 'gather_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'gather_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '截止本期合同计量|数量', colSpan: '2|1', rowSpan: '1|1', field: 'end_contract_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_contract_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
- {title: '截止本期数量变更|数量', colSpan: '2|1', rowSpan: '1|1', field: 'end_qc_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ {title: '截止本期数量变更|数量', colSpan: '3|1', rowSpan: '1|1', field: 'end_qc_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_qc_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ {title: '|不计价', colSpan: '|1', rowSpan: '|1', field: 'end_qc_minus_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '截止本期完成计量|数量', colSpan: '3|1', rowSpan: '1|1', field: 'end_gather_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_gather_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
{title: '|完成率(%)', colSpan: '|1', rowSpan: '|1', field: 'end_final_1_percent', hAlign: 2, width: 60, type: 'Number'},
|
|
|
- {title: '台账+变更令|数量', colSpan: '2|1', rowSpan: '1|1', field: 'end_final_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
- {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'end_final_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ {title: '台账+变更令|数量', colSpan: '3|1', rowSpan: '1|1', field: 'final_qty', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ {title: '|金额', colSpan: '|1', rowSpan: '|1', field: 'final_tp', hAlign: 2, width: 60, type: 'Number'},
|
|
|
+ {title: '|完成率(%)', colSpan: '|1', rowSpan: '|1', field: 'final_percent', 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: '@'},
|
|
|
{title: '分项工程', colSpan: '1', rowSpan: '2', field: 'fxgc', hAlign: 0, width: 80, formatter: '@'},
|
|
|
@@ -379,13 +384,15 @@ $(document).ready(function () {
|
|
|
deal_bills_qty: gcl.deal_bills_qty, deal_bills_tp: gcl.deal_bills_tp,
|
|
|
quantity: gcl.quantity, total_price: gcl.total_price,
|
|
|
contract_qty: gcl.contract_qty, contract_tp: gcl.contract_tp,
|
|
|
- qc_qty: gcl.qc_qty, qc_tp: gcl.qc_tp,
|
|
|
+ qc_qty: gcl.qc_qty, qc_tp: gcl.qc_tp, qc_minus_qty: gcl.qc_minus_qty,
|
|
|
+ org_price: gcl.org_price, pc_tp: gcl.pc_tp,
|
|
|
gather_qty: gcl.gather_qty, gather_tp: gcl.gather_tp,
|
|
|
end_contract_qty: gcl.end_contract_qty, end_contract_tp: gcl.end_contract_tp,
|
|
|
- end_qc_qty: gcl.end_qc_qty, end_qc_tp: gcl.end_qc_tp,
|
|
|
+ end_qc_qty: gcl.end_qc_qty, end_qc_tp: gcl.end_qc_tp, end_qc_minus_qty: gcl.end_qc_minus_qty,
|
|
|
end_gather_qty: gcl.end_gather_qty, end_gather_tp: gcl.end_gather_tp,
|
|
|
end_gather_percent: gcl.end_gather_percent,
|
|
|
end_final_qty: gcl.end_final_qty, end_final_tp: gcl.end_final_tp, end_final_1_percent: gcl.end_final_1_percent,
|
|
|
+ final_qty: gcl.final_qty, final_tp: gcl.final_tp, final_percent: gcl.final_percent,
|
|
|
});
|
|
|
if (gcl.leafXmjs && gcl.leafXmjs.length > 0) {
|
|
|
for (const xmj of gcl.leafXmjs) {
|
