跨标段电子签名bug(签名日期有丢失情况)

app/public/report/js/rpt_signature.js

@@ -227,7 +227,7 @@ let rptSignatureHelper = {
                                 //角色
                                 rptSignatureHelper.pushDomElementByRole(elementsStrArr, role_rel.role_name, role_rel.user_name);
                             }
-                            const idSuffixStr = 'dtp_' + role_rel.signature_name;
+                            const idSuffixStr = 'dtp_' + role_rel.signature_name + '_' + signatureDivId;
                             elementsStrArr.push('<div class="">');
                             if (role_rel.sign_date !== '') {
                                 const dt = new Date(role_rel.sign_date);
@@ -379,14 +379,14 @@ let rptSignatureHelper = {
     resetSignAudit: function () {
         rptSignatureHelper.mergeSignAudit(zTreeOprObj.currentRptPageRst, ROLE_REL_LIST, STAGE_AUDIT);
     },
-    resetSignDate: function() {
+    resetSignDate: function(signatureDivId) {
         for (const page of zTreeOprObj.currentRptPageRst.items) {
             if (page.signature_date_cells) {
                 for (const sCell of page.signature_date_cells) {
                     sCell.Value = _getSignDateDftName();
                     for (let idx = 0; idx < ROLE_REL_LIST.length; idx++) {
                         const role_rel = ROLE_REL_LIST[idx];
-                        const idSuffixStr = 'dtp_' + role_rel.signature_name;
+                        const idSuffixStr = 'dtp_' + role_rel.signature_name + '_' + signatureDivId;
                         let dtDom = $('#' + idSuffixStr);
                         if (dtDom.length === 1) {
                             const dtStr = dtDom[0].value;
@@ -407,10 +407,10 @@ let rptSignatureHelper = {
             }
         }
     },
-    setupAfterSelectMultiTenders: function (selectedTenders) {
+    setupAfterSelectMultiTenders: function (selectedTenders, signatureDivId) {
         //跨标段选择，有不少要注意的交互：
         //0. 签名日期
-        rptSignatureHelper.resetSignDate();
+        rptSignatureHelper.resetSignDate(signatureDivId);
         rptSignatureHelper.resetSignAudit();
         //1. 重刷page
         if (current_stage_status === 3) {
@@ -448,9 +448,9 @@ let rptSignatureHelper = {
             }
         );
     },
-    setupAfterSelectSignature: function () {
+    setupAfterSelectSignature: function (signatureDivId) {
         //0. 签名日期
-        rptSignatureHelper.resetSignDate();
+        rptSignatureHelper.resetSignDate(signatureDivId);
         rptSignatureHelper.resetSignAudit();
         if (current_stage_status === 3) {
             //1. 重刷page

app/reports/rpt_component/jpc_cross_tab.js

@@ -303,8 +303,8 @@ JpcCrossTabSrv.prototype.createNew = function() {
                 }
             }
         }
-        console.log('me.row_sum_fields_value_total');
-        console.log(me.row_sum_fields_value_total);
+        // console.log('me.row_sum_fields_value_total');
+        // console.log(me.row_sum_fields_value_total);
     };
     JpcCrossTabResult.preSetupPages = function(rptTpl, defProperties, option) {
         const me = this;

app/view/report/rpt_all_popup.ejs

@@ -210,7 +210,7 @@
                 <button type="button" class="btn btn-sm btn-link float-left" data-dismiss="modal" onclick="setTimeout(function(){$('#hidden_show_batch_eSignature').trigger('click');}, 50);">批量设置其他标段</button>
                 -->
                 <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="rptSignatureHelper.removeSelectSignature()">取消</button>
-                <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectSignature()" class="btn btn-primary btn-sm" data-dismiss="modal">确定</a>
+                <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectSignature('eSignatureBodyDiv')" class="btn btn-primary btn-sm" data-dismiss="modal">确定</a>
             </div>
         </div>
     </div>
@@ -238,7 +238,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectMultiTenders(SELECTED_TENDERS)" class="btn btn-sm btn-primary" data-dismiss="modal">确定</a>
+                <a href="javascript:void(0);" onclick="rptSignatureHelper.setupAfterSelectMultiTenders(SELECTED_TENDERS, 'batch-eSignatureBodyDiv')" class="btn btn-sm btn-primary" data-dismiss="modal">确定</a>
             </div>
         </div>
     </div>