人材机列设置，显示调整价

modules/all_models/engineering_lib.js

@@ -50,6 +50,10 @@ let modelSchema = {
     program_lib: {
         type: Schema.Types.Mixed,
         default: []
+    },
+    //设置人材机显示列
+    glj_col:{
+        showAdjustPrice:Boolean//是否显示调整价列
     }
 };
 mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

modules/users/controllers/compilation_controller.js

@@ -248,6 +248,7 @@ class CompilationController extends BaseController {
             feeRateList: JSON.stringify(feeRateList),
             billsTemplateData: JSON.stringify(billsTemplateData),
             mainTreeCol: JSON.stringify(libData.main_tree_col),
+            gljCol:JSON.stringify(libData.glj_col),
             calculationList: JSON.stringify(calculationList),
             layout: 'users/views/layout/layout'
         };

modules/users/models/engineering_lib_model.js

@@ -67,6 +67,9 @@ class EngineeringLibModel extends BaseModel {
                 cols:[]
             }
         }
+        if(data.glj_col){
+            data.glj_col =  JSON.parse(data.glj_col);
+        }
 
         let result = false;
         data = this.filterLibData(data);

web/users/js/col_setting.js

@@ -320,6 +320,25 @@ $('#set-column').on('shown.bs.modal', function () {
         ColSettingObj.initColSetting(ColSettingObj.colSetting);
     }
 });
+
+$('#set-glj-col').on('show.bs.modal', function () {
+    let glj_col_setting = JSON.parse($("#glj_col").val());
+    if(glj_col_setting.showAdjustPrice){
+        $('#adjustPrice_cb').prop('checked',true);
+    }else {
+        $('#adjustPrice_cb').prop('checked',false);
+    }
+});
+
+$('#set-glj-comf').click(function () {
+
+    let showAdjustPrice =  $('#adjustPrice_cb').prop('checked');
+    let glj_col_setting = {
+        showAdjustPrice :showAdjustPrice
+    };
+    $("#glj_col").val(JSON.stringify(glj_col_setting));
+});
+
 $('#col-count').change(function () {
     ColSettingObj.setColCount(parseInt($(this).val()));
 });

web/users/views/compilation/engineering.html

@@ -127,14 +127,16 @@
                     </div>
                     <div class="col-md-12">
                         <legend>清单模板 / 造价书列</legend>
-                        <a href="javascript:void(0)" data-toggle="modal" data-target="#set-column" class="btn btn-primary btn-sm pull-right">设置</a>
+                        <a data-toggle="modal" data-target="#set-column" class="btn btn-primary btn-sm pull-right">设置</a>
                         <a href="/compilation/template/<%= section %>/<%= valuationId %>/<%= engineeringInfo.id%>"
                                data-toggle="modal" data-target="" class="btn btn-primary btn-sm pull-right"
                                style="margin-right:5px">模板设置</a>
+                        <a data-toggle="modal" data-target="#set-glj-col" class="btn btn-primary btn-sm pull-right" style="margin-right:5px">人材机列</a>
                         <input type="hidden" name="main_tree_col" value="<%= mainTreeCol %>">
                         <div id="main-tree-col" style="height: 400px;"></div>
                     </div>
                 </div>
+                <input type="hidden" name="glj_col" value="<%= gljCol %>" id="glj_col">
                 <input type="hidden" name="engineering" value="<%= engineeringInfo.id %>" id="engineering">
                 <input type="hidden" name="section" value="<%= section %>" id="section">
                 <input type="hidden" name="id" value="<%= valuationId %>">
@@ -151,6 +153,7 @@
     let programList = '<%- calculationList %>';
     let mainTreeCol = '<%- mainTreeCol %>';
     let billsTemplateData = '<%- billsTemplateData %>';
+    let gljCol = '<%- gljCol %>';
     let colSpread = null;
     let colEditSpread = null;
 </script>

web/users/views/compilation/modal.html

@@ -203,4 +203,33 @@
         </div>
     </div>
 </div>
+
+<!-- 弹窗人材机列设置 -->
+<div class="modal fade" id="set-glj-col" tabindex="-1" role="dialog">
+    <div class="modal-dialog " role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="glj_tit">人材机列设置</h4>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="adjustPrice_cb"> 显示调整价列
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" data-dismiss="modal" id = "set-glj-comf">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
 <script type="text/javascript" src="/web/users/js/col_setting.js"></script>