Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation

web/maintain/billsGuidance_lib/html/zhiyin.html

@@ -35,12 +35,12 @@
                   <div class="main-content col-lg-4 p-" style="margin: 0; padding: 0;">
                     <div class="toolsbar px-1 d-flex justify-content-between">
                       <div class="tools-btn btn-group align-top">
-                        <a id="insert" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-reply-all" aria-hidden="true"></i> 插入</a>
-                        <a id="del" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i> 删除</a>
-                        <a id="upLevel" href="javascript:void(0);" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i> 升级</a>
-                        <a id="downLevel" href="javascript:void(0);" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i> 降级</a>
-                        <a id="downMove" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i> 下移</a>
-                        <a id="upMove" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i> 上移</a>
+                        <a id="insert" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-reply-all" aria-hidden="true"></i> 插入</a>
+                        <a id="del" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-remove" aria-hidden="true"></i> 删除</a>
+                        <a id="upLevel" href="javascript:void(0);" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-arrow-left" aria-hidden="true"></i> 升级</a>
+                        <a id="downLevel" href="javascript:void(0);" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-arrow-right" aria-hidden="true"></i> 降级</a>
+                        <a id="downMove" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-arrow-down" aria-hidden="true"></i> 下移</a>
+                        <a id="upMove" href="javascript:void(0);" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-arrow-up" aria-hidden="true"></i> 上移</a>
                       </div>
                     </div>
                     <div id="guideItemSpread" class="main-data">

web/maintain/bills_lib/html/tezheng.html

@@ -251,6 +251,8 @@
             myKey.enterKey(spread);
             TREE_SHEET_HELPER.loadSheetHeader(setting, spread.getActiveSheet());
             itemsAjax.getItemCharacter(billsLibId, function(datas){
+                spread.getActiveSheet().suspendPaint();
+                spread.getActiveSheet().setRowCount(datas.length + 10);
                 let len = datas.length;
                 for(var i=0; i<len; i++){
                     if(datas[0].id){
@@ -266,6 +268,8 @@
                         }
                     });
                 }
+                spread.getActiveSheet().resumePaint();
+                spread.getActiveSheet().resumeEvent();
                 //
                 var totalItems = createObj.newItems();
                 totalItems.loadItems(null, datas);

web/maintain/ration_repository/dinge.html

@@ -73,7 +73,7 @@
                               <a class="nav-link" data-toggle="tab" href="#tjs" role="tab">计算规则</a>
                           </li>
                           <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
+                              <a id="gznr" class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
                           </li>
                           <li class="nav-item">
                               <a class="nav-link" data-toggle="tab" href="#tfz" role="tab">附注</a>

web/maintain/ration_repository/gongliao.html

@@ -40,7 +40,7 @@
               </ul>
         </nav>
     </div>
-    <div class="main">
+    <div class="main" style="overflow:hidden">
         <div class="content">
             <div class="container-fluid">
                 <div class="row">

web/maintain/ration_repository/js/global.js

@@ -13,6 +13,14 @@ function autoFlashHeight(){
     $(".main-data-top-fluid").height($(window).height()-headerHeight-bottomContentHeight-2);
     $(".main-data").height($(window).height()-headerHeight);
     $(".main-side .tab-content").height($(window).height()-headerHeight-38);
+    $('#partialBody').height($(window).height()-headerHeight-toolsBar - 60);
+    let partialWidth = $('#tablePartial').width();
+    $('#tablePartial').find('th:eq(0)').width(partialWidth * 0.06);
+    $('#tablePartial').find('th:eq(1)').width(partialWidth * 0.3);
+    $('#tablePartial').find('th:eq(2)').width(partialWidth * 0.64);
+    $('#partialBody').find('tr').find('td:eq(0)').width(partialWidth * 0.06);
+    $('#partialBody').find('tr').find('td:eq(1)').width(partialWidth * 0.3);
+    $('#partialBody').find('tr').find('td:eq(2)').width(partialWidth * 0.64);
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/

web/maintain/ration_repository/js/jobContent.js

@@ -73,8 +73,8 @@ let jobContentOprObj = {
     buildTablePartial: function (table, group) {
         let me = jobContentOprObj;
         table.empty();
-        let $thead = $("<thead><tr><th></th><th>编码</th><th>工作内容</th>/tr></thead>");
-        let $tbody = $("<tbody></tbody>");
+        let $thead = $("<thead><tr style='display: block'><th></th><th>编码</th><th>工作内容</th>/tr></thead>");
+        let $tbody = $("<tbody id='partialBody' style='display:block; overflow: auto;'></tbody>");
         let count = 1;
         for(let i = 0, len = group.length; i < len; i++){
             let $newTr = me.getNewTr($tbody, group[i].items, group[i].jobContent);
@@ -90,6 +90,7 @@ let jobContentOprObj = {
         $tbody.append($trEnd);
         table.append($thead);
         table.append($tbody);
+        autoFlashHeight();
     },
     //新增一行tr
     getNewTr: function (tbody, codes, jobContent) {
@@ -411,4 +412,9 @@ let jobContentOprObj = {
             }
         })
     }
-};
+};
+$(document).ready(function () {
+    $('#gznr').on('shown.bs.tab', function () {
+        autoFlashHeight();
+    });
+});

