소스 검색

add fixedFlag: ENGINEERINGCOST

zhongzewei 8 년 전
부모
커밋
ea9dd98706
2개의 변경된 파일13개의 추가작업 그리고 3개의 파일을 삭제
  1. 5 2
      modules/common/const/bills_fixed.js
  2. 8 1
      web/maintain/ration_repository/js/ration.js

+ 5 - 2
modules/common/const/bills_fixed.js

@@ -38,7 +38,9 @@ const fixedFlag = {
     // 工程排污费 charges for disposing pollutants
     POLLUTANTS: 17,
     // 税金
-    TAX: 18
+    TAX: 18,
+    //工程造价
+    ENGINEERINGCOST: 19
 };
 const fixedFlagList = [
     {name: "分部分项工程", value: fixedFlag.SUB_ENGINERRING},
@@ -58,7 +60,8 @@ const fixedFlagList = [
     {name: "规费", value: fixedFlag.CHARGE},
     {name: "社会保险费及住房公积金", value: fixedFlag.SOCIAL_INSURANCE_HOUSING_FUND},
     {name: "工程排污费", value: fixedFlag.POLLUTANTS},
-    {name: "税金", value: fixedFlag.TAX}
+    {name: "税金", value: fixedFlag.TAX},
+    {name: "工程造价", value: fixedFlag.ENGINEERINGCOST}
 ];
 
 export {fixedFlag as default, fixedFlagList as List};

+ 8 - 1
web/maintain/ration_repository/js/ration.js

@@ -57,6 +57,7 @@ let rationOprObj = {
         me.rationDelOpr();
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.ClipboardPasting, me.onClipboardPasting);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.ClipboardPasted, me.onClipboardPasted);
+        me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.LeaveCell, me.onLeaveCell);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onEnterCell);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditStarting, me.onCellEditStart);
         me.workBook.getSheet(0).bind(GC.Spread.Sheets.Events.EditEnded, me.onCellEditEnd);
@@ -196,9 +197,15 @@ let rationOprObj = {
         me.workBook.commandManager().setShortcutKey(null, GC.Spread.Commands.Key.del, false, false, false, false);
         me.workBook.commandManager().setShortcutKey('rationDelete', GC.Spread.Commands.Key.del, false, false, false, false);
     },
+    onLeaveCell: function (sender, args) {
+        let me = rationOprObj;
+        me.lastCol = me.setting.header[args.col];
+    },
     onEnterCell: function (sender, args) {
         let me = rationOprObj;
-        args.sheet.repaint();
+        if(me.setting.header[args.col]['dataCode'] === 'unit' || me.lastCol.dataCode === 'unit'){
+            args.sheet.repaint();
+        }
         me.cellRowIdx = args.row;
         let isHasData = false;
         if(me.addRationItem){