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

定额计算基数选择。

chenshilong 7 年之前
父节点
c91274361f
当前提交
aa0644ff2b
共有 4 个文件被更改，包括 14 次插入 和 71 次删除
合并视图 显示文件统计
  1. 3 66
      web/building_saas/main/html/calc_program_manage.html
  2. 1 1
      web/building_saas/main/js/models/calc_program.js
  3. 9 4
      web/building_saas/main/js/views/calc_base_view.js
  4. 1 0
      web/building_saas/main/js/views/calc_program_manage.js

+ 3 - 66
web/building_saas/main/html/calc_program_manage.html
查看文件 

@@ -8,9 +8,9 @@
 
 </head>
 
 </head>
 
 
 
 <body>
 
 <body>
 
-<div style="">
 
-    <img id="f_btn" src="/web/dest/css/img/feeRate_btn.jpg" alt="" style="display: none" />
 
-</div>
 
+    <div style="">
 
+        <img id="f_btn" src="/web/dest/css/img/feeRate_btn.jpg" alt="" style="display: none" />
 
+    </div>
 
     <div class="toolsbar px-1">
 
     <div class="toolsbar px-1">
 
     </div>
 
     </div>
 
     <div class="container-fluid">
 
     <div class="container-fluid">
 
@@ -25,69 +25,6 @@
 
             </div>
 
             </div>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
-
 
-    <!--弹出 计算基数-->
 
-<div class="modal fade" id="jsjs" data-backdrop="static">
 
-        <div class="modal-dialog" role="document">
 
-            <div class="modal-content">
 
-                <div class="modal-header">
 
-                  <h5 class="modal-title">计算基础选择</h5>
 
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
 
-                    <span aria-hidden="true">&times;</span>
 
-                  </button>
 
-                </div>
 
-                <div class="modal-body">
 
-                  <div class="form-group">
 
-                    <input class="form-control" value="分部分项工程费+100">
 
-                    <p class="form-text">
 
-                      <button class="btn btn-secondary btn-sm">+</button>
 
-                      <button class="btn btn-secondary btn-sm">-</button>
 
-                      <button class="btn btn-secondary btn-sm">*</button>
 
-                      <button class="btn btn-secondary btn-sm">/</button>
 
-                      <button class="btn btn-secondary btn-sm">(</button>
 
-                      <button class="btn btn-secondary btn-sm">)</button>
 
-                    </p>
 
-                  </div>
 
-                  <div class=" modal-auto-height">
 
-                    <table class="table table-sm table-bordered">
 
-                      <thead>
 
-                        <tr><th></th><th>计算基础名称</th><th>金额</th></tr>
 
-                      </thead>
 
-                      <tbody>
 
-                        <tr>
 
-                          <td>1</td><td><button class="btn btn-secondary btn-sm">分部分项工程费</button></td><td>1000.16</td>
 
-                        </tr>
 
-                        <tr>
 
-                          <td>2</td><td><button class="btn btn-secondary btn-sm">分部分项基价直接工程费</button></td><td>600.16</td>
 
-                        </tr>
 
-                        <tr>
 
-                          <td>3</td><td><button class="btn btn-secondary btn-sm">分部分项基价人工费</button></td><td>100.16</td>
 
-                        </tr>
 
-                        <tr>
 
-                          <td>4</td><td><button class="btn btn-secondary btn-sm">分部分项基价材料费</button></td><td>200.16</td>
 
-                        </tr>
 
-                        <tr>
 
-                          <td>5</td><td><button class="btn btn-secondary btn-sm">分部分项基价机械费</button></td><td>300.16</td>
 
-                        </tr>
 
-                        <tr>
 
-                          <td>6</td><td><button class="btn btn-secondary btn-sm">分部分项调整人工费</button></td><td>100.16</td>
 
-                        </tr>
 
-                        <tr>
 
-                          <td>7</td><td><button class="btn btn-secondary btn-sm">分部分项调整机人工费</button></td><td>50.16</td>
 
-                        </tr>
 
-                      </tbody>
 
-                    </table>
 
-                    <p></p>
 
-                      <p></p>
 
-                  </div>
 
-                </div>
 
-                <div class="modal-footer">
 
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
 
-                    <a href="" class="btn btn-primary">确定</a>
 
-                </div>
 
-            </div>
 
-        </div>
 
-    </div>
 
 </body>
 
 </body>

+ 1 - 1
web/building_saas/main/js/models/calc_program.js
查看文件 

