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

public/web/common_util.js

@@ -50,4 +50,10 @@ function seqString(num,length){
         numstr = "0" + numstr;
     }
     return numstr;
+};
+
+function customRowHeader(sheet, dataLength) {
+    for (let i = 0; i < dataLength; i++) {
+        sheet.setValue(i, 0, `F${i + 1}`, GC.Spread.Sheets.SheetArea.rowHeader);
+    }
 }

web/building_saas/main/js/views/calc_program_manage.js

@@ -70,7 +70,7 @@ let calcProgramManage = {
         feeRateObject.setFeeRateCellCol(dSheet,_.findIndex(me.detailSetting.header,{'dataCode':'feeRate'}));
         dSheet.getRange(-1, _.findIndex(me.detailSetting.header, {'dataCode': 'dispExprUser'}), -1, 1).cellType(calcBaseView.getCalcBaseCellType('ration'));
         sheetCommonObj.showData(dSheet, me.detailSetting, me.datas[0].calcItems);
-
+        customRowHeader(dSheet, me.datas[0].calcItems.length);
         if(!projectReadOnly){
             me.loadMainContextMenu();
             me.loadDetailContextMenu();
@@ -111,6 +111,7 @@ let calcProgramManage = {
         var dData = me.datas[row].calcItems;
         dSheet.setRowCount(dData.length, GC.Spread.Sheets.SheetArea.viewport);
         sheetCommonObj.showData(dSheet, me.detailSetting, dData);
+        customRowHeader(dSheet, dData.length);
         me.detailSpread.resumePaint();
     },
     onRangeChanged:function (sender,args) {
@@ -502,9 +503,9 @@ let calcProgramManage = {
             let detailSheet = me.detailSpread.getActiveSheet();
             detailSheet.setRowCount(calcItems.length);
             sheetCommonObj.showData(detailSheet, me.detailSetting, calcItems);
+            customRowHeader(detailSheet, calcItems.length);
         }
     }
-
 };
 
 $(document).ready(function(){

web/building_saas/main/js/views/calc_program_view.js

@@ -62,12 +62,14 @@ let calcProgramObj = {
         me.datas = treeNode.data.calcTemplate ? treeNode.data.calcTemplate.calcItems : [];
         sheetCommonObj.initSheet(me.sheet, me.setting, me.datas.length);
         sheetCommonObj.showData(me.sheet, me.setting, me.datas);
+        customRowHeader(me.sheet, me.datas.length);
     },
 
     clearData: function (){
         var me = this;
         me.treeNode = null;
         sheetCommonObj.cleanSheet(me.sheet, me.setting, -1);
+        customRowHeader(me.sheet, me.datas.length);
     }
 };
 

web/building_saas/main/js/views/project_view.js

@@ -1666,6 +1666,9 @@ $('#downLevel').click(function () {
         projectObj.converseCalculateBills(selected.parent);
     }
 });
+$('#insertRation').click(function () {
+    projectObj.project.Ration.addNewRation(null,rationType.ration);
+});
 $('#upMove').click(function () {
     var controller = projectObj.mainController, project = projectObj.project;
     var selected = controller.tree.selected, pre = selected.preSibling, preSerialNo;