|
@@ -4389,10 +4389,11 @@ $(document).ready(() => {
|
|
|
// 定位到对应的清单或计量单元
|
|
|
$('body').on('click', '.show-shoufang-report', function () {
|
|
|
const id = parseInt($(this).attr('data-id'));
|
|
|
- const [qrCodePath, replace_key_params, req_params] = makeReportData(id);
|
|
|
+ const [qrCodePath, replace_key_params, req_params, rpt_name] = makeReportData(id);
|
|
|
sessionStorage.qrCodePath = qrCodePath;
|
|
|
sessionStorage.replace_key_params = JSON.stringify(replace_key_params);
|
|
|
sessionStorage.req_params = JSON.stringify(req_params);
|
|
|
+ sessionStorage.rpt_name = rpt_name;
|
|
|
window.open('/individualReport/A4');
|
|
|
});
|
|
|
});
|
|
@@ -4453,16 +4454,16 @@ function makeReportData(sfid) {
|
|
|
'KEY_合同段': tenderInfo.deal_info.dealCode,
|
|
|
'KEY_监理单位': tenderInfo.construction_unit.supervision1.company,
|
|
|
'KEY_编号': '',
|
|
|
+ 'KEY_设计工程数量': 0,
|
|
|
};
|
|
|
- replace_key_params['KEY_子目号及子目名称'] = ledger_code;
|
|
|
+ // if (sfInfo.pid) {
|
|
|
+ // const pData = _.find(posData, { id: sfInfo.pid });
|
|
|
+ // replace_key_params['KEY_设计工程数量'] = pData.quantity;
|
|
|
+ // } else {
|
|
|
+ const lData = _.find(ledgerData, { id: sfInfo.lid });
|
|
|
+ // }
|
|
|
+ replace_key_params['KEY_子目号及子目名称'] = ledger_code + ' ' + lData.name;
|
|
|
replace_key_params['KEY_桩号及工程部位'] = pos_name;
|
|
|
- if (sfInfo.pid) {
|
|
|
- const pData = _.find(posData, { id: sfInfo.pid });
|
|
|
- replace_key_params['KEY_设计工程数量'] = pData.quantity;
|
|
|
- } else {
|
|
|
- const lData = _.find(ledgerData, { id: sfInfo.lid });
|
|
|
- replace_key_params['KEY_设计工程数量'] = lData.quantity;
|
|
|
- }
|
|
|
const req_params = {
|
|
|
rpt_tpl_id: 1784,
|
|
|
pageSize: 'A4',
|
|
@@ -4470,6 +4471,7 @@ function makeReportData(sfid) {
|
|
|
tender_id: tender.id,
|
|
|
stage_id: stage.id,
|
|
|
};
|
|
|
+ const rpt_name = tender.name + '-第' + stage.order + '期-' + (pos_name ? pos_name : ledger_code + '-' + lData.name);
|
|
|
const qrCodePath = sfInfo.qrcode;
|
|
|
- return [qrCodePath, replace_key_params, req_params];
|
|
|
+ return [qrCodePath, replace_key_params, req_params, rpt_name];
|
|
|
}
|