Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/report/js/rpt_archive.js

@@ -213,7 +213,8 @@ let rptArchiveObj = {
                 $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + me.currentArchivePdfPath + '" height="750px" width="100%" style="border: none;"></iframe>');
                 me._buildeArchiveDateSelect();
             });
-            me._updateSignHtmlAndFrame();
+            // me._updateSignHtmlAndFrame();
+            me._requestArchiveReport();
         } else {
             me.currentArchivePdfPath = oss_path + '/'+ me.currentArchiveUuid +'.PDF?' + new Date(me.currentArchiveDateStr.slice(3).replace(/-/g, '/')).getTime();
             $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + me.currentArchivePdfPath + '" height="750px" width="100%" style="border: none;"></iframe>');
@@ -254,7 +255,10 @@ let rptArchiveObj = {
         }
         let uhtml = '';
         let pagetr = '';
-        const msgSign = _.find(ARCHIVE_ENCRYPTION_LIST, {rpt_id: me.currentNode.ID});
+        let msgSign = _.find(ARCHIVE_ENCRYPTION_LIST, {rpt_id: me.currentNode.ID, uuid: me.currentArchiveUuid});
+        if (!msgSign) {
+            msgSign = _.find(ARCHIVE_ENCRYPTION_LIST, {rpt_id: me.currentNode.ID});
+        }
         for (const us of uSignLogList) {
             uhtml += '<span class="text-success"><i class="fa fa-check"></i> '+ us.role +'（'+ us.name +'）</span>';
         }