Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/controller/report_controller.js

@@ -306,6 +306,7 @@ module.exports = app => {
             const params = JSON.parse(ctx.request.body.params);
             await this._saveCustomSelects(params);
             const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
+            const stgAudit = await ctx.service.stageAudit.getStageAudit(params.stage_id, params.stage_times);
             const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_ids, params.stage_id)) : [];
             // const roleRel = (params.stage_status === 3) ? (await ctx.service.roleRptRel.getRoleRptRelByDetailIds(params.tender_id, params.rpt_tpl_id)) : [];
             roleRel.sort(function(rr1, rr2) {
@@ -318,7 +319,7 @@ module.exports = app => {
                 await encodeDummySignatureDataUri(pageRst, this.app.baseDir);
             }
             // console.log(pageRstArr);
-            ctx.body = { data: pageRstArr, signatureRelInfo: roleRel };
+            ctx.body = { data: pageRstArr, signatureRelInfo: roleRel, stageAudit: stgAudit };
             ctx.status = 201;
         }
 

app/public/report/js/rpt_print.js

@@ -28,9 +28,29 @@ let rptPrintHelper = {
                             }
                         }
                         // rptSignatureHelper.mergeSignature(result.data[idx], ROLE_REL_LIST);
+                        // let pageRst = result.data;
+                        // STAGE_AUDIT = result.stageAudit;
+                        // STAGE_AUDIT_ORG = result.stageAuditOrg;
+                        // STAGE_FLOW = result.stageFlow;
+                        // //stageAuditOrg
+                        // if (result.signatureRelInfo && result.signatureRelInfo.length > 0) {
+                        //     CURRENT_ROLE_REL_ID = result.signatureRelInfo[0].id;
+                        //     ROLE_REL_LIST = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
+                        //     rptSignatureHelper.originalRoleRelList = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
+                        //     if (current_stage_status === 3) {
+                        //         rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST);
+                        //         rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST);
+                        //         rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT);
+                        //     }
+                        // } else {
+                        //     CURRENT_ROLE_REL_ID = -1;
+                        //     ROLE_REL_LIST = [];
+                        // }
+
                         if (current_stage_status === 3) {
                             rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr);
                             rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr);
+                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit);
                         }
                     }
                     sessionStorage.multiRptsData = JSON.stringify(result.data);
@@ -100,6 +120,11 @@ let rptPrintHelper = {
                 svgPageArr.push(buildCellSvg(cell, fonts, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
                     offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
             }
+            // 计量有电子签名审核意见，在处理上与cells一样
+            for (let cell of page.signature_audit_cells) {
+                svgPageArr.push(buildCellSvg(cell, fonts, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
+                    offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
+            }
             svgPageArr.push("</svg>");
             rst.push(svgPageArr);
         }

app/view/change/info_modal.ejs

@@ -707,7 +707,7 @@
                                                     <div class="alert alert-warning">
                                                         <div class="form-check form-check-inline">
                                                             <input class="form-check-input" type="radio" name="status" id="change-back" value="5" <% if (a.usite === 1) { %>checked<% } %>>
-                                                            <label class="form-check-label" for="change-back">退回上报 <%= auditList3[0].name %></label>
+                                                            <label class="form-check-label" for="change-back">退回原报 <%= auditList3[0].name %></label>
                                                         </div>
                                                         <% if (a.usite !== 1) { %>
                                                             <div class="form-check form-check-inline">

app/view/ledger/audit_modal.ejs

@@ -261,7 +261,7 @@
                                                     <label>审批意见<b class="text-danger">*</b></label>
                                                     <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                                 </div>
-                                                <div class="alert alert-warning">审批退回，将直接退回给上报人。</div>
+                                                <div class="alert alert-warning">审批退回，将直接退回给原报人。</div>
                                             <% } %>
                                         </li>
                                     <% } %>

app/view/material/audit_modal.ejs

@@ -319,7 +319,7 @@
                                         <label>审批意见<b class="text-danger">*</b></label>
                                         <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                     </div>
-                                    <div class="alert alert-warning">审批退回，将直接退回给上报人。</div>
+                                    <div class="alert alert-warning">审批退回，将直接退回给原报人。</div>
                                     <% } %>
                                 </li>
                                 <% } %>

app/view/revise/info_modal.ejs

@@ -419,7 +419,7 @@
                                                 <label>审批意见<b class="text-danger">*</b></label>
                                                 <textarea class="form-control form-control-sm" name="opinion">不同意</textarea>
                                             </div>
-                                            <div class="alert alert-warning">审批退回，将直接退回给上报人。</div>
+                                            <div class="alert alert-warning">审批退回，将直接退回给原报人。</div>
                                         <% } else { %>
                                             <h5 class="card-title">
                                                 <i class="<%- (i < iLen - 1 ? 'fa fa-chevron-circle-down' : 'fa fa-stop-circle') %>"></i> <%- auditors[i].name %> <small class="text-muted"><%- auditors[i].role %></small><span class="pull-right"><%= i < iLen - 1 ? ctx.helper.transFormToChinese(i+1) : '终' %>审</span>

app/view/stage/audit_modal.ejs

@@ -383,7 +383,7 @@
                                                     <div class="alert alert-warning">
                                                         <div class="form-check form-check-inline">
                                                             <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>" <% if (auditors[iA].order === 1 || auditors[iA].aid === auditors[0].aid) { %>checked<% } %>>
-                                                            <label class="form-check-label" for="inlineRadio1">退回上报 <%- ctx.stage.user.name %></label>
+                                                            <label class="form-check-label" for="inlineRadio1">退回原报 <%- ctx.stage.user.name %></label>
                                                         </div>
                                                         <% if (auditors[iA].order > 1 && auditors[iA].aid !== auditors[0].aid) { %>
                                                             <% const auditorIndex = ctx.stage.auditors2.findIndex(function (item) { return item.aid === auditors[iA].aid }) %>
@@ -1404,7 +1404,7 @@
                                                     <div class="alert alert-warning">
                                                         <div class="form-check form-check-inline">
                                                             <input class="form-check-input" type="radio" name="checkType" id="inlineRadio1" value="<%- auditConst.status.checkNo %>" <% if (auditors[iA].order === 1 || auditors[iA].aid === auditors[0].aid) { %>checked<% } %>>
-                                                            <label class="form-check-label" for="inlineRadio1">退回上报 <%- ctx.stage.user.name %></label>
+                                                            <label class="form-check-label" for="inlineRadio1">退回原报 <%- ctx.stage.user.name %></label>
                                                         </div>
                                                         <% if (auditors[iA].order > 1 && auditors[iA].aid !== auditors[0].aid) { %>
                                                             <% const auditorIndex = ctx.stage.auditors2.findIndex(function (item) { return item.aid === auditors[iA].aid }) %>
@@ -1553,4 +1553,4 @@
         $('#hide-all').hide();
         return false;
     });
-</script>
+</script>