|
@@ -467,8 +467,10 @@ module.exports = app => {
|
|
|
}
|
|
|
// console.log('roleRel.rel_content: ' + roleRel.rel_content);
|
|
|
// fsUtil.writeObjToFile(pageRstArr, 'D:/GitHome/temp/testBuiltPageResult.jsp');
|
|
|
- mergeSignAudit(pageRstArr[idx], roleRel, stgAudit);
|
|
|
- mergeSignDate(pageRstArr[idx], params.stage_id, roleRel, stgAudit, stgAuditForOrg, stageList);
|
|
|
+ if (params.stage_status === 3) {
|
|
|
+ mergeSignAudit(pageRstArr[idx], roleRel, stgAudit);
|
|
|
+ mergeSignDate(pageRstArr[idx], params.stage_id, roleRel, stgAudit, stgAuditForOrg, stageList);
|
|
|
+ }
|
|
|
runnableRst.push(getExcelByPageData(pageRstArr[idx], params.rpt_names[idx], roleRel));
|
|
|
}
|
|
|
// fsUtil.writeObjToFile(pageRstArr, 'D:/GitHome/temp/计量导出pageArr.js');
|
|
@@ -539,8 +541,10 @@ module.exports = app => {
|
|
|
for (const roleR of roleRelArr) {
|
|
|
if (roleR.rpt_id === params.rpt_ids[idx]) {
|
|
|
roleRel = JSON.parse(roleR.rel_content);
|
|
|
- mergeSignAudit(pageRstArr[idx], roleRel, stgAudit);
|
|
|
- mergeSignDate(pageRstArr[idx], params.stage_id, roleRel, stgAudit, stgAuditForOrg, stageList);
|
|
|
+ if (params.stage_status === 3) {
|
|
|
+ mergeSignAudit(pageRstArr[idx], roleRel, stgAudit);
|
|
|
+ mergeSignDate(pageRstArr[idx], params.stage_id, roleRel, stgAudit, stgAuditForOrg, stageList);
|
|
|
+ }
|
|
|
// 这里要做些电子签名的signature_name转换,以防重名
|
|
|
reAssignSignatureName(pageRstArr[idx], roleRel, params.rpt_names[idx]);
|
|
|
rptRoleRelArr = rptRoleRelArr.concat(roleRel);
|