Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/all_models/engineering_lib.js

@@ -86,6 +86,11 @@ let modelSchema = {
         type: Schema.Types.Mixed,
         default: []
     },
+    //超高降效库
+    over_height_lib: {
+        type: Schema.Types.Mixed,
+        default: []
+    },
     //设置人材机显示列
     glj_col:{
         showAdjustPrice:Boolean//是否显示调整价列

modules/users/controllers/compilation_controller.js

@@ -28,6 +28,7 @@ import engineerFeatureFacade from "../../engineer_feature_lib/facade/engineer_fe
 import materialFacade from "../../material_lib/facade/material_facade";
 import quantityFacade from "../../main_quantity_lib/facade/quantity_facade";
 import economicFacade from "../../economic_lib/facade/economic_facade";
+import overHeightFacade from "../../over_height_lib/facade/over_height_facade";
 import {default as category, List as categoryList} from "../../common/const/category_const.js";
 let config = require("../../../config/config.js");
 const fs = require('fs');
@@ -187,7 +188,21 @@ class CompilationController extends BaseController {
         let section = request.params.section;
         let selectedCompilation = request.session.selectedCompilation;
 
-        let compilationList = [],billList = [], rationList = [], gljList = [],feeRateList = [], libData = {}, billsTemplateData = [],featureList = [],infoList = [],engineerInfoList=[],engineerFeatureList=[],materialList=[],mainQuantityList=[],economicList=[];
+        let compilationList = [],
+            billList = [],
+            rationList = [],
+            gljList = [],
+            feeRateList = [],
+            libData = {},
+            billsTemplateData = [],
+            featureList = [],
+            infoList = [],
+            engineerInfoList=[],
+            engineerFeatureList=[],
+            materialList=[],
+            mainQuantityList=[],
+            economicList=[],
+            overHeightList=[];
         let valuationData = {}, valuationList = {}, artificialCoefficientList = [], calculationList = [], billsGuidanceList = [], mainTreeColList = [];
         let billTemplateList = [];
         try {
@@ -261,6 +276,9 @@ class CompilationController extends BaseController {
             //主要工程量指标
             economicList = await economicFacade.findByCondition({},null,false);
 
+            //超高降效
+            overHeightList = await overHeightFacade.findByCondition({},null,false);
+
         } catch (error) {
             console.log(error);
         }
@@ -292,6 +310,7 @@ class CompilationController extends BaseController {
             materialList:JSON.stringify(materialList),
             mainQuantityList:JSON.stringify(mainQuantityList),
             economicList:JSON.stringify(economicList),
+            overHeightList:JSON.stringify(overHeightList),
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
@@ -709,4 +728,4 @@ class CompilationController extends BaseController {
 
 }
 
-export default CompilationController;
+export default CompilationController;

modules/users/models/engineering_lib_model.js

@@ -199,6 +199,8 @@ class EngineeringLibModel extends BaseModel {
         //判断主要经济指标信息
         data.economic_lib = this._validLib(data.economic_lib);
 
+        data.over_height_lib = this._validLib(data.over_height_lib);
+
         //计税方式组合
         data.tax_group = this._validLib(data.tax_group);
 

web/users/js/compilation.js

@@ -265,6 +265,10 @@ $(document).ready(function() {
                 $('#economic-area').show();
                 $('#add-compilation-title').text('添加主要经济指标');
                 break;
+            case 'over_height':
+                $('#over-height-area').show();
+                $('#add-compilation-title').text('添加超高降效');
+                break;
         }
         $("#addcompilation").modal('show');
     });
@@ -284,7 +288,7 @@ $(document).ready(function() {
     /*$(".remove-lib").on("click", function() {
         $(this).parent().remove();
     })*/
-    $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.info-list,.engineer_info-list,.engineer_feature-list,.material-list,.main_quantity-list,.economic-list").on("click", ".remove-lib", function() {
+    $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.info-list,.engineer_info-list,.engineer_feature-list,.material-list,.main_quantity-list,.economic-list,.over_height-list").on("click", ".remove-lib", function() {
         $(this).parent().remove();
     });
 
@@ -481,6 +485,7 @@ function initCompilation() {
     let materialData = materialList == undefined ? [] : JSON.parse(materialList);
     let mainQuantityData = mainQuantityList == undefined ? [] : JSON.parse(mainQuantityList);
     let economicData = economicList == undefined ? [] : JSON.parse(economicList);
+    let overHeightData = overHeightList == undefined ? [] : JSON.parse(overHeightList);
 
     /*mainTreeCol = mainTreeCol !== '' ? mainTreeCol.replace(/\n/g, '\\n') : mainTreeCol;
     billsTemplateData = billsTemplateData.replace(/\n/g, '\\n');
@@ -626,6 +631,14 @@ function initCompilation() {
         html += tmpHtml;
     }
     $("select[name='economic_lib']").children("option").first().after(html);
+
+    //超高降效
+    html = '';
+    for(let tmp of overHeightData){
+        let tmpHtml = '<option value="' + tmp.ID + '">' + tmp.name + '</option>';
+        html += tmpHtml;
+    }
+    $("select[name='over_height_lib']").children("option").first().after(html);
 }
 
 /**
@@ -650,6 +663,7 @@ function getAndValidData(model) {
     let materialLib = $("select[name='material_lib']").children("option:selected").val();
     let mainQuantityLib = $("select[name='main_quantity_lib']").children("option:selected").val();
     let economicLib = $("select[name='economic_lib']").children("option:selected").val();
+    let overHeightLib = $("select[name='over_height_lib']").children("option:selected").val();
 
     if (name === '' && model === 'all') {
         throw '编办名字不能为空';
@@ -696,6 +710,7 @@ function getAndValidData(model) {
     let materialString = $("select[name='material_lib']").children("option:selected").text();
     let mainQuantityString = $("select[name='main_quantity_lib']").children("option:selected").text();
     let economicString = $("select[name='economic_lib']").children("option:selected").text();
+    let overHeightString = $("select[name='over_height_lib']").children("option:selected").text();
 
 
     let result = {
@@ -755,6 +770,10 @@ function getAndValidData(model) {
         economic:{
             id:economicLib,
             name:economicString
+        },
+        over_height:{
+            id:overHeightLib,
+            name:overHeightString
         }
     };
     return result;
@@ -999,4 +1018,4 @@ function intChecking(e,elemt) {//限制输入正整数
         e.preventDefault();
     }
 
-}
+}

web/users/views/compilation/engineering.html

@@ -208,6 +208,23 @@
                                 </div>
                                 <a href="#" class="btn btn-link btn-sm add-compilation" data-model="economic">添加</a>
                             </div>
+                            <div class="form-group col-md-3">
+                                <label>超高降效</label>
+                                <div class="over_height-list">
+                                    <% if (Object.keys(libData).length > 0 && libData.over_height_lib && libData.over_height_lib.length > 0) { %>
+                                    <% libData.over_height_lib.forEach(function (info, index){ %>
+                                    <p class="form-control-static">
+                                        <a class="pull-right text-danger remove-lib" data-model="economic" title="移除" data-id="<%= info.id %>">
+                                            <span class="glyphicon glyphicon-remove"></span>
+                                        </a>
+                                        <input type="hidden" name="over_height_lib" data-id="<%= info.id %>" value="<%= JSON.stringify({id: info.id, name: info.name}) %>">
+                                        <% if (index === 0) {%><i class="glyphicon glyphicon-flag"></i>&nbsp;<% } %><%= info.name %>
+                                    </p>
+                                    <% }) %>
+                                    <% } %>
+                                </div>
+                                <a href="#" class="btn btn-link btn-sm add-compilation" data-model="over_height">添加</a>
+                            </div>
                     </div>
 
                     <div class="col-md-12">
@@ -340,10 +357,11 @@
     let materialList ='<%- materialList %>';
     let mainQuantityList ='<%- mainQuantityList %>';
     let economicList ='<%- economicList %>';
+    let overHeightList = '<%- overHeightList %>';
     let colSpread = null;
     let colEditSpread = null;
 </script>
 <script type="text/javascript" src="/public/web/id_tree.js"></script>
 <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
 <script type="text/javascript" src="/web/users/js/compilation.js"></script>
-<%include ../compilation/modal.html %>
+<%include ../compilation/modal.html %>

web/users/views/compilation/modal.html

@@ -111,6 +111,16 @@
                         </div>
                     </div>
                 </div>
+                <div class="form-group" id="over-height-area">
+                    <label>超高降效</label>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <select class="form-control" name="over_height_lib">
+                                <option value="">请选择主要超高降效库</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
                 <div class="form-group" id="artificial-area">
                     <label>人工系数</label>
                     <div class="row">
@@ -391,4 +401,4 @@
 
 
 
-<script type="text/javascript" src="/web/users/js/col_setting.js"></script>
+<script type="text/javascript" src="/web/users/js/col_setting.js"></script>