Selaa lähdekoodia

hide side-tools(stdBillsLib & stdRationLib)

MaiXinRong 8 vuotta sitten
vanhempi
commit
00b3e71cdd

+ 20 - 0
web/building_saas/css/main.css

@@ -7,6 +7,9 @@ body {
 .dropdown-menu {
     font-size: 0.9rem
 }
+.btn.disabled, .btn:disabled {
+  color:#999
+}
 /*自定义css*/
 .header {
     background: #e1e1e1
@@ -85,12 +88,29 @@ body {
     border-left: 1px solid #ccc;
     overflow-y: hidden;
 }
+.main-data-top{
+  overflow: hidden;
+  width:100%
+}
+.main-content.col-lg-8{
+  width:66.666667%
+}
+.main-content.col-lg-12{
+  width:100%
+}
+.main-side.col-lg-4{
+  width: 33.333333%;
+}
+.main-side.col-lg-0{
+  width:0%;
+}
 .sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
   height:200px
 }
 .top-content, .fluid-content {
     overflow: auto;
     border-bottom: 1px solid #ccc;
+    width: 100%
 }
 .bottom-content .nav {
     background: #f7f7f9;

+ 4 - 3
web/building_saas/js/global.js

@@ -3,9 +3,10 @@ function autoFlashHeight(){
     var headerHeight = $(".header").height();
     var toolsbarHeight = $(".toolsbar").height();
     var bottomContentHeight = $(".bottom-content").height();
-    var sidebarToolsBarHeight = $(".sidebar-tools-bar").height();
-    $(".main-data-side-f").height($(window).height()-headerHeight-toolsbarHeight-2);
-    $(".main-data-side-s").height($(window).height()-headerHeight-toolsbarHeight-sidebarToolsBarHeight-202);
+    var toolsBarHeightQ = $(".tools-bar-height-q").height();
+    var toolsBarHeightD = $(".tools-bar-height-d").height();
+    $(".main-data-side-q").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightQ-202);
+    $(".main-data-side-d").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightD-202);
     $(".main-data-top").height($(window).height()-headerHeight-toolsbarHeight-bottomContentHeight-1);
     $(".main-data-full").height($(window).height()-headerHeight-toolsbarHeight-1);
     $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);

+ 11 - 10
web/building_saas/main/html/main.html

@@ -112,17 +112,17 @@
                   <div class="side-tabs">
                       <ul class="nav nav-tabs" role="tablist">
                           <li class="nav-item">
-                              <a class="nav-link active px-3" data-toggle="tab" href="#qd" role="tab">清单规则</a>
+                              <a class="nav-link px-3" href="javascript:void(0)" id = 'stdBillsTab' relaPanel="#qd">清单规则</a>
                           </li>
                           <li class="nav-item">
-                              <a class="nav-link px-3" data-toggle="tab" href="#de" role="tab" id="stdRationTab">定额库</a>
+                              <a class="nav-link px-3" href="javascript:void(0)" id="stdRationTab" relaPanel="#de">定额库</a>
                           </li>
                       </ul>
                   </div>
               </div>
               <div class="container-fluid">
                   <div class="row">
-                      <div class="main-content col-lg-9 p-0">
+                      <div class="main-content col-lg-12 p-0">
                           <div class="top-content">
                               <div class="main-data-top" id="billsSpread"></div>
                           </div>
@@ -189,11 +189,11 @@
                               </div>
                           </div>
                       </div>
-                      <div class="main-side col-lg-3 p-0">
+                      <div class="main-side col-lg-0 p-0">
                           <div class="tab-content">
                               <!--清单规则-->
-                              <div class="tab-pane active" id="qd" role="tabpanel">
-                                  <div class="sidebar-tools-bar container-fluid">
+                              <div class="tab-pane" id="qd">
+                                  <div class="tools-bar-height-q container-fluid">
                                       <div class="p-1 row">
                                           <select class="form-control form-control-sm col-6" id="stdBillsLibSelect">
                                           </select>
