coeList.

public/web/sheet.js

@@ -24,7 +24,7 @@ sheetObj = {
         sheet.setDataSource(datas);
         sheet.bindColumns(colDef);
         me.setColAlign(colDef);
-        me.setRowHeight(datas, 28);
+        me.setRowHeight(datas, 25);
 
         me.spread.resumePaint();
         return me.spread;

web/rationRepository/fuzhu.html

@@ -18,7 +18,7 @@
     <div class="header">
         <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
             <span class="header-logo px-2">Smartcost</span>
-            <div class="navbar-text"><a href="main.html">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
+            <div class="navbar-text" id="rationname"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
         </nav>
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
               <ul class="nav nav-tabs" role="tablist">
@@ -100,7 +100,7 @@
                     </div>
                   </div>
                   <div class="main-content col-lg-5 p-0">
-                      <div id="contentSpread" style="height: 400px; margin-left:4px;" />
+                      <div id="contentSpread" style="height: 400px; margin-left:4px;margin-right:4px;" />
                     <!--<div class="m-2">
                       <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked> 工料机整体调整</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1"> 单个工料机调整</label></div></p>
                     </div>
@@ -195,6 +195,7 @@
     <script type="text/javascript" src="/public/web/QueryParam.js"></script>
     <script src="/public/web/sheet.js"></script>
     <script src="/public/debug.js"></script>
+    <script type="text/javascript" src="/public/web/storageUtil.js"></script>
     <script type="text/javascript" src="/web/rationRepository/js/coeList.js"></script>
     <!--<script type="text/javascript" src="/web/rationRepository/js/zTreeCommon.js"></script>-->
     <!--<script type="text/javascript" src="/web/rationRepository/js/sheetCommon.js"></script>-->

web/rationRepository/js/coeList.js

@@ -2,46 +2,81 @@
  * Created by CSL on 2017-05-18.
  */
 
-$("#drirect-dinge").click(function(){
-    $(this).attr('href', "/rationRepository/ration" + "?repository=" + getQueryString("repository"))
-});
-
-$("#gongliao").click(function(){
-    $(this).attr('href', "/rationRepository/lmm" + "?repository=" + getQueryString("repository"))
-});
+var pageObj = {
+    initPage: function (){
+        $("#drirect-dinge").click(function(){
+            $(this).attr('href', "/rationRepository/ration" + "?repository=" + getQueryString("repository"))
+        });
+
+        $("#gongliao").click(function(){
+            $(this).attr('href', "/rationRepository/lmm" + "?repository=" + getQueryString("repository"))
+        });
+
+        var libID = getQueryString("repository");
+        var libName = storageUtil.getSessionCache("RationGrp","repositoryID_" + libID);
+        if (libName) {
+            var html = $("#rationname")[0].outerHTML;
+            html = html.replace("XXX定额库", libName);
+            $("#rationname")[0].outerHTML = html;
+        };
 
+        coeList.show();
+    }
+};
 
 var coeList = {
-    libID: -1,
+    mainSpread: null,
+    detailSpread: null,
     datas: [],
+
     colDefMain: [
-        {name: "ID", displayName: "编号",formatter: "000000", size: 100},
+        {name: "ID", displayName: "编号", size: 100},
         {name: "name", displayName: "名称", size: 280},
         {name: "content", displayName: "内容", size: 250}
     ],
     colDefContent: [
         {name: "coeType", displayName: "类型", size: 100, hAlign: "center"},
-        {name: "gljID", displayName: "工料机ID", size: 100, hAlign: "center",formatter: "000000"},
+        {name: "gljID", displayName: "工料机ID", size: 100, hAlign: "center",formatter: "00000000"},
         {name: "operator", displayName: "操作符", size: 60, hAlign: "center"},
         {name: "amount", displayName: "数量", size: 80, hAlign: "right"}
     ],
-    mainSpread: null,
-    detailSpread: null,
 
-    getLibID: function(libName){
+    show: function (){
+        var me = this;
+        me.getDatas();
+        me.mainSpread = sheetObj.create($('#mainSpread')[0], me.colDefMain, me.datas);
+        me.detailSpread = sheetObj.create($('#contentSpread')[0], me.colDefContent, me.datas[0].coes);
+
+        var coeType = new GC.Spread.Sheets.CellTypes.ComboBox();
+        coeType.items(["单个","全部","人工类","材料类","机械类"]);
+        me.detailSpread.getSheet(0).getRange(-1, 0, -1, 1).cellType(coeType);
+
+        var operType = new GC.Spread.Sheets.CellTypes.ComboBox();
+        operType.items(["+","-","*","/","="]);
+        me.detailSpread.getSheet(0).getRange(-1, 2, -1, 1).cellType(operType);
+
+        me.detailSpread.options.showVerticalScrollbar = false;
+
+        me.mainSpread.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onMainEnterCell);
+        me.detailSpread.getSheet(0).bind(GC.Spread.Sheets.Events.CellChanged, me.onDetailCellChanged);
+    },
+
+    getDatas: function () {
         var me = this;
+        var libID = getQueryString("repository");
+
         $.ajax({
             type:"POST",
-            url:"/rationRepository/api/getLibIDByName",
-            data:{"libName": libName},
+            url:"/rationRepository/api/getCoeList",
+            data:{"libID": libID},
             dataType:"json",
             cache:false,
             async: false,
             timeout:20000,
             success: function (result) {
                 if (result.data) {
-                    me.libID = result.data;
-                }
+                    me.datas = result.data;
+                };
             },
             error: function (result) {
                 alert('内部程序错误！');
@@ -49,26 +84,20 @@ var coeList = {
         })
     },
 
-    getDatas: function (libName) {
+    getLibID: function(libName){
         var me = this;
-        me.getLibID(libName);
-
-        if (me.libID == -1){
-            return false;
-        };
-
         $.ajax({
             type:"POST",
-            url:"/rationRepository/api/getCoeList",
-            data:{"libID": me.libID},
+            url:"/rationRepository/api/getLibIDByName",
+            data:{"libName": libName},
             dataType:"json",
             cache:false,
             async: false,
             timeout:20000,
             success: function (result) {
                 if (result.data) {
-                    me.datas = result.data;
-                };
+                    me.libID = result.data;
+                }
             },
             error: function (result) {
                 alert('内部程序错误！');
@@ -76,31 +105,6 @@ var coeList = {
         })
     },
 
-    show: function (){
-        var me = this;
-        var libName = getQueryString("repository");
-
-        // datas from server.
-        me.getDatas(libName);
-        me.mainSpread = sheetObj.create($('#mainSpread')[0], me.colDefMain, me.datas);
-        me.detailSpread = sheetObj.create($('#contentSpread')[0], me.colDefContent, me.datas[0].coes);
-
-        me.mainSpread.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onMainEnterCell);
-        me.detailSpread.getSheet(0).bind(GC.Spread.Sheets.Events.CellChanged, me.onDetailCellChanged);
-
-        var coeType = new GC.Spread.Sheets.CellTypes.ComboBox();
-        coeType.items(["单个","全部","人工类","材料类","机械类"]);
-        me.detailSpread.getSheet(0).getRange(-1, 0, -1, 1).cellType(coeType);
-
-        var operType = new GC.Spread.Sheets.CellTypes.ComboBox();
-        operType.items(["+","-","*","/","="]);
-        me.detailSpread.getSheet(0).getRange(-1, 2, -1, 1).cellType(operType);
-
-        // datas for test.
-        //sheetObj.create($('#mainSpread')[0], me.colDefMain, createDatas(50));
-        //sheetObj.create($('#contentSpread')[0], me.colDefContent, createContents(10));
-    },
-
     onMainEnterCell: function(sender, args) {
         var me = coeList;
         var row = args.sheet.getActiveRowIndex();
@@ -110,7 +114,7 @@ var coeList = {
     },
 
     onDetailCellChanged:  function(sender, args) {
-        alert('onDetailCellChanged');
+        //alert('onDetailCellChanged');
         var me = coeList;
         var row = args.sheet.getActiveRowIndex();
         var curType = args.sheet.getValue(row,0);
@@ -126,6 +130,8 @@ var coeList = {
     }
 };
 
-coeList.show();
+pageObj.initPage();
+
+