电子签名审核意见

app/public/report/js/jpc_output.js

@@ -465,6 +465,13 @@ let JpcCanvasOutput = {
                     private_drawCell(cell, fonts, styles, controls, newPageMergeBand);
                 }
             }
+            //电子签名审核意见（跟普通格子输出一样）
+            if (page.signature_audit_cells && page.signature_audit_cells.length > 0) {
+                for (let k = 0; k < page.signature_audit_cells.length; k++) {
+                    let cell = page.signature_audit_cells[k];
+                    private_drawCell(cell, fonts, styles, controls, newPageMergeBand);
+                }
+            }
         }
     },
     drawPageBorder: function(rptTpl, canvas, resolution) {

app/public/report/js/rpt_jspdf.js

@@ -30,7 +30,7 @@ let JpcJsPDFHelper = {
         //
         // doc.save('Test.pdf');
     },
-    outputAsPdf: function (pageData, paperSize, pdfName, signatureRelArr) {
+    outputAsPdf: function (pageData, paperSize, pdfName, signatureRelArr, signAuditArr) {
         let me = this;
         let offsetX = 0;
         let offsetY = 0;
@@ -61,6 +61,7 @@ let JpcJsPDFHelper = {
         if (current_stage_status === 3) {
             rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr);
             // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr); // 这里merge的意义不大
+            rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr);
         }
         // let signatureCounter = {"allAmt": 0, "picAmt": 0};
         if (pageObj && pageObj.items.length > 0 ) {

app/public/report/js/rpt_main.js

@@ -301,6 +301,7 @@ let zTreeOprObj = {
                     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;
@@ -591,6 +592,7 @@ let rptControlObj = {
                             // if (current_stage_status === 3) {
                             //     rptSignatureHelper.mergeSignDate(pageData);
                             //     rptSignatureHelper.mergeSignature(pageData);
+                            //     rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT);
                             // }
                             // 备注：因多表的原因，无需merge电子签名，在下面处理
                             let singleSignatureRelArr = [];
@@ -602,7 +604,7 @@ let rptControlObj = {
                                 }
                             }
                             // JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[idx], signatureRelArr);
-                            JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[idx], singleSignatureRelArr); // 精确控制签名
+                            JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[idx], singleSignatureRelArr, STAGE_AUDIT); // 精确控制签名
                         }
                     },
                     function(failRst){

app/public/report/js/rpt_signature.js

@@ -237,8 +237,6 @@ let rptSignatureHelper = {
                             // elementsStrArr.push('<input id="' + idSuffixStr + '" class="datepicker-here form-control form-control-sm mt-0" placeholder="选择签名日期" data-language="zh" type="text" readonly="true"');
                             elementsStrArr.push('<input id="' + idSuffixStr + '" class="form-control form-control-sm mt-0" placeholder="选择签名日期" type="date"');
                         }
-                        elementsStrArr.push('</div>');
-
                         hasPic = true;
                         break;
                     }
@@ -367,6 +365,28 @@ let rptSignatureHelper = {
         ROLE_REL_LIST = JSON.parse(JSON.stringify(rptSignatureHelper.originalRoleRelList));
         zTreeOprObj.showPage(zTreeOprObj.currentPage, zTreeOprObj.canvas);
     },