@@ -213,7 +213,7 @@
                                           </div>
                                       </div>
                                   </div>
-                                  <div class="main-data-side-s" id="stdBillsSpread">
+                                  <div class="main-data-side-q" id="stdBillsSpread">
                                   </div>
                                   <div class="sidebar-bottom container-fluid">
                                       <div class="row" id="stdBillsJobTab">
@@ -228,8 +228,8 @@
                                   </div>
                               </div>
                               <!--定额库-->
-                              <div class="tab-pane" id="de" role="tabpanel">
-                                  <div class="sidebar-tools-bar container-fluid">
+                              <div class="tab-pane" id="de">
+                                  <div class="tools-bar-height-d container-fluid">
                                       <div class="p-1 row">
                                           <select class="form-control form-control-sm col-6" id="stdRationLibSelect">
                                           </select>
@@ -244,7 +244,7 @@
                                           </div>
                                       </div>
                                   </div>
-                                  <div class="main-data-side-s" id="stdRationChapter">
+                                  <div class="main-data-side-d" id="stdRationChapter">
                                   </div>
                                   <div class="sidebar-bottom container-fluid">
                                       <div class="row">
@@ -521,6 +521,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/main_ajax.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/main.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/controllers/project_controller.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/side_tools.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/std_bills_lib.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/std_ration_lib.js"></script>
     <SCRIPT type="text/javascript">

+ 35 - 0
web/building_saas/main/js/views/side_tools.js

@@ -0,0 +1,35 @@
+/**
+ * Created by Mai on 2017/6/16.
+ */
+
+var sideToolsObj = {
+    showSideTools: function (show) {
+        var main = $('.main-content'), side = $('.main-side');
+        if (show) {
+            main.removeClass('col-lg-12');
+            main.addClass('col-lg-8');
+            side.removeClass('col-lg-0');
+            side.addClass('col-lg-4');
+        } else {
+            main.removeClass('col-lg-8');
+            main.addClass('col-lg-12');
+            side.removeClass('col-lg-4');
+            side.addClass('col-lg-0');
+        }
+    }
+};
+
+$('.side-tabs ul li a').bind('click', function () {
+    var tab = $(this), tabPanel = $(tab.attr('relaPanel'));
+    if (!tab.hasClass('active')) {
+        $('.side-tabs ul li a').removeClass('active');
+        tab.addClass('active');
+        sideToolsObj.showSideTools(tab.hasClass('active'));
+        $('.main-side .tab-pane').hide();
+        tabPanel.show();
+    } else {
+        tab.removeClass('active');
+        sideToolsObj.showSideTools(tab.hasClass('active'));
+        tabPanel.hide();
+    }
+});

+ 197 - 344
web/building_saas/main/js/views/std_bills_lib.js

@@ -3,182 +3,157 @@
  * Created by Mai on 2017/5/16.
  */
 
