调整工具栏页面设置

app/public/js/global.js

@@ -1,20 +1,23 @@
 /*全局自适应高度*/
 /*全局自适应高度*/
 function autoFlashHeight(){
+    function getObjHeight(select) {
+        return select.length > 0 ? select.height() : 0;
+    }
     /*侧栏高度*/
-    var sBar1 = $(".sjs-bar-1").height();
-    var sBar2 = $(".sjs-bar-2").height();
-    var sBar3 = $(".sjs-bar-3").height();
-    var sBar4 = $(".sjs-bar-4").height();
-    var sBar5 = $(".sjs-bar-5").height();
+    var sBar1 = getObjHeight($(".sjs-bar-1"));
+    var sBar2 = getObjHeight($(".sjs-bar-2"));
+    var sBar3 = getObjHeight($(".sjs-bar-3"));
+    var sBar4 = getObjHeight($(".sjs-bar-4"));
+    var sBar5 = getObjHeight($(".sjs-bar-5"));
     /*侧栏高度*/
-    var cHeader = $(".c-header").height();
-    var sBar = $(".sjs-bar").height();
-    var sBart = $(".sjs-bart").height();
-    var sBarz = $(".side-bar").height();
-    var pBarz = $(".toolsbar-f").height();
-    var bdtopc = $(".body-height-top").height();
-    var bcontent = $(".bcontent-wrap").length > 0 ? $(".bcontent-wrap").height() : 0;
+    var cHeader = getObjHeight($(".c-header"));
+    var sBar = getObjHeight($(".sjs-bar"));
+    var sBart = getObjHeight($(".sjs-bart"));
+    var sBarz = getObjHeight($(".side-bar"));
+    var pBarz = getObjHeight($(".toolsbar-f"));
+    var bdtopc = getObjHeight($(".body-height-top"));
+    var bcontent = getObjHeight($(".bcontent-wrap"));
     $(".sjs-height-0").height($(window).height()-cHeader-110);
     $(".sjs-height-1").height($(window).height()-cHeader-bcontent-110);
     $(".sjs-height-2").height($(window).height()-cHeader-sBarz-110);

app/public/js/ledger.js

@@ -48,7 +48,7 @@ $(document).ready(function() {
 
     // 初始化 部位明细
     const pos = new PosData({
-        id: 'id', masterId: 'lid',
+        id: 'id', ledgerId: 'lid',
     });
     const posSpread = SpreadJsObj.createNewSpread($('#pos-spread')[0]);
 

app/public/js/ledger_audit.js

@@ -109,7 +109,7 @@ $(document).ready(() => {
     class DealBills {
         constructor (obj, spreadSetting) {
             this.obj = obj;
-            this.url = '/api/tender/' + getTenderId() + '/deal';
+            this.url = '/tender/' + getTenderId() + '/deal';
             this.spreadSetting = spreadSetting;
             this.spread = SpreadJsObj.createNewSpread(this.obj);
             SpreadJsObj.initSheet(this.spread.getActiveSheet(), this.spreadSetting);

app/view/ledger/audit.ejs

@@ -46,7 +46,7 @@
             <div class="c-body col-0" style="display: none;">
                 <div class="tab-content">
                     <div id="deal-bills" class="tab-pane">
-                        <div class="side-bar-1"></div>
+                        <div class="sjs-bar-1"></div>
                         <div class="sjs-sh-1" id="deal-bills-spread">
                         </div>
                     </div>

app/view/ledger/explode.ejs

@@ -75,7 +75,7 @@
             <div class="c-body col-0" style="display: none;">
                 <div class="tab-content">
                     <div id="search" class="tab-pane active">
-                        <div class="side-bar-1">
+                        <div class="sjs-bar-1">
                             <div class="input-group input-group-sm">
                                 <input id="searchKeyword" type="text" class="form-control" placeholder="项目节编号/清单编号/名称" aria-label="Recipient's username" aria-describedby="button-addon2">
                                 <div class="input-group-append">
@@ -87,21 +87,21 @@
                         </div>
                     </div>
                     <div id="std-chapter" class="tab-pane active">
-                        <div class="side-bar-2">
+                        <div class="sjs-bar-2">
                             <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
                         </div>
                         <div id="std-chapter-spread" class="sjs-sh-2">
                         </div>
                     </div>
                     <div id="std-bills" class="tab-pane">
-                        <div class="side-bar-3">
+                        <div class="sjs-bar-3">
                             <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
                         </div>
                         <div id="std-bills-spread" class="sjs-sh-3">
                         </div>
                     </div>
                     <div id="deal-bills" class="tab-pane">
-                        <div class="side-bar-4">
+                        <div class="sjs-bar-4">
                             <a href="#upload-deal" data-toggle="modal" data-target="#upload-deal" class="btn btn-sm btn-primary">上传签约清单</a>
                         </div>
                         <div id="deal-bills-spread" class="sjs-sh-4">