code sync

app/public/report/js/rpt_signature.js

@@ -368,38 +368,6 @@ let rptSignatureHelper = {
         zTreeOprObj.showPage(zTreeOprObj.currentPage, zTreeOprObj.canvas);
     },
     resetSignDate: function() {
-        // 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;
-        //         if (dtStr && dtStr !== '' && dtStr.length >= 8 && dtStr.length <= 10) {
-        //             // const tmpDt = new Date(dtStr);
-        //             // const year = parseInt(tmpDt.getFullYear());
-        //             // const month = parseInt(tmpDt.getMonth());
-        //             // const dt = parseInt(tmpDt.getDate());
-        //             // role_rel.sign_date = new Date(year, month, dt);
-        //             role_rel.sign_date = new Date(dtStr);
-        //         } else {
-        //             role_rel.sign_date = '';
-        //         }
-        //         // 要处理相关签名Cell属性（默认跟普通cell一样，就多了个signature_name）
-        //         for (const page of zTreeOprObj.currentRptPageRst.items) {
-        //             if (page.signature_date_cells) {
-        //                 for (const sCell of page.signature_date_cells) {
-        //                     sCell.Value = _getSignDateDftName();
-        //                     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);
-        //                         } else {
-        //                         }
-        //                     }
-        //                 }
-        //             }
-        //         }
-        //     }
-        // }
         for (const page of zTreeOprObj.currentRptPageRst.items) {
             if (page.signature_date_cells) {
                 for (const sCell of page.signature_date_cells) {
@@ -433,9 +401,33 @@ 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. 签名日期
         rptSignatureHelper.resetSignDate();
+        rptSignatureHelper.resetSignAudit();
         if (current_stage_status === 3) {
             //1. 重刷page
             for (const page of zTreeOprObj.currentRptPageRst.items) {

app/reports/rpt_component/jpc_ex.js

@@ -286,6 +286,7 @@ JpcExSrv.prototype.createNew = function() {
             }
             rstPage[JV.PROP_SIGNATURE_CELLS] = [];
             rstPage[JV.PROP_SIGNATURE_DATE_CELLS] = [];
+            rstPage[JV.PROP_SIGNATURE_AUDIT_CELLS] = [];
             rst.items.push(rstPage);
             // 2.
             if (bands[JV.BAND_PROP_MERGE_BAND]) {
@@ -372,6 +373,7 @@ JpcExSrv.prototype.createNew = function() {
                     rst[JV.PROP_CELLS] = me.flowTab.outputAsSimpleJSONPage(rptTpl, dataObj, page, bands, controls, adHocMergePos, me, customizeCfg);
                     rst[JV.PROP_SIGNATURE_CELLS] = me.flowTab.signatureRst;
                     rst[JV.PROP_SIGNATURE_DATE_CELLS] = me.flowTab.signatureDateRst;
+                    rst[JV.PROP_SIGNATURE_AUDIT_CELLS] = me.flowTab.signatureAuditRst;
                     if (adHocMergePos) {
                         adHocMergePos[JV.NODE_PAGE_SIZE] = JpcCommonHelper.getPageSize(rptTpl);
                         rst[JV.PAGE_SPECIAL_MERGE_POS] = adHocMergePos;
@@ -382,16 +384,19 @@ JpcExSrv.prototype.createNew = function() {
                         rst[JV.PROP_CELLS] = me.flowTabEx.outputAsSimpleJSONPage(rptTpl, dataObj, page - (me.totalPages - me.exTotalPages), bands, controls, adHocMergePos, me, customizeCfg);
                         rst[JV.PROP_SIGNATURE_CELLS] = me.flowTabEx.signatureRst;
                         rst[JV.PROP_SIGNATURE_DATE_CELLS] = me.flowTabEx.signatureDateRst;
+                        rst[JV.PROP_SIGNATURE_AUDIT_CELLS] = me.flowTabEx.signatureAuditRst;
                     }
                 }
             } else if (me.crossTab) {
                 rst[JV.PROP_CELLS] = me.crossTab.outputAsSimpleJSONPage(rptTpl, dataObj, page, bands, controls, me, customizeCfg);
                 rst[JV.PROP_SIGNATURE_CELLS] = me.crossTab.signatureRst;
                 rst[JV.PROP_SIGNATURE_DATE_CELLS] = me.crossTab.signatureDateRst;
+                rst[JV.PROP_SIGNATURE_AUDIT_CELLS] = me.crossTab.signatureAuditRst;
             } else if (me.billTab) {
                 rst[JV.PROP_CELLS] = me.billTab.outputAsSimpleJSONPage(rptTpl, dataObj, page, bands, controls, me, customizeCfg);
                 rst[JV.PROP_SIGNATURE_CELLS] = me.billTab.signatureRst;
                 rst[JV.PROP_SIGNATURE_DATE_CELLS] = me.billTab.signatureDateRst;
+                rst[JV.PROP_SIGNATURE_AUDIT_CELLS] = me.billTab.signatureAuditRst;
             }
             if (!(me.flowTab && me.flowTab.paging_option === JV.PAGING_OPTION_INFINITY)) {
                 const pageMergeBorder = getPageMergeBorder();

app/reports/rpt_component/jpc_value_define.js

@@ -311,6 +311,7 @@ module.exports = {
     PROP_CELLS: 'cells',
     PROP_SIGNATURE_CELLS: 'signature_cells',
     PROP_SIGNATURE_DATE_CELLS: 'signature_date_cells',
+    PROP_SIGNATURE_AUDIT_CELLS: 'signature_audit_cells',
 
     PAGING_OPTION_NORMAL: 'normal',
     PAGING_OPTION_INFINITY: 'infinity',