-/**
- * showObj = {bills, jobAndFeatureTab, job, feature, remarkTab, remark}
- */
-/*var stdBillsLibObj = {
-    createNew: function (sessionID, showObj) {
-        var tools = {
-            sessionID: sessionID,
-            billsSpread: null,
-            billsJobSpread: null,
-            billsFeatureSpread: null,
-            checkSpread: function (spread, spreadObj) {
-                if (!spread) {
-                    spread = SheetDataHelper.createNewSpread(spreadObj);
+var billsLibObj = {
+    stdBillsSpread: null,
+    stdBillsJobSpread: null,
+    stdBillsFeatureSpread: null,
+    checkBillsSpread: function () {
+        if (!this.stdBillsSpread) {
+            this.stdBillsSpread = SheetDataHelper.createNewSpread($('#stdBillsSpread')[0]);
+        }
+    },
+    checkBillsRelaSpread: function () {
+        if (!this.stdBillsJobSpread) {
+            this.stdBillsJobSpread = SheetDataHelper.createNewSpread($('#stdBillsJobs')[0]);
+        }
+        if (!this.stdBillsFeatureSpread) {
+            this.stdBillsFeatureSpread = SheetDataHelper.createNewSpread($('#stdBillsFeatures')[0]);
+        }
+    },
+    loadStdBillsLib: function () {
+        CommonAjax.post('/stdBillsEditor/getStdBillsLib', {userId: userID}, function (datas) {
+            var i, select = $('#stdBillsLibSelect');
+            select.empty();
+            datas.forEach(function (data) {
+                var option = $('<option>').val(data.billsLibId).text(data.billsLibName);
+                select.append(option);
+            });
+            if (select.children.length !== 0) {
+                billsLibObj.loadStdBills(select.val());
+            }
+        });
+    },
+    loadStdBills: function (stdBillsLibID) {
+        var stdBillsJobData, stdBillsFeatureData, stdBills;
+        var stdBillsTree  = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: true});
+        var stdBillsTreeController = TREE_SHEET_CONTROLLER.createNew(stdBillsTree, billsLibObj.stdBillsSpread.getActiveSheet(), billsLibObj.stdBillsTreeSetting);
+        var findData = function (value, field, Array) {
+            var i = 0;
+            for (i = 0; i < Array.length - 1; i++) {
+                if (value === Array[i][field]) {
+                    return Array[i];
+                }
+            }
+            return null;
+        };
+        var getBillsJobs = function (node) {
+            var jobs = [], i, jobData = null;
+            if (stdBillsJobData && node && node.data.jobs) {
+                for (i = 0; i < node.data.jobs.length - 1; i++) {
+                    jobData = findData(node.data.jobs[i], 'id', stdBillsJobData);
+                    if (jobData) {
+                        jobs.push(jobData);
+                    }
                 }
             }
+            return jobs;
+        };
+        var getBillsFeatures = function (node) {
+            var features = [], i, featureData = null;
+            if (stdBillsFeatureData && node && node.data.items) {
+                for (i = 0; i < node.data.items.length - 1; i++) {
+                    featureData = findData(node.data.items[i], 'id', stdBillsFeatureData);
+                    if (featureData) {
+                        features.push(featureData);
+                    }
+                }
+            }
+            return features;
+        };
+        var showJobs = function (jobs) {
+            SheetDataHelper.loadSheetHeader(billsLibObj.jobsSetting, billsLibObj.stdBillsJobSpread.getActiveSheet());
+            SheetDataHelper.loadSheetData(billsLibObj.jobsSetting, billsLibObj.stdBillsJobSpread.getActiveSheet(), jobs);
         };
-        var libObj = function () {
-            this.billsTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: true});
-            this.spread = tools.billsSpread;
+        var showFeatures = function (features) {
+            SheetDataHelper.loadSheetHeader(billsLibObj.featuresSetting, billsLibObj.stdBillsFeatureSpread.getActiveSheet());
+            SheetDataHelper.loadSheetData(billsLibObj.featuresSetting, billsLibObj.stdBillsFeatureSpread.getActiveSheet(), features);
         };
+        var showJobsAndFeatures = function (node) {
+            $('#stdBillsJobTab').show();
+            $('#stdBillsRemarkTab').hide();
+            billsLibObj.checkBillsRelaSpread();
+            showJobs(getBillsJobs(node));
+            showFeatures(getBillsFeatures(node));
+        };
+        var showBillsRemark = function (node) {
+            $('#stdBillsJobTab').hide();
+            $('#stdBillsRemarkTab').show();
+            $('#stdBillsRemark').text(node && node.data.recharge ? node.data.recharge : '');
+        };
+        var showBillsRela = function (node) {
+            if (node && node.children.length === 0) {
+                showJobsAndFeatures(node);
+            } else {
+                showBillsRemark(node);
+            }
+        };
+
+        CommonAjax.post('/stdBillsEditor/getJobContent', {userId: userID, billsLibId: stdBillsLibID}, function (datas) {
+            stdBillsJobData = datas;
+        }, function () {
+            stdBillsJobData = [];
+        });
+        CommonAjax.post('/stdBillsEditor/getItemCharacter', {userId: userID, billsLibId: stdBillsLibID}, function (datas) {
+            stdBillsFeatureData = datas;
+        }, function () {
+            stdBillsFeatureData = [];
+        });
+        CommonAjax.post('/stdBillsEditor/getBills', {userId: userID, billsLibId: stdBillsLibID}, function (datas) {
+            stdBills = datas;
+            stdBillsTree.loadDatas(stdBills);
+            stdBillsTreeController.showTreeData();
+            showBillsRela(stdBillsTree.firstNode());
 
-        libObj.prototype.LoadStdBills = function () {
-            tools.checkSpread(tools.billsSpread, showObj.bills);
+            stdBillsTreeController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, showBillsRela);
+        });
 
-        };
+        $('#stdBillsSearch>span>button').click(function () {
+            var keyword = $('#stdBillsSearch>input').val();
 
-        return new libObj(sessionID);
-    },
-    settings: {
-        stdBillsTreeSetting: {
-            "treeCol": 0,
-            "emptyRows":0,
-            "headRows":1,
-            "headRowHeight":[
-                35
-            ],
-            "cols":[{
-                "width":100,
-                "readOnly":null,
-                "head":{
-                    "titleNames":["项目编码"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["12px Arial"]
-                },
-                "data":{
-                    "field":"code",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"12px Arial"
-                }
-            }, {
-                "width":120,
-                "readOnly":null,
-                "head":{
-                    "titleNames":["项目名称"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["12px Arial"]
-                },
-                "data":{
-                    "field":"name",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"12px Arial"
-                }
-            }, {
-                "width":40,
-                "readOnly":null,
-                "head":{
-                    "titleNames":["计量单位"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["12px Arial"],
-                    "wordWrap": true
-                },
-                "data":{
-                    "field":"unti",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"12px Arial"
-                }
-            }, {
-                "width":100,
-                "readOnly": true,
-                "head":{
-                    "titleNames":["工程量计算规则"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["12px Arial"]
-                },
-                "data":{
-                    "field":"ruleText",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"12px Arial"
-                }
-            }]
-        },
-        stdBillsJobSetting: {
-            "emptyRows":0,
-            "headRows":1,
-            "headRowHeight":[
-                20
-            ],
-            "cols":[{
-                "width":200,
-                "readOnly":true,
-                "head":{
-                    "titleNames":["工程内容"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["12px Arial"]
-                },
-                "data":{
-                    "field":"content",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"12px Arial"
-                }
-            }]
-        },
-        stdBillsFeatureSetting: {
-            "emptyRows":0,
-            "headRows":1,
-            "headRowHeight":[
-                20
-            ],
-            "cols":[{
-                "width":200,
-                "readOnly":null,
-                "head":{
-                    "titleNames":["项目特征"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["12px Arial"]
-                },
-                "data":{
-                    "field":"content",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"12px Arial"
-                }
-            }]
-        }
-    }
-};*/
+            if (!keyword || keyword === '') {return}
 
