|
@@ -1009,7 +1009,7 @@ let rptControlObj = {
|
|
|
}
|
|
|
delete params.orientation; // 打印时有勾选的话,不需要提供方向
|
|
|
$.bootstrapLoading.start();
|
|
|
- if (COMMON_WATER_MARK_PIC_DATA === null || COMMON_WATER_MARK_PIC_DATA === '') {
|
|
|
+ if ((COMMON_WATER_MARK_PIC_DATA === null || COMMON_WATER_MARK_PIC_DATA === '') && CUST_CFG.closeWarterMark === false) {
|
|
|
params.needWaterMark = true;
|
|
|
} else {
|
|
|
params.needWaterMark = false;
|
|
@@ -1038,6 +1038,11 @@ let rptControlObj = {
|
|
|
// 统一安排merge(除草图外)
|
|
|
for (let idx = 0; idx < pageDataArr.length; idx++) {
|
|
|
const pageObj = pageDataArr[idx];
|
|
|
+ if (CUST_CFG.closeWarterMark) {
|
|
|
+ pageObj.items.forEach(page => {
|
|
|
+ page.watermark_cells = [];
|
|
|
+ });
|
|
|
+ }
|
|
|
let singleSignatureRelArr = signatureRelArr[idx];
|
|
|
if (signatureRelInfo && signatureRelInfo.length > 0) {
|
|
|
resetStampSignature(pageObj, singleSignatureRelArr, getStageStatus() !== 3, STAGE_AUDIT, LEDGER_LIST);
|