增加 工料机库 添加；增加 清单模板设置

css/style.css

@@ -295,3 +295,6 @@ body{
 .mb-30 {
   margin-bottom:30px
 }
+.mb-qd-height,.mb-de-height{
+  overflow: hidden;
+}

js/global.js

@@ -1,9 +1,7 @@
 /*自动高度*/
 function autoFlashHeight(){
-    $(".wrapContent").height($(window).height()-48 );
-    $(".mainContent").height($(window).height()-48 );
-    $(".scollContent").height($(window).height()-130 );
-    $(".slideContent").height($(window).height()-46 );
+    $(".mb-qd-height").height($(window).height()-253 );
+    $(".mb-de-height").height($(window).height()-287 );
 };
 $(window).resize(autoFlashHeight);
  $(function(){

version.html

@@ -69,6 +69,7 @@
 					</div>
 				</div>
 				<div class="content-wrap">
+					<!--计量方式-->
 					<div class="c-header" style="padding:0">
 						<ul class="nav nav-tabs">
 						  <li role="presentation" class="active"><a href="#">清单计价</a></li>
@@ -139,24 +140,50 @@
 							<div class="col-md-4">
 								<div class="form-group">
 									<label>标准清单</label>
-									<p class="form-control-static">重庆2017标准清单(默认)</p>
+									<p class="form-control-static"><i class="glyphicon glyphicon-flag"></i>&nbsp;重庆2017标准清单</p>
 									<a class="btn btn-link btn-sm" href="javascript:void(0)" data-toggle="modal" data-target="#addqingdan">添加</a>
 								</div>
 								<div class="form-group">
 									<label>定额库</label>
-									<p class="form-control-static">重庆2017定额库(默认)</p>
-									<p class="form-control-static"><a class="pull-right text-danger" tlte="移除"><span class="glyphicon glyphicon-remove"></span></a>重庆2015定额库</p>
+									<p class="form-control-static"><i class="glyphicon glyphicon-flag"></i>&nbsp;重庆2017定额库(工料机库1)</p>
+									<p class="form-control-static"><a class="pull-right text-danger" tlte="移除"><span class="glyphicon glyphicon-remove"></span></a>重庆2015定额库(工料机库1)</p>
 									<a href="#" class="btn btn-link btn-sm">添加</a>
 								</div>
+								<div class="form-group">
+									<label>工料机库</label>
+									<p class="form-control-static"><i class="glyphicon glyphicon-flag"></i>&nbsp;工料机库1</p>
+									<a class="btn btn-link btn-sm" >添加</a>
+								</div>
 							</div>
 							<div class="col-md-8">
-							<legend>造价书列设置<a href="javascript:void(0)" data-toggle="modal" data-target="#set-column" class="btn btn-primary btn-sm pull-right">设置</a></legend>
+							<legend>清单模板 / 造价书列<a href="javascript:void(0)" data-toggle="modal" data-target="#set-column" class="btn btn-primary btn-sm pull-right">列设置</a><a href="javascript:void(0)" data-toggle="modal" data-target="" class="btn btn-primary btn-sm pull-right" style="margin-right:5px">模板设置</a></legend>
 							<div>
 								S JS预览在此
 							</div>
 						</div>
 						</div>
 					</div>
+					<!--清单模板设置-->
+					<div class="c-header" style="padding:0">
+						<ul class="nav nav-tabs">
+						  <li role="presentation" class="active"><a href="#">重庆 [2013]调整人工单价</a></li>
+						</ul>
+					</div>
+					<div class="c-body">
+						<legend>清单模板设置<a href="#" class="btn btn-default btn-sm pull-right">返回</a><a href="#" class="btn btn-primary btn-sm pull-right" style="margin-right:5px">保存</a></legend>
+						<div class="row">
+							<div class="col-md-8">
+								<div class="mb-qd-height">
+								</div>
+							</div>
+							<div class="col-md-4">
+								<select class="form-control"><option>定额</option></select>
+								<div class="mb-de-height">
+
+								</div>
+							</div>
+						</div>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -203,7 +230,7 @@
 			</div>
 	  </div>
 	</div>
-	<!-- 弹窗新增标准清单 或 定额库 -->
+	<!-- 弹窗新增标准清单 或 定额库 或 工料机库-->
 	<div class="modal fade" id="addqingdan" tabindex="-1" role="dialog">
 	  <div class="modal-dialog" role="document">
 	    <div class="modal-content">
@@ -220,6 +247,10 @@
  						 <label>定额库</label>
 						 <select class="form-control" ><option>重庆2017定额</option></select>
  					 </div>
+ 					<div class="form-group">
+ 						 <label>工料机库</label>
+						 <select class="form-control" ><option>工料机库1</option></select>
+ 					 </div>
 	      </div>
 				<div class="modal-footer">
         	<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
@@ -237,7 +268,7 @@
 	        <h4 class="modal-title" id="myModalLabel">造价书列设置</h4>
 	      </div>
 	      <div class="modal-body">
-					<div class="row">
+					<div class="row" style="margin-bottom:10px">
 						<div class="col-md-3">
 							<div class="input-group">
 							  <span class="input-group-addon" id="basic-addon1">空行</span>
@@ -256,13 +287,21 @@
 							  <input type="number" class="form-control input-sm" value="1">
 							</div>
 						</div>
-						<div class="col-md-3">
+					</div>
+					<div class="row">
+						<div class="col-md-2">
 							<div class="checkbox">
 						     <label>
 						       <input type="checkbox"> 是否包含树结构
 						     </label>
 						   </div>
 						</div>
+						<div class="col-md-3">
+							<div class="input-group">
+							  <span class="input-group-addon" id="basic-addon1">树结构绘制列</span>
+							  <input type="number" class="form-control input-sm" value="1">
+							</div>
+						</div>
 					</div>
 					<div class="">
 						<div class="btn-toolbar" role="toolbar">
@@ -303,4 +342,7 @@
 	  </div>
 	</div>
 </body>
+<script type="text/javascript">
+    autoFlashHeight();
+</script>
 </html>