-CommonAjax.post('/stdBillsEditor/getStdBillsLib', {userId: userID}, function (datas) {
-    var i, select = $('#stdBillsLibSelect');
-    select.empty();
-    datas.forEach(function (data) {
-        var option = $('<option>').val(data.billsLibId).text(data.billsLibName);
-        select.append(option);
-    });
-    if (select.children.length !== 0) {
-        LoadStdBills(select.val());
-    }
-});
+            var result = stdBillsTree.items.filter(function (item) {
+                var codeIs = item.data.code ? item.data.code.indexOf(keyword) !== -1 : false;
+                var nameIs = item.data.name ? item.data.name.indexOf(keyword) !== -1 : false;
+                return codeIs || nameIs;
+            });
+            result.sort(function (x, y) {
+                return x.serialNo() - y.serialNo();
+            });
+            if (result.length !== 0) {
+                var sel = billsLibObj.stdBillsSpread.getActiveSheet().getSelections();
+                stdBillsTreeController.setTreeSelected(result[0]);
+                billsLibObj.stdBillsSpread.getActiveSheet().setSelection(result[0].serialNo(), sel[0].col, 1, 1);
 
-var LoadStdBills = (function () {
-    var stdBillsSpread = SheetDataHelper.createNewSpread($('#stdBillsSpread')[0]);
-    var stdBillsJobSpread = null, stdBillsFeatureSpread = null;
-    var stdBillsTreeSetting = {
+                $('#nextStdBills').show();
+                $('#nextStdBills').click(function () {
+                    var cur = stdBillsTree.selected, resultIndex = result.indexOf(cur), sel = billsLibObj.stdBillsSpread.getActiveSheet().getSelections();
+                    if (resultIndex === result.length - 1) {
+                        stdBillsTreeController.setTreeSelected(result[0]);
+                        billsLibObj.stdBillsSpread.getActiveSheet().setSelection(result[0].serialNo(), sel[0].col, 1, 1);
+                    } else {
+                        stdBillsTreeController.setTreeSelected(result[resultIndex + 1]);
+                        billsLibObj.stdBillsSpread.getActiveSheet().setSelection(result[resultIndex + 1].serialNo(), sel[0].col, 1, 1);
+                    }
+                });
+            } else {
+                $('#nextStdBills').hide();
+            }
+            $('#stdBillsSearchResultCount').text('搜索结果:' + result.length);
+            $('#stdBillsSearchResult').show();
+        });
+    },
+    stdBillsTreeSetting: {
         "treeCol": 0,
         "emptyRows":0,
         "headRows":1,
@@ -256,188 +231,65 @@ var LoadStdBills = (function () {
                 "font":"Arial"
             }
         }]
