|
|
@@ -275,13 +275,14 @@ module.exports = app => {
|
|
|
const sign_msg = JSON.parse(rptAudit.signature_msg);
|
|
|
// 签名签章
|
|
|
const signCells = ctx.helper._.find(report_json.items[0].signature_cells, { signature_name: rptAudit.signature_name });
|
|
|
- if (signCells && signCells.Value === '' && (sign_msg.sign_path || sign_msg.company_stamp || sign_msg.stamp_path)) {
|
|
|
+ if (signCells && signCells.path === null && (sign_msg.sign_path || sign_msg.company_stamp || sign_msg.stamp_path)) {
|
|
|
const signArray = [];
|
|
|
if (sign_msg.sign_path) signArray.push(sign_msg.sign_path);
|
|
|
if (sign_msg.company_stamp) signArray.push(sign_msg.company_stamp);
|
|
|
if (sign_msg.stamp_path) signArray.push(sign_msg.stamp_path);
|
|
|
signCells.path = signArray.join('!;!');
|
|
|
}
|
|
|
+ console.log(signCells);
|
|
|
// 日期
|
|
|
const dateCells = ctx.helper._.find(report_json.items[0].signature_date_cells, { signature_name: rptAudit.signature_name + '_签字日期' });
|
|
|
if (dateCells && dateCells.Value === '' && sign_msg.date) {
|
