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

app/const/deal_pay.js

@@ -32,9 +32,9 @@ const calcBase = [
     {name: '本期完成计量', code: 'bqwc', limit: true, sort: 10},
     {name: '本期合同计量', code: 'bqht', limit: true, sort: 10},
     {name: '本期变更计量', code: 'bqbg', limit: true, sort: 10},
-    {name: '本期一般变更计量', code: 'ybbqbg', limit: true, sort: 15},
-    {name: '本期较大变更计量', code: 'jdbqbg', limit: true, sort: 15},
-    {name: '本期重大变更计量', code: 'zdbqbg', limit: true, sort: 15},
+    {name: '本期一般变更计量', code: 'ybbqbg', limit: true, sort: 5},
+    {name: '本期较大变更计量', code: 'jdbqbg', limit: true, sort: 5},
+    {name: '本期重大变更计量', code: 'zdbqbg', limit: true, sort: 5},
     {name: '100章本期完成计量', code: 'ybbqwc', limit: true, sort: 1},
     {name: '本期应付', code: 'bqyf', limit: true, ptNormalLimit: true, sort: 20},
 ];

app/view/ledger/explode.ejs

@@ -170,7 +170,7 @@
                                   <a href="javascript:void(0);" id="bach-download" class="btn btn-sm btn-primary" type="curr">批量下载</a>
                                   <!--所有附件 翻页-->
                                   <span id="showPage" style="display: none"><a href="javascript:void(0);" class="page-select ml-3" content="pre"><i class="fa fa-chevron-left"></i></a> <span id="currentPage">1</span>/<span id="totalPage">10</span> <a href="javascript:void(0);" class="page-select mr-3" content="next"><i class="fa fa-chevron-right"></i></a></span>
-                                  <% if (!ctx.tender.isTourist) { %>
+                                  <% if (!ctx.tender.isTourist || (ctx.tender.isTourist && ctx.tender.touristPermission.file)) { %>
                                   <a href="#upload" data-toggle="modal" data-target="#upload"  class="btn btn-sm btn-outline-primary ml-3">上传</a>
                                   <% } %>
                               </li>
@@ -343,6 +343,6 @@
 <script>
     const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
     const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup) %>');
-    
+
 </script>
 <% } %>

app/view/tender/detail.ejs

@@ -1129,7 +1129,7 @@
     // 初始化地图，设置中心点坐标和地图级别
     map.centerAndZoom(point, 12);
     map.enableScrollWheelZoom(true);
-    // map.setMapStyleV2({styleJson: styleJson2});
+    map.setMapStyleV2({styleId: '20d4aea41cf71387395f2dc835f1c4b6'});
     // 画线
     var polyline = new BMapGL.Polyline([
         new BMapGL.Point(113.352, 22.166),