-    };
-    var stdBillsData, stdBillsJobData, stdBillsFeatureData;
-    var stdBillsTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: true});
-    var stdBillsTreeController = TREE_SHEET_CONTROLLER.createNew(stdBillsTree, stdBillsSpread.getActiveSheet(), stdBillsTreeSetting);
-
-    var findData = function (value, field, Array) {
-        var i = 0;
-        for (i = 0; i < Array.length - 1; i++) {
-            if (value === Array[i][field]) {
-                return Array[i];
-            }
-        }
-        return null;
-    };
-    var getBillsJobs = function (node) {
-        var jobs = [], i, jobData = null;
-        if (stdBillsJobData && node && node.data.jobs) {
-            for (i = 0; i < node.data.jobs.length - 1; i++) {
-                jobData = findData(node.data.jobs[i], 'id', stdBillsJobData);
-                if (jobData) {
-                    jobs.push(jobData);
-                }
+    },
+    jobsSetting: {
+        "emptyRows":0,
+        "headRows":1,
+        "headRowHeight":[25],
+        "defaultRowHeight": 21,
+        "cols":[{
+            "width":200,
+            "readOnly":true,
+            "head":{
+                "titleNames":["工作内容"],
+                "spanCols":[1],
+                "spanRows":[1],
+                "vAlign":[1],
+                "hAlign":[1],
+                "font":["Arial"]
+            },
+            "data":{
+                "field":"content",
+                "vAlign":0,
+                "hAlign":3,
+                "font":"Arial"
             }
-        }
-        return jobs;
-    };
-    var getBillsFeatures = function (node) {
-        var features = [], i, featureData = null;
-        if (stdBillsFeatureData && node && node.data.items) {
-            for (i = 0; i < node.data.items.length - 1; i++) {
-                featureData = findData(node.data.items[i], 'id', stdBillsFeatureData);
-                if (featureData) {
-                    features.push(featureData);
-                }
+        }]
+    },
+    featuresSetting: {
+        "emptyRows":0,
+        "headRows":1,
+        "headRowHeight":[25],
+        "defaultRowHeight": 21,
+        "cols":[{
+            "width":200,
+            "readOnly":true,
+            "head":{
+                "titleNames":["项目特征"],
+                "spanCols":[1],
+                "spanRows":[1],
+                "vAlign":[1],
+                "hAlign":[1],
+                "font":["Arial"]
+            },
+            "data":{
+                "field":"content",
+                "vAlign":0,
+                "hAlign":3,
+                "font":"Arial"
             }
-        }
-        return features;
-    };
-    var showJobs = function (jobs) {
-        var jobsSetting = {
-            "emptyRows":0,
-            "headRows":1,
-            "headRowHeight":[25],
-            "defaultRowHeight": 21,
-            "cols":[{
-                "width":200,
-                "readOnly":true,
-                "head":{
-                    "titleNames":["工作内容"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["Arial"]
-                },
-                "data":{
-                    "field":"content",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"Arial"
-                }
-            }]
-        };
-        SheetDataHelper.loadSheetHeader(jobsSetting, stdBillsJobSpread.getActiveSheet());
-        SheetDataHelper.loadSheetData(jobsSetting, stdBillsJobSpread.getActiveSheet(), jobs);
-    };
-    var showFeatures = function (features) {
-        var featuresSetting = {
-            "emptyRows":0,
-            "headRows":1,
-            "headRowHeight":[25],
-            "defaultRowHeight": 21,
-            "cols":[{
-                "width":200,
-                "readOnly":true,
-                "head":{
-                    "titleNames":["项目特征"],
-                    "spanCols":[1],
-                    "spanRows":[1],
-                    "vAlign":[1],
-                    "hAlign":[1],
-                    "font":["Arial"]
-                },
-                "data":{
-                    "field":"content",
-                    "vAlign":0,
-                    "hAlign":3,
-                    "font":"Arial"
-                }
-            }]
-        };
-        SheetDataHelper.loadSheetHeader(featuresSetting, stdBillsFeatureSpread.getActiveSheet());
-        SheetDataHelper.loadSheetData(featuresSetting, stdBillsFeatureSpread.getActiveSheet(), features);
-    }
-    var showJobsAndFeatures = function (node) {
-        $('#stdBillsJobTab').show();
-        $('#stdBillsRemarkTab').hide();
-        if (!stdBillsJobSpread) {
-            stdBillsJobSpread = SheetDataHelper.createNewSpread($('#stdBillsJobs')[0]);
-        }
-        showJobs(getBillsJobs(node));
-        if (!stdBillsFeatureSpread) {
-            stdBillsFeatureSpread = SheetDataHelper.createNewSpread($('#stdBillsFeatures')[0]);
-        }
-        showFeatures(getBillsFeatures(node));
-    };
-    var showBillsRemark = function (node) {
-        $('#stdBillsJobTab').hide();
-        $('#stdBillsRemarkTab').show();
-        $('#stdBillsRemark').text(node && node.data.recharge ? node.data.recharge : '');
-    };
-    var showBillsRela = function (node) {
-        if (node && node.children.length === 0) {
-            showJobsAndFeatures(node);
-        } else {
-            showBillsRemark(node);
-        }
+        }]
     }
+};
 
-    var LoadData = function (stdBillsLibID) {
-        CommonAjax.post('/stdBillsEditor/getJobContent', {userId: userID, billsLibId: stdBillsLibID}, function (datas) {
-            stdBillsJobData = datas;
-        }, function () {
-            stdBillsJobData = [];
-        });
-        CommonAjax.post('/stdBillsEditor/getItemCharacter', {userId: userID, billsLibId: stdBillsLibID}, function (datas) {
-            stdBillsFeatureData = datas;
-        }, function () {
-            stdBillsFeatureData = [];
-        });
-        CommonAjax.post('/stdBillsEditor/getBills', {userId: userID, billsLibId: stdBillsLibID}, function (datas) {
-            stdBills = datas;
-            stdBillsTree.loadDatas(stdBills);
-            stdBillsTreeController.showTreeData();
-            showBillsRela(stdBillsTree.firstNode());
-
-            stdBillsTreeController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, showBillsRela);
-        });
+$('#stdBillsTab').bind('click', function () {
+    $(".main-data-side-q").height($(window).height() - $(".header").height() - $(".toolsbar").height() -  $(".tools-bar-height-q").height() - 202);
+    var select = $('#stdBillsLibSelect');
+    billsLibObj.checkBillsSpread();
+    if (select[0].options.length === 0) {
+        billsLibObj.loadStdBillsLib();
     };
-
-    stdBillsSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, function (sender, args) {
-        if (stdBillsTree.items[args.row].children.length === 0) {
-            ProjectController.addBills(project, controller, stdBillsTree.items[args.row]);
-        }
-    });
-
-    $('#stdBillsSearch>span>button').click(function () {
-        var keyword = $('#stdBillsSearch>input').val();
-        var result = stdBillsTree.items.filter(function (item) {
-            var codeIs = item.data.code ? item.data.code.indexOf(keyword) !== -1 : false;
-            var nameIs = item.data.name ? item.data.name.indexOf(keyword) !== -1 : false;
-            return codeIs || nameIs;
-        });
-        result.sort(function (x, y) {
-            return x.serialNo() - y.serialNo();
-        });
-        if (result.length !== 0) {
-            var sel = stdBillsSpread.getActiveSheet().getSelections();
-            stdBillsTreeController.setTreeSelected(result[0]);
-            stdBillsSpread.getActiveSheet().setSelection(result[0].serialNo(), sel[0].col, 1, 1);
-
-            $('#nextStdBills').show();
-            $('#nextStdBills').click(function () {
-                var cur = stdBillsTree.selected, resultIndex = result.indexOf(cur), sel = stdBillsSpread.getActiveSheet().getSelections();
-                if (resultIndex === result.length - 1) {
-                    stdBillsTreeController.setTreeSelected(result[0]);
-                    stdBillsSpread.getActiveSheet().setSelection(result[0].serialNo(), sel[0].col, 1, 1);
-                } else {
-                    stdBillsTreeController.setTreeSelected(result[resultIndex + 1]);
-                    stdBillsSpread.getActiveSheet().setSelection(result[resultIndex + 1].serialNo(), sel[0].col, 1, 1);
-                }
-            });
-        } else {
-            $('#nextStdBills').hide();
-        }
-        $('#stdBillsSearchResultCount').text('搜索结果:' + result.length);
-        $('#stdBillsSearchResult').show();
-    });
-
-    return LoadData;
-})();
-
+});
 $('#stdBillsLibSelect').change(function () {
     var select = $(this);
     if (this.children.length !== 0) {
@@ -447,4 +299,5 @@ $('#stdBillsLibSelect').change(function () {
 
 $('#closeSearchStdBills').click(function () {
     $('#stdBillsSearchResult').hide();
+    $(".main-data-side-q").height($(window).height() - $(".header").height() - $(".toolsbar").height() -  $(".tools-bar-height-q").height() - 202);
 });

+ 3 - 3
web/building_saas/main/js/views/std_ration_lib.js

@@ -181,9 +181,9 @@ var rationLibObj = {
         }]
     }
 };
-
-$('#stdRationTab').on('shown.bs.tab', function (e) {
+$('#stdRationTab').bind('click', function () {
     var select = $('#stdRationLibSelect');
+    $(".main-data-side-d").height($(window).height() - $(".header").height() - $(".toolsbar").height() -  $(".tools-bar-height-d").height() - 202);
     rationLibObj.checkSpread();
     if (select[0].options.length === 0) {
         rationLibObj.loadStdRationLibs();
@@ -227,7 +227,7 @@ $('#rationSearch').click(function () {
             $(".main-data-side-search", resultObj).height(0);
         });
         resultObj.show();
-        $(".main-data-side-search", resultObj).height($(window).height() - $(".header").height() - $(".sidebar-tools-bar").height() - 64);
+        $(".main-data-side-search", resultObj).height($(window).height() - $(".header").height() - $(".toolsbar").height() - 64);
         showResult(result);
     });
 });