web/users/js/main_tree_col.js

@@ -34,6 +34,9 @@ let MainTreeCol = {
         },
         marketPrice: function (node) {
 
+        },
+        feeRate:function (node) {
+            
         }
 
     },

web/users/js/template.js

@@ -269,7 +269,7 @@ $(document).ready(function () {
             let flagField = fieldName.split('.');
             data.data.flags.push({fieldName: flagField[1],flag: value});
         } else {
-            if(valueType == 'Number') value = parseInt(value);
+            if(value && valueType == 'Number') value = parseInt(value);
             setFee(data.data, fieldName, value);
         }
     };
@@ -316,7 +316,7 @@ $(document).ready(function () {
                 let flagField = fieldName.split('.');
                 data.data.flags.push({fieldName: flagField[1], flag: info.editingText});
             } else {
-                if(valueType == 'Number') value = parseInt(info.editingText);
+                if(value && valueType == 'Number') value = parseInt(info.editingText);
                 setFee(data.data, fieldName, value);
             }
             var updateData = [data];
@@ -342,18 +342,6 @@ $(document).ready(function () {
                 for (iCol = 0; iCol < info.cellRange.colCount; iCol++) {
                     curCol = info.cellRange.col + iCol;
                     value = info.sheet.getText(curRow, curCol);
-                   /* curCol = info.cellRange.col + iCol;
-                    fieldName = controller.setting.cols[curCol].data.field;
-                    valueType = controller.setting.cols[curCol].data.type;
-                    value = info.sheet.getText(curRow, curCol);
-                    if (/flagsIndex/.test(fieldName)) {
-                        data.data.flags = [];
-                        let flagField = fieldName.split('.');
-                        data.data.flags.push({fieldName: flagField[1],flag: value});
-                    } else {
-                        if(valueType == 'Number') value = parseInt(value);
-                        setFee(data.data, fieldName, value);
-                    }*/
                     setUpdateData(node,data,curCol,value,controller.setting);
                 }
                 datas.push(data);
@@ -367,7 +355,27 @@ $(document).ready(function () {
         });
     });
     billsSpread.bind(GC.Spread.Sheets.Events.RangeChanged, function (e,info) {
-        console.log(info);
+        let datas = [];
+        let changGroup = _.groupBy(info.changedCells,'row');
+        for(let row in changGroup){
+            let node = controller.tree.items[row];
+            if (node) {
+                let data = {type: 'update', data: {ID: node.getID()}};
+                for (let cell of changGroup[row]) {
+                    let value = info.sheet.getText(cell.row, cell.col);
+                    if(value=="") value = null;
+                    setUpdateData(node,data,cell.col,value,controller.setting);
+                }
+                datas.push(data);
+            }
+        }
+        CommonAjax.post(updateUrl, datas, function (data) {
+            RefreshBillsData(data);
+            controller.showTreeData();
+        }, function () {
+            controller.showTreeData();
+        });
+
     });
     tree.loadDatas(templateData);
     controller.showTreeData();