子目增加费，面积增加费设置

modules/all_models/engineering_lib.js

@@ -109,6 +109,10 @@ let modelSchema = {
     projectEngineering:Number,
     //是否计算安装增加费
     isInstall:{type: Boolean, default: false},
+    //是否计算子目增加费
+    isItemIncrease:{type: Boolean, default: false},
+    //是否计算面积增加费
+    isAreaIncrease:{type: Boolean, default: false},
     indexName:String,//指标专业名称
     seq:Number//序列号
 };

modules/users/models/engineering_lib_model.js

@@ -109,6 +109,8 @@ class EngineeringLibModel extends BaseModel {
             data.glj_col =  JSON.parse(data.glj_col);
         }
         data.isInstall == 'true'?data.isInstall=true:data.isInstall=false;
+        data.isItemIncrease == 'true'?data.isItemIncrease=true:data.isItemIncrease=false;
+        data.isAreaIncrease == 'true'?data.isAreaIncrease=true:data.isAreaIncrease=false;
         let result = false;
         data = this.filterLibData(data);
         try {

web/users/js/col_setting.js

@@ -326,16 +326,24 @@ $('#other_setting').on('show.bs.modal', function () {
     glj_col_setting.showAdjustPrice?$('#adjustPrice_cb').prop('checked',true): $('#adjustPrice_cb').prop('checked',false);
     let isInstall = $("#isInstall").val() == 'true'?true:false;
     $('#isInstall_cb').prop('checked',isInstall);
+    let isItemIncrease = $("#isItemIncrease").val() == 'true'?true:false;
+    $('#isItemIncrease_cb').prop('checked',isItemIncrease);
+    let isAreaIncrease = $("#isAreaIncrease").val() == 'true'?true:false;
+    $('#isAreaIncrease_cb').prop('checked',isAreaIncrease);
 });
 
 $('#other_setting_comf').click(function () {
     let showAdjustPrice =  $('#adjustPrice_cb').prop('checked');
     let isInstall =  $('#isInstall_cb').prop('checked');
+    let isItemIncrease =  $('#isItemIncrease_cb').prop('checked');
+    let isAreaIncrease =  $('#isAreaIncrease_cb').prop('checked');
     let glj_col_setting = {
         showAdjustPrice :showAdjustPrice
     };
     $("#glj_col").val(JSON.stringify(glj_col_setting));
     $("#isInstall").val(isInstall);
+    $("#isItemIncrease").val(isItemIncrease);
+    $("#isAreaIncrease").val(isAreaIncrease);
 });
 
 $('#col-count').change(function () {

web/users/views/compilation/engineering.html

@@ -330,6 +330,8 @@
                 </div>
                 <input type="hidden" name="glj_col" value="<%= gljCol %>" id="glj_col">
                 <input type="hidden" name="isInstall" value="<%= libData.isInstall %>" id="isInstall">
+                <input type="hidden" name="isItemIncrease" value="<%= libData.isItemIncrease %>" id="isItemIncrease">
+                <input type="hidden" name="isAreaIncrease" value="<%= libData.isAreaIncrease %>" id="isAreaIncrease">
                 <input type="hidden" name="engineering" value="<%= libData.engineering %>" id="engineering">
                 <input type="hidden" name="section" value="<%= section %>" id="section">
                 <input type="hidden" name="id" value="<%= libData._id.toString()%>">

web/users/views/compilation/modal.html

@@ -288,6 +288,20 @@
                             </label>
                         </div>
                     </div>
+                    <div class="col-md-12">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="isAreaIncrease_cb"> 显示面积增加费
+                            </label>
+                        </div>
+                    </div>
+                    <div class="col-md-12">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="isItemIncrease_cb"> 显示子目增加费
+                            </label>
+                        </div>
+                    </div>
                 </div>
             </div>
             <div class="modal-footer">