feat: 设备购置，以及造价书页面的隐藏调整

modules/all_models/equipment_purchase.js

@@ -9,6 +9,9 @@ let equipment = {
     name:String,
     unit:String,
     quantity:Number,
+    originalPrice:Number,//设备价格-设备原价
+    freight:Number,//设备运杂费
+    sparePartCost:Number,//备品备件费
     unitPrice:Number,//单价
     totalPrice:Number,//金额
     remark:String

web/building_saas/main/html/main.html

@@ -118,9 +118,9 @@
                 data-placement="bottom" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
               <a href="javascript:void(0)" class="btn btn-light btn-sm" id="downMove" data-toggle="tooltip"
                 data-placement="bottom" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
-              <a id="switchTznr" href="javascript:void(0);" class="btn btn-light btn-sm"><i class="fa fa-eye"
-                aria-hidden="true"></i> 显示特征</a> 
-              <div class="btn-group "><!--旧的添加类名： ml-2 -->
+             <!--  <a id="switchTznr" href="javascript:void(0);" class="btn btn-light btn-sm"><i class="fa fa-eye"
+                aria-hidden="true"></i> 显示特征</a>  -->
+             <!--  <div class="btn-group ">
                 <a class="dropdown-toggle btn btn-light btn-sm" data-toggle="dropdown" href="#" id="moreMenuA" role="button"
                   aria-haspopup="true" aria-expanded="false">更多</a>
                 <div class="dropdown-menu dropright" id="moreMenu">
@@ -138,18 +138,6 @@
                     <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayZM">子目</a>
                     <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayZD">最底层</a>
                   </div>
-                  <!-- <a href="javascript:void(0);" id="ZLFB_btn" class="dropdown-item" data-placement="bottom"><i class="fa fa-retweet" aria-hidden="true"></i> 整理清单</a> -->
-                 <!--  <a  href="javascript:void(0);" id="ZLFB_MENU" data-toggle="dropdown"  class="dropdown-item dropdown-toggle"><i class="fa fa-retweet" aria-hidden="true"></i> 整理清单</a>
-                  <div style="position: relative;">
-                    <div id="ZLFB_MENU_sub" class="dropdown-menu dropdown-menu-left"
-                    style="min-width: 6.5rem; position: absolute; transform: translate3d(158px, 3px, 0px); top: -40px; left: 0px; will-change: transform;"
-                    x-placement="right-start">
-                    <a class="dropdown-item btn-sm" href="javascript:void(0);" id="ZLFB_btn" >分部整理</a>
-                    <a class="dropdown-item btn-sm" href="javascript:void(0);" id="ZLQD_btn" >清单整理</a>
-                  
-                  </div>
-                  </div> -->
-
                   <% if (region === '重庆市' || region === '广东省') { %>
                   <a id="interface-dropdown" href="javascript:void(0);" data-toggle="dropdown"
                     class="dropdown-item dropdown-toggle"><i class="fa fa-list-ol"></i> 数据接口...</a>
@@ -173,18 +161,15 @@
                   <a href="javascript:void(0)" class="dropdown-item" name="lockBills"> <i class="fa fa-lock"
                       aria-hidden="true"></i> 锁定清单</a>
                   <% } %>
-               <!-- 2020-11-30 移至更多左边 
-                     <a id="switchTznr" href="javascript:void(0);" class="dropdown-item"><i class="fa fa-eye"
-                      aria-hidden="true"></i> 显示特征</a> -->
                   <a id="menu_calc_program_manage" href="javascript:void(0);" class="dropdown-item"><i
                       class="fa fa-calculator" aria-hidden="true"></i> 总计算程序</a>
                   <a id="menu_index_info" href="javascript:void(0);" style="display: none" class="dropdown-item"><i
                       class="fa fa-database" aria-hidden="true"></i> 指标信息</a>
                 </div>
-              </div>
-              <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-sub">分项</a>
+              </div> -->
+             <!--  <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-sub">分项</a>
               <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-measure">措施</a>
-              <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-other">其他</a>
+              <a href="javascript:void(0)" class="btn btn-light btn-sm" id="locate-other">其他</a> -->
               <!--   <span class="btn btn-light btn-sm">
                       <a href="" data-toggle="dropdown"><span data-placement="bottom"><i class="fa fa-list-ol"></i></span> 显示至...</a>
                       <div class="dropdown-menu dropdown-menu-left" style="min-width: 6.5rem">
@@ -255,14 +240,14 @@
                 <div class="resize-y" id="mainVerticalResize"></div>
                 <div class="bottom-content" id="bottom_div">
                   <ul class="nav nav-tabs" role="tablist" id="bottom_div_ul">
-                    <li class="nav-item" id="QDZY_div" style="display:none;">
+                   <!--  <li class="nav-item" id="QDZY_div" style="display:none;">
                       <a class="nav-link sub-item linkQDJL" id="linkQDZY" data-toggle="tab" href="#subSpread"
                         role="tab">清单指引</a>
                     </li>
                     <li class="nav-item" id="QDJL_div" style="display:none;">
                       <a class="nav-link sub-item linkQDJL" id="linkQDJL" data-toggle="tab" href="#subSpread"
                         role="tab">清单精灵</a>
-                    </li>
+                    </li> -->
                     <li class="nav-item" id="GLJ_div">
                       <a class="nav-link sub-item active" id="linkGLJ" data-toggle="tab" href="#subSpread"
                         role="tab">人材机</a>
@@ -284,19 +269,19 @@
                       <a class="nav-link sub-item" id="linkGCLMX" data-toggle="tab" href="#subSpread"
                         role="tab">工程量明细</a>
                     </li>
-                    <li class="nav-item">
+                   <!--  <li class="nav-item">
                       <a class="nav-link sub-item" id="linkJSCX" data-toggle="tab" href="#subSpread" role="tab">计算程序</a>
-                    </li>
+                    </li> -->
                     <!-- <li class="nav-item">   2018-11-08  新需求，隐藏说明信息
                                       <a class="nav-link" data-toggle="tab" href="#comments" role="tab" id="linkComments">说明信息</a>
                                   </li>-->
-                    <li class="nav-item" id="TZJNR_div">
+                  <!--   <li class="nav-item" id="TZJNR_div">
                       <a class="nav-link sub-item" id="linkTZJNR" data-toggle="tab" href="#subSpread"
                         role="tab">特征及内容</a>
-                    </li>
-                    <li class="nav-item" id="MBZM_div">
+                    </li> -->
+                   <!--  <li class="nav-item" id="MBZM_div">
                       <a class="nav-link sub-item" id="linkMBZM" data-toggle="tab" href="#subSpread" role="tab">模板子目</a>
-                    </li>
+                    </li> -->
                   </ul>
                   <!-- Tab panes -->
                   <div class="tab-content" id="tabCon">
@@ -348,11 +333,10 @@
                                   <a data-toggle="tab" href="#rnc-close" role="tab" class="zmhs-link nav-link">收起
                                     <!--<i class="fa fa-arrow-right"></i>--></a>
                                 </li>
-                                <li class="nav-item" data-toggle="tooltip" data-placement="left" title="项目特征">
+                             <!--    <li class="nav-item" data-toggle="tooltip" data-placement="left" title="项目特征">
                                   <a data-toggle="tab" id="xm-nav" href="#rnc-xm" role="tab"
-                                    class="zmhs-link nav-link">特征
-                                    <!--<i class="fa fa-info-circle"></i>--></a>
-                                </li>
+                                    class="zmhs-link nav-link">特征</a>
+                                </li> -->
                                 <li class="nav-item" data-toggle="tooltip" data-placement="left" title="附注条件"><a
                                     data-toggle="tab" id="hs-nav" href="#rnc-zm" role="tab"
                                     class="zmhs-link nav-link">换算

web/building_saas/main/js/views/billsElf.js

@@ -184,10 +184,10 @@ const BillsSub = (function() {
        
         if(type === libType.guidance){
           curModules.push(guideItem);
-          if(isFirst) gljOprObj.billsTab = "#linkQDZY";
+          if(isFirst) gljOprObj.billsTab = "#linkGCLMX";
         }else{
           curModules.push(elfItem);
-          if(isFirst) gljOprObj.billsTab = "#linkQDJL";
+          if(isFirst) gljOprObj.billsTab = "#linkGCLMX";
         }
         //2020-03-20清单指引和清单精灵并且，暂不用切换显示，只需绑定事件
         /* let libText;

web/building_saas/main/js/views/equipment_purchase_view.js

@@ -1,12 +1,17 @@
 
+let unitOptions = ['m', 'm2', 'm3', 'km', 't', 'kg', '台班', '工日', '昼夜', '元', '项', '处', '个', '件',
+'根', '组', '系统', '台', '套', '株', '丛', '缸', '支', '只', '块', '座', '对', '份', '樘', '攒', '榀']
 let equipmentPurchaseObj  = {
     setting:{
         header: [
             {headerName: "编号", headerWidth: 160, dataCode: "code", dataType: "String",formatter: "@"},
-            {headerName: "名称", headerWidth: 200, dataCode: "name", dataType: "String"},
-            {headerName: "单位", headerWidth: 100, dataCode: "unit",  dataType: "String"},
-            {headerName: "数量", headerWidth: 160, dataCode: "quantity", hAlign: "right", dataType: "Number",validator:'number'},
+            {headerName: "设备名称", headerWidth: 200, dataCode: "name", dataType: "String"},
+            {headerName: "设备价格-设备原价", headerWidth: 160, dataCode: "originalPrice", hAlign: "right", dataType: "Number",validator:'number'},
+            {headerName: "设备运杂费", headerWidth: 160, dataCode: "freight", hAlign: "right", dataType: "Number",validator:'number'},
+            {headerName: "备品备件费", headerWidth: 160, dataCode: "sparePartCost", hAlign: "right", dataType: "Number",validator:'number'},
             {headerName: "单价", headerWidth: 160, dataCode: "unitPrice", hAlign: "right", dataType: "Number",validator:'number'},
+            {headerName: "单位", headerWidth: 60, dataCode: "unit",  dataType: "String",hAlign: "center",cellType:'comboBox',editable:true,options:unitOptions},
+            {headerName: "数量", headerWidth: 160, dataCode: "quantity", hAlign: "right", dataType: "Number",validator:'number'},
             {headerName: "金额", headerWidth: 160, dataCode: "totalPrice", hAlign: "right", dataType: "Number"},
         ],
         view: {
@@ -25,6 +30,9 @@ let equipmentPurchaseObj  = {
             sheetCommonObj.initSheet(this.sheet, this.setting, 0);
             this.sheet.bind(GC.Spread.Sheets.Events.ValueChanged,this.onValueChange);
             this.sheet.bind(GC.Spread.Sheets.Events.RangeChanged, this.onSheetRangeChange);
+            this.sheet.bind(GC.Spread.Sheets.Events.SelectionChanged, function (e,args) {
+                args.sheet.repaint();
+            });
             if (projectReadOnly) {
                 sheetCommonObj.disableSpread(this.spread);
               } else {
@@ -61,16 +69,18 @@ let equipmentPurchaseObj  = {
     calcTotalPrice:function(newValue,dataCode,doc,equipment){
         let unitPrice = equipment.unitPrice?scMathUtil.roundForObj(equipment.unitPrice,getDecimal('glj.unitPrice')):0;
         let quantity = equipment.quantity?scMathUtil.roundForObj(equipment.quantity,getDecimal('glj.quantity')):0;
+        let quantity = equipment.quantity?scMathUtil.roundForObj(equipment.quantity,getDecimal('glj.quantity')):0;
+        let quantity = equipment.quantity?scMathUtil.roundForObj(equipment.quantity,getDecimal('glj.quantity')):0;
         if(newValue){
+            if(gljUtil.isDef(doc.unitPrice)) unitPrice = doc.unitPrice;
+            if(gljUtil.isDef(doc.quantity)) quantity = doc.quantity;
             if(dataCode === 'quantity') {
                 newValue =  scMathUtil.roundForObj(newValue,getDecimal('glj.quantity'));
                 quantity = newValue;
-                if(gljUtil.isDef(doc.unitPrice)) unitPrice = doc.unitPrice;
             }
             if(dataCode === 'unitPrice') {
                 newValue =  scMathUtil.roundForObj(newValue,getDecimal('glj.unitPrice'));
                 unitPrice = newValue;
-                if(gljUtil.isDef(doc.quantity)) quantity = doc.quantity;
             }
             doc.totalPrice = scMathUtil.roundForObj(quantity * unitPrice,getDecimal('glj.unitPrice'));
         }

web/building_saas/main/js/views/glj_view.js

@@ -29,7 +29,7 @@ var gljOprObj = {
     preActiveTab: '', //提升焦点变换性能 2019年4月12日
     activeTab: '#linkGLJ',
     rationTab:'#linkGLJ',
-    billsTab:'#linkQDJL',
+    billsTab:'#linkGCLMX',
     setting: {},
     detailSetting: {
         header: [

web/building_saas/main/js/views/installation_fee_view.js

@@ -48,7 +48,7 @@ let installationFeeObj={
         header: [
             {headerName: "计取", headerWidth: 50, dataCode: "isCal", dataType: "String",cellType: "checkBox"},
             {headerName: "费用项", headerWidth: 300, dataCode: "feeItem", hAlign: "left", dataType: "String"},
-            {headerName: "费用类型", headerWidth: 100, dataCode: "feeType", hAlign: "center", dataType: "String",cellType:'comboBox',options:installFeeType},
+           /*  {headerName: "费用类型", headerWidth: 100, dataCode: "feeType", hAlign: "center", dataType: "String",cellType:'comboBox',options:installFeeType}, */
             /* {headerName: "记取位置", headerWidth: 180, dataCode: "displayPosition", hAlign: "left", dataType: "String",cellType:'selectButton'} */
         ],
         view: {

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

@@ -1538,6 +1538,9 @@ var projectObj = {
                         let ext = {name:billNode.data.name,unit:billNode.data.unit};
                         project.Ration.insertVolumePrice(gljType.MAIN_MATERIAL,ext);
                     },
+                    visible: function(key, opt){//2018-11-08  新需求，这个按钮先隐藏，有需要再放开
+                        return false;
+                    }
                 },
                 "spr2": '--------',
                 "calc_installation_fee": {
@@ -1560,7 +1563,7 @@ var projectObj = {
                     name: '超高降效费用',
                     icon: 'fa-sign-in',
                     visible: function () {
-                        return projectObj.project.isOverHeightProject();
+                        return false//projectObj.project.isOverHeightProject();
                     },
                     items: {
                         'calcOverHeight': {
@@ -1624,7 +1627,7 @@ var projectObj = {
                     name:"面积增加费",
                     icon: 'fa-sign-in',
                     visible:function () {
-                        return  projectObj.project.property.isAreaIncrease == true;
+                        return  false//projectObj.project.property.isAreaIncrease == true;
                     },
                     items:{
                         "calcAreaIncreaseFee":{
@@ -1658,7 +1661,7 @@ var projectObj = {
                     name:"子目增加费",
                     icon: 'fa-sign-in',
                     visible:function () {
-                        return  projectObj.project.property.isItemIncrease == true;
+                        return projectObj.project.property.isItemIncrease == true;
                     },
                     items:{
                         "setItem":{
@@ -1680,6 +1683,9 @@ var projectObj = {
                 "setBookMark": {
                     name: '设置书签批注',
                     icon: 'fa-flag',
+                    visible: function(key, opt){//2018-11-08  新需求，这个按钮先隐藏，有需要再放开
+                        return false;
+                    },
                     disabled: function () {
                         if (projectReadOnly || !project.mainTree.selected || project.mainTree.selected.sourceType == ModuleNames.ration_glj) {
                             return true;
@@ -1935,7 +1941,7 @@ var projectObj = {
                         blockLibObj.checkShow();
                     },
                     visible: function(key, opt){
-                        return G_SHOW_BLOCK_LIB;
+                        return false//G_SHOW_BLOCK_LIB;
                     }
                 }
             }