7 年之前 · a694e7bc2a
--- a/public/web/sheet/sheet_common.js
+++ b/public/web/sheet/sheet_common.js
@@ -193,7 +193,7 @@ var sheetCommonObj = {
 
																             sheet.options.isProtected = true;
															
 
																             sheet.getRange(-1, 0, -1, setting.header.length, GC.Spread.Sheets.SheetArea.viewport).locked(false);
															
 
																             for (var i = 0; i < setting.view.lockColumns.length; i++) {
															
 
																-                sheet.getRange(-1,setting.view.lockColumns[i] , -1, 1, GC.Spread.Sheets.SheetArea.viewport).locked(true);
															
 
																+                sheet.getRange(-1,setting.view.lockColumns[i], -1, 1, GC.Spread.Sheets.SheetArea.viewport).locked(true);
															
 
																             }
															
 
																         }
															
 
																     },
															
--- a/web/building_saas/main/html/calc_program_manage.html
+++ b/web/building_saas/main/html/calc_program_manage.html
@@ -9,7 +9,7 @@
 
																 <body>
															
 
																 <div style="">
															
 
																-    <img id="f_btn" src="/web/dest/css/img/feeRate_btn.jpg" alt="" style="display: none" />
															
 
																+    <img id="f_btn" src="/web/dest/css/img/feeRate_btn.jpg" alt="" style="display: block" />
															
 
																 </div>
															
 
																     <div class="toolsbar px-1">
															
 
																     </div>
															
--- a/web/building_saas/main/js/models/main_consts.js
+++ b/web/building_saas/main/js/models/main_consts.js
@@ -30,7 +30,7 @@ const CP_Col_Width = {          // 多处计算程序界面的列宽统一设置
 
																     feeRate: 60,
															
 
																     displayFieldName: 120,
															
 
																     statement: 380,
															
 
																-    memo: 100,
															
 
																-    unitFee: 100,
															
 
																-    totalFee: 100
															
 
																+    memo: 110,
															
 
																+    unitFee: 90,
															
 
																+    totalFee: 90
															
 
																 };
															
--- a/web/building_saas/main/js/views/calc_program_manage.js
+++ b/web/building_saas/main/js/views/calc_program_manage.js
@@ -33,7 +33,7 @@ let rationPM = {
 
																         ],
															
 
																         view:{
															
 
																             comboBox:[],
															
 
																-            lockColumns:[0,1,2,3,6],
															
 
																+            lockColumns:[0,1,2,3,5,6],
															
 
																             colHeaderHeight: CP_Col_Width.colHeader,
															
 
																             rowHeaderWidth: CP_Col_Width.rowHeader
															
 
																         }
															
--- a/web/building_saas/main/js/views/calc_program_view.js
+++ b/web/building_saas/main/js/views/calc_program_view.js
@@ -204,15 +204,16 @@ let calcProgramObj = {
 
																             {headerName: "费用代号", headerWidth: CP_Col_Width.code, dataCode: "code", dataType: "String", hAlign: "left"},
															
 
																             {headerName: "费用名称", headerWidth: CP_Col_Width.name, dataCode: "name", dataType: "String"},
															
 
																             {headerName: "计算基数", headerWidth: CP_Col_Width.dispExprUser, dataCode: "dispExprUser", dataType: "String"},
															
 
																-            {headerName: "基数说明", headerWidth: CP_Col_Width.statement, dataCode: "statement", dataType: "String"},
															
 
																             {headerName: "费率", headerWidth: CP_Col_Width.feeRate, dataCode: "feeRate", dataType: "Number"},   // precision: 3
															
 
																+            {headerName:"费用类别", headerWidth:CP_Col_Width.displayFieldName, dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
															
 
																+            {headerName: "基数说明", headerWidth: CP_Col_Width.statement, dataCode: "statement", dataType: "String"},
															
 
																             {headerName: "单价", headerWidth: CP_Col_Width.unitFee, dataCode: "unitFee", dataType: "Number"},  // execRst
															
 
																             {headerName: "合价", headerWidth: CP_Col_Width.totalFee, dataCode: "totalFee", dataType: "Number"},
															
 
																             {headerName: "备注", headerWidth: CP_Col_Width.memo, dataCode: "memo", dataType: "String"}
															
 
																         ],
															
 
																         view: {
															
 
																             comboBox: [],
															
 
																-            lockColumns: [0, 1, 2, 3, 4, 5, 6, 7],
															
 
																+            lockColumns: [0,1,2,3,4,5,6,7,8],
															
 
																             colHeaderHeight: CP_Col_Width.colHeader,
															
 
																             rowHeaderWidth: CP_Col_Width.rowHeader
															
 
																         }
															
--- a/web/building_saas/main/js/views/project_property_labour_coe_view.js
+++ b/web/building_saas/main/js/views/project_property_labour_coe_view.js
@@ -37,7 +37,6 @@ let labourCoeView = {
 
																         me.spread.options.tabStripVisible = false;
															
 
																         me.spread.options.showVerticalScrollbar = false;
															
 
																         me.spread.options.showHorizontalScrollbar = false;
															
 
																-        me.spread.options.rowHeight = 50;
															
 
																         let sheetArea = GC.Spread.Sheets.SheetArea;
															
 
																         let sheet = me.spread.getSheet(0);
															
 
																         me.sheet = sheet;