+    resetSignAudit: function () {
+        rptSignatureHelper.mergeSignAudit(zTreeOprObj.currentRptPageRst, ROLE_REL_LIST, STAGE_AUDIT);
+        // for (const page of zTreeOprObj.currentRptPageRst.items) {
+        //     if (page.signature_audit_cells) {
+        //         for (const sCell of page.signature_audit_cells) {
+        //             sCell.Value = '同意';
+        //             for (let idx = 0; idx < ROLE_REL_LIST.length; idx++) {
+        //                 const role_rel = ROLE_REL_LIST[idx];
+        //                 if (sCell.signature_name === role_rel.signature_name + '_审核意见') {
+        //                     for (const audit_rel of STAGE_AUDIT) {
+        //                         if (role_rel.acc_id === audit_rel.aid) {
+        //                             sCell.Value = audit_rel.opinion;
+        //                             break;
+        //                         }
+        //                     }
+        //                     break;
+        //                 }
+        //             }
+        //         }
+        //     }
+        // }
+    },
     resetSignDate: function() {
         for (const page of zTreeOprObj.currentRptPageRst.items) {
             if (page.signature_date_cells) {
@@ -399,30 +419,6 @@ let rptSignatureHelper = {
                 }
             }
         }
-
-    },
-    resetSignAudit: function () {
-        for (const page of zTreeOprObj.currentRptPageRst.items) {
-            if (page.signature_audit_cells) {
-                for (const sCell of page.signature_audit_cells) {
-                    sCell.Value = '';
-                    for (let idx = 0; idx < ROLE_REL_LIST.length; idx++) {
-                        const role_rel = ROLE_REL_LIST[idx];
-                        const idSuffixStr = 'dtp_' + role_rel.signature_name;
-                        let dtDom = $('#' + idSuffixStr);
-                        if (dtDom.length === 1) {
-                            const dtStr = dtDom[0].value;
-                            // 要处理相关签名Cell属性（默认跟普通cell一样，就多了个signature_name）
-                            if (sCell.signature_name === role_rel.signature_name + '_审核意见') {
-                                if (role_rel.sign_date !== '') {
-                                    sCell.Value = role_rel.sign_date.Format(role_rel.sign_date_format);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
     },
     setupAfterSelectSignature: function () {
         //0. 签名日期
@@ -558,6 +554,26 @@ let rptSignatureHelper = {
             }
         }
     },
+    mergeSignAudit: function (pageData, currRoleRelList, currAuditList) {
+        for (const page of pageData.items) {
+            if (page.signature_audit_cells) {
+                for (const sCell of page.signature_audit_cells) {
+                    sCell.Value = '同意'; //默认的
+                    for (const role_rel of currRoleRelList) {
+                        if (sCell.signature_name === role_rel.signature_name + '_审核意见') {
+                            for (const audit_rel of currAuditList) {
+                                if (role_rel.acc_id === audit_rel.aid) {
+                                    sCell.Value = audit_rel.opinion;
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    },
     mergeSignDate: function (pageData, currRoleRelList) {
         if (currRoleRelList && currRoleRelList.length > 0 && STAGE_AUDIT && STAGE_AUDIT.length > 0) {
             for (let rridx = 0; rridx < currRoleRelList.length; rridx++) {

app/reports/rpt_component/helper/jpc_helper_discrete.js

@@ -51,7 +51,7 @@ const JpcDiscreteHelper = {
                                     const param = JE.P(pID, $CURRENT_RPT);
                                     // const signatureDateItem = JpcCommonOutputHelper.createCommonOutputWithoutDecorate(df, param[JV.PROP_DFT_VALUE], true);
                                     const signatureDateItem = JpcCommonOutputHelper.createCommonOutputWithoutDecorate(df, df[JV.PROP_DFT_VALUE], true);
-                                    // console.log('param :');
+                                    // console.log('Date param :');
                                     // console.log(param);
                                     signatureDateItem.signature_name = param[JV.PROP_NAME];
                                     signatureDateItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(df[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, 1, 0, false, false);
@@ -67,6 +67,8 @@ const JpcDiscreteHelper = {
                                     }
                                     const param = JE.P(pID, $CURRENT_RPT);
                                     const signatureAuditItem = JpcCommonOutputHelper.createCommonOutputWithoutDecorate(df, df[JV.PROP_DFT_VALUE], true);
+                                    // console.log('Aidit param :');
+                                    // console.log(param);
                                     signatureAuditItem.signature_name = param[JV.PROP_NAME];
                                     signatureAuditItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(df[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, 1, 0, false, false);
                                     signatureAuditRst.push(signatureAuditItem);

app/reports/rpt_component/jpc_ex.js

@@ -162,6 +162,8 @@ JpcExSrv.prototype.createNew = function() {
         me.runTimePageData = {};
         me.fields = JpcField.createNew(rptTpl);
         me.params = JpcParam.createNew(rptTpl);
+        // console.log('params:');
+        // console.log(me.params);
         me.formulas = JpcFunc.createNew(rptTpl);
         me.events = JpcEvent.createNew(rptTpl);
     };

app/reports/rpt_component/jpc_param.js

@@ -5,6 +5,7 @@ const JpcParam = {
     createNew: function(rptTpl) {
         const JpcParamResult = {};
         JpcParamResult[JV.NODE_DYNAMIC_DATE_PARAMS] = {};
+        JpcParamResult[JV.NODE_SIGNATURE_AUDIT_FIELDS] = {};
         const me = this;
         if (rptTpl[JV.NODE_DISCRETE_PARAMS]) {
             for (let i = 0; i < rptTpl[JV.NODE_DISCRETE_PARAMS].length; i++) {

app/reports/rpt_component/jpc_rte.js

@@ -36,6 +36,8 @@ const JE = {
             rst = $CURRENT_RPT.params[JV.PROP_ID + '_' + pID];
         } else if ($CURRENT_RPT && $CURRENT_RPT.params[JV.NODE_DYNAMIC_DATE_PARAMS] && $CURRENT_RPT.params[JV.NODE_DYNAMIC_DATE_PARAMS][JV.PROP_ID + '_' + pID]) {
             rst = $CURRENT_RPT.params[JV.NODE_DYNAMIC_DATE_PARAMS][JV.PROP_ID + '_' + pID];
+        } else if ($CURRENT_RPT && $CURRENT_RPT.params[JV.NODE_SIGNATURE_AUDIT_FIELDS] && $CURRENT_RPT.params[JV.NODE_SIGNATURE_AUDIT_FIELDS][JV.PROP_ID + '_' + pID]) {
+            rst = $CURRENT_RPT.params[JV.NODE_SIGNATURE_AUDIT_FIELDS][JV.PROP_ID + '_' + pID];
         } else {
             rst = { msg: 'the Param-ID is not valid, no result was found!' };
         }