ソースを参照

电子签名bug修正

laiguoran 3 年 前
コミット
aa1ab664e6

+ 3 - 0
app/public/report/js/rpt_archive.js

@@ -128,6 +128,7 @@ let rptArchiveObj = {
             try {
                 if (can_netcasign) {
                     const msgSign = _.find(ARCHIVE_ENCRYPTION_LIST, {rpt_id: me.currentNode.ID});
+                    console.log(msgSign);
                     me.currentEncryptionList = msgSign;
                     const uSignLogList = _.filter(signLogList, { uuid: me.currentArchiveUuid });
                     let html = '';
@@ -151,6 +152,7 @@ let rptArchiveObj = {
                             pagetr += '<tr><td>页'+ i +'</td><td>'+ me.currentNode.name +'</td><td>'+ uhtml +'</td></tr>';
                         }
                     }
+                    $('#dateStr').html(me.currentArchiveDateStr);
                     $('#role-list').html(html);
                     $('#page-list').html(pagetr);
                     $('#sign_num').text(uSignLogList.length);
@@ -251,6 +253,7 @@ let rptArchiveObj = {
             me.currentArchivePdfPath = uSignLogList.length > 0 ? oss_path + '/sign/'+ me.currentArchiveUuid +'.PDF' : oss_path + '/'+ me.currentArchiveUuid +'.PDF';
             $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + me.currentArchivePdfPath + (uSignLogList.length !== 0 ? '?' + uSignLogList[uSignLogList.length-1].versionid : '') + '" height="750px" width="100%" style="border: none;"></iframe>');
         }
+        $('#dateStr').html(me.currentArchiveDateStr);
         $('#sign_num').text(uSignLogList.length);
         const uHadSign = _.filter(uSignLogList, { uid: USER_ID});
         // 是否显示撤销按钮

+ 1 - 1
app/public/report/js/rpt_cfg_const.js

@@ -37,7 +37,7 @@ const rpt_prj_folder_setting = {
         selectedMulti: false
     },
     check: {
-        enable: true
+        enable: false
     },
     data: {
         keep: {

+ 3 - 2
app/view/profile/netcasign.ejs

@@ -11,7 +11,7 @@
                 <% if (ctx.session.sessionProject.page_show.openNetCaSign) { %>
                 <nav class="nav nav-tabs m-3" role="tablist">
                     <a class="nav-item nav-link active" href="/profile/sign/netca">Ukey认证签名</a>
-                    <a class="nav-item nav-link" href="/profile/sign">签字设置</a>
+                    <!--<a class="nav-item nav-link" href="/profile/sign">签字设置</a>-->
                 </nav>
                 <% } %>
                 <div class="row m-0">
@@ -21,7 +21,8 @@
                                 <label>网证通UKey</label>
                                 <div>
                                     <button class="btn btn-sm btn-outline-primary" id="getCert">获取证书信息</button>
-                                    <small class="form-text text-danger">请先插入网证通UKey获取证书信息再绑定</small>
+                                    <!--<small class="form-text text-danger">请先插入网证通UKey获取证书信息再绑定</small>-->
+                                    <small class="form-text text-danger">&nbsp;</small>
                                     <textarea id="DeviceOutputId" readonly class="form-control mt-1 mb-1" rows="3"></textarea>
                                     <input type="hidden" id="name" />
                                     <input type="hidden" id="keyId" />

+ 28 - 0
app/view/report/index_sign.ejs

@@ -120,9 +120,11 @@
             autoFlashHeight();
         }
     });
+    // $('iframe').css('pointerEvents', 'none');
     $.divResizer({
         select: '#right-spr',
         callback: function () {
+            // $('iframe').css('pointerEvents', 'auto');
             autoFlashHeight();
         }
     });
@@ -340,6 +342,32 @@
         return retSignValue;
     }
     $(function () {
+
+        //阻止事件冒泡
+        //不仅仅要stopPropagation,还要preventDefault
+        function pauseEvent(e){
+            if(e.stopPropagation) e.stopPropagation();
+            if(e.preventDefault) e.preventDefault();
+            e.cancelBubble=true;
+            e.returnValue=false;
+            return false;
+        }
+        let pe = 0;
+        $('#right-spr').mousedown(function (ev) {
+            $('iframe').css('pointerEvents', 'none');
+            let e = ev||event;
+            pauseEvent(e);
+            pe = 1;
+        });
+        $(document).mouseup(function (ev) {
+            if(pe) {
+                $('iframe').css('pointerEvents', 'auto');
+                pe = 0;
+                let e = ev||event;
+                pauseEvent(e);
+            }
+        });
+
         // 多层modal关闭后的滚动bug修复
         $('#add-sign').on('hidden.bs.modal', function (e) {
             $(document.body).addClass('modal-open');

+ 1 - 1
app/view/report/index_sign_modal.ejs

@@ -9,7 +9,7 @@
                 </button>
             </div>
             <div class="modal-body">
-                <p>当前使用 #3 2021-03-02 归档报表进行签名,签名后其余归档仅能查看。</p>
+                <p>当前使用 <span id="dateStr"></span> 归档报表进行签名,签名后其余归档仅能查看。</p>
                 <div class="card mb-3">
                     <div class="card-header">选择签名位置</div>
                     <div class="card-body py-3">