@@ -982,7 +982,7 @@ class CalcProgram {
 
             let nodes = (treeNode.calcType == treeNodeCalcType.ctGatherBillsFees) ? treeNode.children : me.project.Ration.getRationNodes(treeNode);
 
             let nodes = (treeNode.calcType == treeNodeCalcType.ctGatherBillsFees) ? treeNode.children : me.project.Ration.getRationNodes(treeNode);
 
             let rst = [];
 
             let rst = [];
 
             for (let ft of cpFeeTypes) {
 
             for (let ft of cpFeeTypes) {
 
-                let isEstimate = ft.name == '暂估费';
 
+                let isEstimate = ft.type == 'estimate';
 
                 let ftObj = {};
 
                 let ftObj = {};
 
                 ftObj.fieldName = ft.type;
 
                 ftObj.fieldName = ft.type;
 
                 ftObj.name = ft.name;
 
                 ftObj.name = ft.name;

+ 9 - 4
web/building_saas/main/js/views/calc_base_view.js
查看文件 

@@ -18,7 +18,7 @@ let calcBaseView = {
 
             {name: '金额', dataCode: 'price', width: 120, vAlign: 'center', hAlign: 'right'}
 
             {name: '金额', dataCode: 'price', width: 120, vAlign: 'center', hAlign: 'right'}
 
         ],
 
         ],
 
         rationHeader: [
 
         rationHeader: [
 
-
 
+            {name: '定额计算程序基数名称', dataCode: 'base', width: 400, vAlign: 'center', hAlign: 'left'}
 
         ],
 
         ],
 
         options: {
 
         options: {
 
             tabStripVisible:  false,
 
             tabStripVisible:  false,
 
@@ -30,7 +30,7 @@ let calcBaseView = {
 
         },
 
         },
 
         locked: {
 
         locked: {
 
             rows: [],
 
             rows: [],
 
-            cols: [0, 1]
 
+            cols: [0]
 
         }
 
         }
 
     },
 
     },
 
 
 
@@ -152,7 +152,12 @@ let calcBaseView = {
 
             showDatas = me.toViewData(baseObj);
 
             showDatas = me.toViewData(baseObj);
 
         }
 
         }
 
         else{//ration
 
         else{//ration
 
-
 
+            let bnArr = Object.keys(rationCalcBases);
 
+            let baseArr = [];
 
+            for (let bn of bnArr){
 
+                 baseArr.push({base: bn})
 
+            };
 
+            showDatas = baseArr;
 
         }
 
         }
 
         me.buildSheet();
 
         me.buildSheet();
 
         me.showData(showDatas);
 
         me.showData(showDatas);
 
@@ -246,7 +251,7 @@ let calcBaseView = {
 
                 if(calcBaseView.editingCell.row==options.row&&calcBaseView.editingCell.col==options.col){
 
                 if(calcBaseView.editingCell.row==options.row&&calcBaseView.editingCell.col==options.col){
 
                     var image = document.getElementById('f_btn'),imageMagin = 3;
 
                     var image = document.getElementById('f_btn'),imageMagin = 3;
 
                     var imageHeight = h-2*imageMagin;
 
                     var imageHeight = h-2*imageMagin;
 
-                    var imageWidth = w*2/7;
 
+                    var imageWidth = w*2/(type=='bills'?7:20);
 
                     var imageX = x + w - imageWidth- imageMagin, imageY = y + h / 2 - imageHeight / 2;
 
                     var imageX = x + w - imageWidth- imageMagin, imageY = y + h / 2 - imageHeight / 2;
 
                     ctx.save();
 
                     ctx.save();
 
                     ctx.drawImage(image, imageX, imageY,imageWidth,imageHeight);
 
                     ctx.drawImage(image, imageX, imageY,imageWidth,imageHeight);

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

@@ -66,6 +66,7 @@ let calcProgramManage = {
 
 
 
         let dSheet = me.detailSpread.getSheet(0);
 
         let dSheet = me.detailSpread.getSheet(0);
 
         feeRateObject.setFeeRateCellCol(dSheet,_.findIndex(me.detailSetting.header,{'dataCode':'feeRate'}));
 
         feeRateObject.setFeeRateCellCol(dSheet,_.findIndex(me.detailSetting.header,{'dataCode':'feeRate'}));
 
+        dSheet.getRange(-1, _.findIndex(me.detailSetting.header, {'dataCode': 'dispExprUser'}), -1, 1).cellType(calcBaseView.getCalcBaseCellType('ration'));
 
         dSheet.name('calc_detail');
 
         dSheet.name('calc_detail');
 
         sheetCommonObj.showData(dSheet, me.detailSetting, me.datas[0].calcItems);
 
         sheetCommonObj.showData(dSheet, me.detailSetting, me.datas[0].calcItems);
 
     },
 
     },