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

web/maintain/bills_lib/scripts/db_controller.js

@@ -2082,19 +2082,24 @@ var valueController = {
         if(field === 'value'){
             var newCode = valueController.getCode(totalItems, id);
             newData = {code: newCode, value: newValue};
-            tools.reSetCell(sheet, sheet.getActiveRowIndex(), 0, newCode, newCode);
+            totalItems.findItem(id).data.itemValue.push(newData);
+            let valueArr = valueController.getValues(totalItems, id);
+            tools.reshowValue(args.sheet, valueArr, eigenValueSetting, true);
+           // tools.reSetCell(sheet, sheet.getActiveRowIndex(), 0, newCode, newCode);
         }
         else {
             if(!isNaN(newValue)){
                 newData = {code: newValue, value: ''};
-                tools.reSetCell(sheet, sheet.getActiveRowIndex(), null, null, newValue);
+                totalItems.findItem(id).data.itemValue.push(newData);
+                let valueArr = valueController.getValues(totalItems, id);
+                tools.reshowValue(args.sheet, valueArr, eigenValueSetting, true);
+                //tools.reSetCell(sheet, sheet.getActiveRowIndex(), null, null, newValue);
             }
             else {
                 //编号只能为数字!
                 sheet.getCell(args.row, args.col).value('');
             }
         }
-        totalItems.findItem(id).data.itemValue.push(newData);
         itemsAjax.updateValue(userAccount, billsLibId, id, newData, null, 'create');
         valueDatas = tools.getsheetDatas(sheet, 'total');
     },
@@ -2130,6 +2135,7 @@ var valueController = {
                     });
                     itemVals.splice(index, 0, updateEle);
                 }
