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

app/public/js/stage.js

@@ -3119,8 +3119,8 @@ $(document).ready(() => {
             $('#show-att tr').eq(0).children('td').text(att.filename + att.fileext);
             const name = att.code !== null && att.code !== '' ? att.code : (att.b_code !== null ? att.b_code : '');
             $('#show-att tr').eq(1).children('td').text($.trim(name + ' ' + att.lname));
-            // $('#show-att tr').eq(2).find('a').attr('href', '/tender/' + tender.id + '/measure/stage/' + stage.order + '/download/file/' + att.id);
-            $('#show-att tr').eq(2).find('a').attr('href', att.filepath);
+            $('#show-att tr').eq(2).find('a').attr('href', '/tender/' + tender.id + '/measure/stage/' + stage.order + '/download/file/' + att.id);
+            // $('#show-att tr').eq(2).find('a').attr('href', att.filepath);
             $('#show-att tr').eq(3).children('td').eq(0).text(att.username);
             $('#show-att tr').eq(3).children('td').eq(1).text(att.in_time);
             $('#show-att tr').eq(4).children('td').text(att.remark);
@@ -3244,9 +3244,11 @@ $(document).ready(() => {
         } else if (content === 'view') {
             const data = {id: fid};
             postData('/tender/' + tender.id + '/measure/stage/' + stage.order + '/check/file', data, function (result) {
-              const { filepath } = result
-              $('#show-att tr').eq(2).find('a').attr('href', filepath)
-              $('#show-att tr').eq(2).find('a').children('span').eq(0).trigger('click')
+                const { filepath } = result
+                $('#load-file').attr('href', filepath);
+                $('#load-file')[0].click();
+                // $('#show-att tr').eq(2).find('a').attr('href', filepath)
+              // $('#show-att tr').eq(2).find('a').children('span').eq(0).trigger('click')
             });
         } else if (content === 'location') {
             const att = attData.find(item => item.id === parseInt(fid));

app/view/ledger/bwtz.ejs

@@ -19,9 +19,12 @@
                         </div>
                     </div>
                 </div>
-                <div class="d-inline-block ml-3">
+                <div class="d-inline-block">
                     <a id="exportBwtz" class="btn btn-primary btn-sm" href="javascript: void(0)">导出部位台账Excel</a>
                 </div>
+                <div class="d-inline-block ml-2">
+                    <div class="alert alert-warning p-1"><i class="fa Example of exclamation-circle fa-exclamation-circle "></i> 台账分解与部位台账金额，会存在数学误差，属正常现象。软件以台账分解金额为准。</div>
+                </div>
             </div>
             <div class="ml-auto">
             </div>
@@ -125,4 +128,4 @@
     };
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
     const decimal = <%- ctx.tender.info.decimal.tp %>;
-</script>
+</script>

app/view/stage/bwtz.ejs

@@ -32,9 +32,12 @@
                         </div>
                     </div>
                 </div>
-                <div class="d-inline-block ml-3">
+                <div class="d-inline-block">
                     <a id="exportBwtz" class="btn btn-primary btn-sm" href="javascript: void(0)">导出部位台账Excel</a>
                 </div>
+                <div class="d-inline-block ml-2">
+                    <div class="alert alert-warning p-1"><i class="fa Example of exclamation-circle fa-exclamation-circle "></i> 计量台账与部位台账金额，会存在数学误差，属正常现象。软件以计量台账金额为准。</div>
+                </div>
             </div>
             <div class="ml-auto">
             </div>
@@ -195,4 +198,4 @@
     };
     const decimal = <%- ctx.tender.info.decimal.tp %>;
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
-</script>
+</script>

app/view/stage/index.ejs

@@ -295,6 +295,7 @@
                                 <br>
                                 <div class="tab-content" id="showAttachment" style="display: none" file-id="">
                                     <div class="sjs-bottom-2">
+                                        <a href="javascript:void(0);" target="_blank" style="display: none" id="load-file"></a>
                                         <div class="d-flex justify-content-end mb-1" id="btn-att">
                                             <a href="javascript:void(0);" content="location" class="btn btn-sm btn-outline-primary" style="margin-right: 5px">定位</a>
                                             <a href="javascript:void(0);" content="view" class="btn btn-sm btn-outline-primary" style="margin-right: 5px">查看</a>