首页 发现 帮助
登录
SmartCost
/
ConstructionCost
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

①计算程序窗口下端内容显示重复的问题。
②字段类别下拉选项动态装载。

Chenshilong 7 年之前
父节点
319e82d4f0
当前提交
eb06f750fc
共有 3 个文件被更改，包括 24 次插入 和 16 次删除
合并视图 显示文件统计
  1. 2 0
      public/calc_util.js
  2. 12 15
      web/building_saas/main/html/calc_program_manage.html
  3. 10 1
      web/building_saas/main/js/views/calc_program_manage.js

+ 2 - 0
public/calc_util.js
查看文件 

@@ -203,9 +203,11 @@ class Calculation {
 
         let private_compile_feeType = function() {
 
         let private_compile_feeType = function() {
 
             if (feeTypes) {
 
             if (feeTypes) {
 
                 me.compiledFeeTypes = {};
 
                 me.compiledFeeTypes = {};
 
+                me.compiledFeeTypeNames = [];
 
                 for (let ft of feeTypes) {
 
                 for (let ft of feeTypes) {
 
                     me.compiledFeeTypes[ft.type] = ft.name;
 
                     me.compiledFeeTypes[ft.type] = ft.name;
 
                     me.compiledFeeTypes[ft.name] = ft.type;    // 中文预编译，可靠性有待验证
 
                     me.compiledFeeTypes[ft.name] = ft.type;    // 中文预编译，可靠性有待验证
 
+                    me.compiledFeeTypeNames.push(ft.name);
 
                 }
 
                 }
 
             }
 
             }
 
         };
 
         };

+ 12 - 15
web/building_saas/main/html/calc_program_manage.html
查看文件 

@@ -8,26 +8,23 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-    <div class="main">
 
-        <div class="content">
 
-            <div class="toolsbar">
 
+    <div class="toolsbar px-1">
 
+    </div>
 
+    <div class="container-fluid">
 
+        <div class="row">
 
+        <div class="col-lg-3 p-0">
 
+            <div class="main-data-full" id="mainSpread">
 
             </div>
 
             </div>
 
-            <div class="container-fluid">
 
-                <div class="row">
 
-                  <div class="col-lg-3 p-0">
 
-                    <div class="main-data-full" id="mainSpread">
 
-                     </div>
 
-                   </div>
 
-                  <div class="col-lg-9 p-0">
 
-                    <div class="main-data-full" id="detailSpread">
 
-                    </div>
 
-                  </div>
 
-                </div>
 
+        </div>
 
+        <div class="col-lg-9 p-0">
 
+            <div class="main-data-full" id="detailSpread">
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
+    </div>
 
+
 
     <!--弹出 计算基数-->
 
     <!--弹出 计算基数-->
 
-    <div class="modal fade" id="jsjs" data-backdrop="static">
 
+<div class="modal fade" id="jsjs" data-backdrop="static">
 
         <div class="modal-dialog" role="document">
 
         <div class="modal-dialog" role="document">
 
             <div class="modal-content">
 
             <div class="modal-content">
 
                 <div class="modal-header">
 
                 <div class="modal-header">

+ 10 - 1
web/building_saas/main/js/views/calc_program_manage.js
查看文件 

@@ -38,11 +38,20 @@ let rationPM = {
 
     buildSheet: function (){
 
     buildSheet: function (){
 
         let me = this;
 
         let me = this;
 
         me.datas = calcTemplates;
 
         me.datas = calcTemplates;
 
+        if (me.mainSpread) {
 
+            me.mainSpread.destroy();
 
+            me.mainSpread = null;
 
+        };
 
+        if (me.detailSpread) {
 
+            me.detailSpread.destroy();
 
+            me.detailSpread = null;
 
+        };
 
         me.mainSpread = sheetCommonObj.buildSheet($('#mainSpread')[0], me.mainSetting, me.datas.length);
 
         me.mainSpread = sheetCommonObj.buildSheet($('#mainSpread')[0], me.mainSetting, me.datas.length);
 
         me.detailSpread = sheetCommonObj.buildSheet($('#detailSpread')[0], me.detailSetting, me.datas[0].calcItems.length);
 
         me.detailSpread = sheetCommonObj.buildSheet($('#detailSpread')[0], me.detailSetting, me.datas[0].calcItems.length);
 
 
 
         var fieldName = new GC.Spread.Sheets.CellTypes.ComboBox();
 
         var fieldName = new GC.Spread.Sheets.CellTypes.ComboBox();
 
-        fieldName.items(["直接费","人工费","材料费","机械费","主材费","企业管理费","利润","风险费","人工价差","材料价差","机械价差","工程造价","调整人工费","调整机上人工费","甲供材料费"]);
 
+        fieldName.items(projectObj.project.calcProgram.calc.compiledFeeTypeNames);
 
+        // fieldName.items(["直接费","人工费","材料费","机械费","主材费","企业管理费","利润","风险费","人工价差","材料价差","机械价差","工程造价","调整人工费","调整机上人工费","甲供材料费"]);
 
         me.detailSpread.getSheet(0).getRange(-1, 5, -1, 1).cellType(fieldName);
 
         me.detailSpread.getSheet(0).getRange(-1, 5, -1, 1).cellType(fieldName);
 
 
 
         me.mainSpread.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onMainEnterCell);
 
         me.mainSpread.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onMainEnterCell);