+                tools.reshowValue(args.sheet, itemVals, eigenValueSetting, true);
                 itemsAjax.updateValue(userAccount, billsLibId, selectedId, updateData, null, 'update');
             }
             else {

web/maintain/ration_repository/js/ration_glj.js

@@ -78,7 +78,7 @@ var rationGLJOprObj = {
         var me = this;
         me.sheet = sheet;
         me.getGljDistType(function () {
-            me.onContextmenuOpr();
+           // me.onContextmenuOpr();
             sheetCommonObj.initSheet(me.sheet, me.setting, 30);
             me.bindRationGljDelOpr();
             me.sheet.bind(GC.Spread.Sheets.Events.ClipboardPasting, me.onClipboardPasting);

web/maintain/std_glj_lib/html/gongliao.html

@@ -37,10 +37,11 @@
         <div class="content">
             <div class="container-fluid">
                 <div class="row">
+                    <!--org 3:7:2-->
                   <div class="main-side col-lg-3 p-0" style="width: 100%; height: 100%; overflow-y: auto">
                         <ul id="repositoryTree" class="ztree"></ul>
                   </div>
-                  <div class="main-content col-lg-7 p-0">
+                  <div class="main-content col-lg-6 p-0">
                     <div id="GLJListSheet" class="main-data">
                       <!--<table class="table table-sm table-bordered m-0">
                       <thead>
@@ -113,7 +114,7 @@
                     </table>-->
                     </div>
                   </div>
-                    <div id="gljComponentSheet" class="main-side col-lg-2 p-0">
+                    <div id="gljComponentSheet" class="main-side col-lg-3 p-0">
                      <!-- <table class="table table-sm table-bordered m-0">
                         <thead>
                           <tr><th></th><th>编码</th><th>名称</th><th>计量单位</th><th>单价</th><th>消耗量</th></tr>

web/maintain/std_glj_lib/js/glj.js

@@ -41,7 +41,7 @@ let repositoryGljObj = {
     distTypeTree: null,//add
     setting: {
         owner: "glj",
-        header:[
+        /*header:[
             {headerName:"编码",headerWidth:120,dataCode:"code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
             {headerName:"名称",headerWidth:260,dataCode:"name", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
             {headerName:"规格型号",headerWidth:220,dataCode:"specs", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
@@ -49,6 +49,15 @@ let repositoryGljObj = {
             {headerName:"基价单价",headerWidth:120,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
             {headerName:"类型",headerWidth:120,dataCode:"gljType", dataType: "String", hAlign: "center", vAlign: "center"},
             {headerName:"调整系数",headerWidth:80,dataCode:"adjCoe", dataType: "Number", hAlign: "center", vAlign: "center"},
+        ],*/
+        header:[
+            {headerName:"编码",headerWidth:80,dataCode:"code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName:"名称",headerWidth:160,dataCode:"name", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName:"规格型号",headerWidth:120,dataCode:"specs", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName:"单位",headerWidth:45,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName:"基价单价",headerWidth:80,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
+            {headerName:"类型",headerWidth:90,dataCode:"gljType", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName:"调整系数",headerWidth:60,dataCode:"adjCoe", dataType: "Number", hAlign: "center", vAlign: "center"},
         ],
         view:{
             comboBox:[

web/maintain/std_glj_lib/js/gljComponent.js

@@ -6,12 +6,19 @@ let gljComponentOprObj = {
     workBook: null,
     setting: {
         owner: "gljComponent",
-        header:[
+      /*  header:[
             {headerName:"编码",headerWidth:50,dataCode:"code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
             {headerName:"名称",headerWidth:60,dataCode:"name", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
             {headerName:"单位",headerWidth:60,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
             {headerName:"单价",headerWidth:50,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
             {headerName:"消耗量",headerWidth:55,dataCode:"consumeAmt", dataType: "Number", formatter: "0.000", hAlign: "right", vAlign: "center"}
+        ],*/
+        header:[
+            {headerName:"编码",headerWidth:80,dataCode:"code", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName:"名称",headerWidth:90,dataCode:"name", dataType: "String", formatter: "@", hAlign: "left", vAlign: "center"},
+            {headerName:"单位",headerWidth:45,dataCode:"unit", dataType: "String", hAlign: "center", vAlign: "center"},
+            {headerName:"单价",headerWidth:60,dataCode:"basePrice", dataType: "Number", formatter: "0.00", hAlign: "right", vAlign: "center"},
+            {headerName:"消耗量",headerWidth:70,dataCode:"consumeAmt", dataType: "Number", formatter: "0.000", hAlign: "right", vAlign: "center"}
         ],
         view: {
             lockedCols:[1, 2, 3]
@@ -309,8 +316,10 @@ let gljComponentOprObj = {
         }
         else if(args.col === 4 && me.currentEditingComponent.code && args.editingText && args.editingText.trim().length > 0){//消耗量
             let consumeAmt = parseFloat(args.editingText);
+            console.log(consumeAmt);
             if(!isNaN(consumeAmt) && consumeAmt !== me.currentEditingComponent.consumeAmt){
-                let roundCons = scMathUtil.roundTo(consumeAmt, -3);
+                let roundCons = scMathUtil.roundTo(parseFloat(consumeAmt), -3);
+                console.log(roundCons);
                 let component = that.currentGlj.component;
                 for(let i = 0; i < component.length; i++){
                     if(component[i].ID === that.currentComponent[args.row].ID){
@@ -430,7 +439,7 @@ let gljComponentOprObj = {
                 if(row + i < that.currentComponent.length){
                     let currentObj = that.currentComponent[row + i];
                     if(items[i].consumeAmt.trim().length > 0 && items[i].consumeAmt !== currentObj.consumeAmt){
-                        let roundCons = scMathUtil.roundTo(items[i].consumeAmt, -3);
+                        let roundCons = scMathUtil.roundTo(parseFloat(items[i].consumeAmt), -3);
                         isChange = true;
                         currentObj.consumeAmt = roundCons;
                         for(let j = 0; j < component.length; j++){
@@ -489,8 +498,8 @@ let gljComponentOprObj = {
     reCalGljBasePrc: function (component) {
         let me = gljComponentOprObj, gljBasePrc = 0;
         for(let i = 0; i < component.length; i++){
-            let roundBasePrc = scMathUtil.roundTo(component[i].basePrice, -2);
-            gljBasePrc += scMathUtil.roundTo(roundBasePrc * component[i].consumeAmt, -2);
+            let roundBasePrc = scMathUtil.roundTo(parseFloat(component[i].basePrice), -2);
+            gljBasePrc += scMathUtil.roundTo(roundBasePrc * parseFloat(component[i].consumeAmt), -2);
         }
         return gljBasePrc;
     }