laiguoran hace 2 años
padre
commit
00d7de348e

+ 3 - 3
app/service/payment_detail.js

@@ -117,9 +117,9 @@ module.exports = app => {
             const signCells = this._.find(report_json.items[0].signature_cells, { signature_name });
             if (signCells && (sign_msg.sign_path || sign_msg.company_stamp || sign_msg.stamp_path)) {
                 const signArray = [];
-                if (sign_msg.sign_path) signArray.push('/public/upload/sign/' + 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);
+                sign_msg.sign_path ? signArray.push('/public/upload/sign/' + sign_msg.sign_path) : signArray.push('');
+                sign_msg.company_stamp ? signArray.push(sign_msg.company_stamp) : signArray.push('');
+                sign_msg.stamp_path ? signArray.push(sign_msg.stamp_path) : signArray.push('');
                 signCells.path = signArray.join('!;!');
             }
             // 日期

+ 6 - 3
app/view/payment/detail.ejs

@@ -68,8 +68,11 @@
     const tenderId = parseInt('<%- ctx.tender.id %>');
     const detailId = parseInt('<%- ctx.detail.id %>');
     const rptAudit = JSON.parse(unescape('<%- escape(JSON.stringify(rptAudit)) %>'));
-    console.log(rptAudit);
-    <% if (ctx.detail.status !== auditConst.status.checked && rptAudit) { %>
+    <% if (rptAudit &&
+            ((ctx.detail.status !== auditConst.status.checkNo && ctx.detail.status !== auditConst.status.checked) ||
+                    (ctx.detail.status === auditConst.status.checked && !nextDetail) ||
+                    (ctx.detail.status === auditConst.status.checkNo && ctx.detail.uid === ctx.session.sessionUser.accountId))
+    ) { %>
     let currentStamp = JSON.parse(unescape('<%- escape(JSON.stringify(currentStamp)) %>'));
     <% } %>
     let tesRpttData = JSON.parse(unescape('<%- escape(JSON.stringify(report_json)) %>'));
@@ -192,7 +195,7 @@
             sessionStorage.OSS_PATH = OSS_PATH;
             window.open('/printReport/A4');
         },
-        
+
         _getPdfFontCallback: function(fontProperty) {
             let me = auditRptPrintHelper;
             if (rptTplObj.pdfFont['SmartSimsun'].indexOf(fontProperty) < 0) {

+ 1 - 1
app/view/payment/detail_modal.ejs

@@ -28,7 +28,7 @@
                                         <input class="form-check-input" type="checkbox" id="company_stamp" value="<%- companyStamp %>" <% if (rptAudit.signature_msg.company_stamp !== null) { %>checked<% } %>>
                                         <label class="form-check-label" for="company_stamp">单位章</label>
                                     </div>
-                                    <% if (stampPathList.length>1) { %>
+                                    <% if (stampPathList.length > 0) { %>
                                     <div class="form-check form-check-inline">
                                         <input class="form-check-input" type="checkbox" id="stamp_path" value="<%- currentStamp %>" <% if (rptAudit.signature_msg.stamp_path !== null) { %>checked<% } %>>
                                         <label class="form-check-label" for="stamp_path">个人章</label>