1. 工程名称列前加一列“工程专业”。

2. 工程名称列改名称为“费用标准”。
3. 工程名称列后面加一列“定额取费专业”。
4. 显示设置增加“显示安装增加费”打勾项。

version.html

@@ -117,30 +117,42 @@
 								</legend>
 								<table class="table">
 									<thead>
-											<tr><th>工程名称</th><th>标准清单</th><th>定额库</th><th>工料机库</th><th>前台显示</th><th>操作</th></tr>
+											<tr><th>工程专业</th><th>费用标准</th><th>定额取费专业</th><th>标准清单</th><th>定额库</th><th>工料机库</th><th>前台显示</th><th>操作</th></tr>
 									</thead>
 									<tbody>
-										<tr><td>建筑工程 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>
+										<tr><td>建筑工程 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>建筑工程 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td><div class="input-group input-group-sm" style="width:200px"> 
+												<input class="form-control"> 
+												<div class="input-group-btn"> 
+													<button type="button" class="btn btn-success">
+														<span class="glyphicon glyphicon-ok"></span></button>
+												</div> 
+											</div></td><td>
 											<div class="input-group input-group-sm" style="width:200px"> 
 												<input class="form-control"> 
 												<div class="input-group-btn"> 
 													<button type="button" class="btn btn-success">
 														<span class="glyphicon glyphicon-ok"></span></button>
 												</div> 
+											</div></td><td><div class="input-group input-group-sm" style="width:200px"> 
+												<input class="form-control"> 
+												<div class="input-group-btn"> 
+													<button type="button" class="btn btn-success">
+														<span class="glyphicon glyphicon-ok"></span></button>
+												</div> 
 											</div></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>仿古建筑工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>安装工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>市政土建工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>市政安装工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>人工土石方工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>机械土石方工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>炉窖砌筑工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>园林工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>绿化工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>单拆除工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>建筑修缮工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
-										<tr><td>安装修缮工程</td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>仿古建筑工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>仿古建筑工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>安装工程   <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>安装工程   <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>市政土建工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>市政土建工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>市政安装工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>市政安装工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>人工土石方工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>人工土石方工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>机械土石方工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>机械土石方工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>炉窖砌筑工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>炉窖砌筑工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>园林工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>园林工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>绿化工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>绿化工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>单拆除工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>单拆除工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>建筑修缮工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>建筑修缮工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
+										<tr><td>安装修缮工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>安装修缮工程  <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>14 <a><i class="glyphicon glyphicon-pencil"></i></a></td><td>0</td><td>0</td><td>0</td><td><label><input type="checkbox"> 显示</label></td><td><a href="#">编辑</a></td></tr>
 									</tbody>
 								</table>
 							</div>
@@ -162,13 +174,13 @@
 										<a class="btn btn-link btn-sm" href="javascript:void(0)" data-toggle="modal" data-target="#addqingdan">添加</a>
 									</div>
 									<div class="form-group col-md-3">
-									<label>定额库</label>
+										<label>定额库</label>
 										<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 col-md-3">
-										<label>工料机库</label>
+										<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>
@@ -178,59 +190,32 @@
 										<a class="btn btn-link btn-sm" >添加</a>
 									</div>
 								</div>
-							</div>
-							<div class="col-md-12">
-								<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>
-									<a href="javascript:void(0)" data-toggle="modal" data-target="#set-column2" class="btn btn-primary btn-sm pull-right" style="margin-right:5px">人材机列</a></legend>
-								<div>
-									S JS预览在此
+								<div class="row">
+									<div class="form-group col-md-3">
+										<label>费率标准</label>
+										<p class="form-control-static"><i class="glyphicon glyphicon-flag"></i>&nbsp;重庆费率（2008）</p>
+										<a class="btn btn-link btn-sm" >添加</a>
+									</div>
+									<div class="form-group col-md-3">
+										<label>人工系数</label>
+										<div></div>
+										<a class="btn btn-link btn-sm" >添加</a>
+									</div>
 								</div>
 							</div>
-							<div class="col-md-6">
-								<legend>费率标准 <a href="javascript:void(0)" data-toggle="modal" data-target="#add-feilv" class="btn btn-primary btn-sm pull-right">添加</a></legend>
-								<table class="table table-bordered">
-									<thead><tr><th>标准名称</th><th>数据</th><th>操作</th></tr></thead>
-									<tbody>
-										<tr><td>2006费率</td><td><a href="javascript:void(0)" data-toggle="modal" data-target="#view-feilv">查看</a></td><td><a href="">删除</a></td></tr>
-										<tr><td>2007费率</td><td><a href="">查看</a></td><td><a href="">删除</a></td></tr>
-									</tbody>
-								</table>
+							<div class="col-md-12">
+								<a href="javascript:void(0)" data-toggle="modal" data-target="#set-column2" class="btn btn-primary btn-sm">显示设置</a>
 							</div>
-							<div class="col-md-6">
-								<legend>人工系数 <a href="javascript:void(0)" data-toggle="modal" data-target="#add-rengong" class="btn btn-primary btn-sm pull-right">添加</a></legend>
-								<table class="table table-bordered">
-									<thead><tr><th>标准名称</th><th>数据</th><th>操作</th></tr></thead>
-									<tbody>
-										<tr><td>2006人工</td><td><a href="javascript:void(0)" data-toggle="modal" data-target="#view-rengong">查看</a></td><td><a href="">删除</a></td></tr>
-										<tr><td>2007人工</td><td><a href="">查看</a></td><td><a href="">删除</a></td></tr>
-									</tbody>
+							<div class="col-md-12">
+								<legend style="margin-top: 30px"><a data-toggle="modal" data-target="#addTaxGroup" class="btn btn-link btn-sm pull-right">添加</a>计算程序/清单模板/列设置</legend>
+								<table class="table">
+									<thead><tr><th>计税方式</th><th>计算程序</th><th>清单模板</th><th>列设置</th><th>操作</th></tr></thead>
+									<tr><td>简易计税</td><td>计算程序（2008）</td><td>重庆2008建筑工程</td><td>列设置2008</td><td><a href="#">编辑</a>/<a href="#" class="text-danger">删除</a></td></tr>
+									<tr><td>简易计税</td><td>计算程序（2008全费用）</td><td>重庆2008建筑工程全费用</td><td>列设置2008</td><td><a href="#">编辑</a>/<a href="#" class="text-danger">删除</a></td></tr>
 								</table>
 							</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>清单模板设置</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>
@@ -241,7 +226,7 @@
 	    <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="myModalLabel">添加新编办</h4>
+	        <h4 class="modal-title" id="myModalLabel">添加新定额</h4>
 	      </div>
 	      <div class="modal-body">
 					<div class="form-group">
@@ -310,102 +295,27 @@
 			</div>
 	  </div>
 	</div>
-	<!-- 弹窗造价书列设置 -->
-	<div class="modal fade" id="set-column" tabindex="-1" role="dialog">
-	  <div class="modal-dialog modal-lg" role="document">
+	<!-- 显示设置 -->
+	<div class="modal fade" id="set-column2" 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="myModalLabel">造价书列设置</h4>
+	        <h4 class="modal-title" id="myModalLabel">显示设置</h4>
 	      </div>
 	      <div class="modal-body">
-					<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>
-							  <input type="number" class="form-control input-sm" value="3">
-							</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="4">
-							</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="row">
-						<div class="col-md-2">
+						<div class="col-md-12">
 							<div class="checkbox">
 						     <label>
-						       <input type="checkbox"> 是否包含树结构
+						       <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">
-						  <div class="btn-group" role="group" >
-								<a href="#" class="btn btn-default btn-sm">合并</a>
-								<a href="#" class="btn btn-default btn-sm">拆分</a>
-							</div>
-						  <div class="btn-group" role="group">
-								<a href="#" class="btn btn-default btn-sm">左对齐</a>
-								<a href="#" class="btn btn-default btn-sm">居中</a>
-								<a href="#" class="btn btn-default btn-sm">右对齐</a>
-							</div>
-						  <div class="btn-group" role="group">
-								<a href="#" class="btn btn-default btn-sm">上对齐</a>
-								<a href="#" class="btn btn-default btn-sm">垂直居中</a>
-								<a href="#" class="btn btn-default btn-sm">下对齐</a>
-							</div>
-						  <div class="btn-group" role="group">
-								<div class="input-group">
-								  <span class="input-group-addon" id="basic-addon1">字体</span>
-								  <input type="text" class="form-control input-sm" >
-									<div class="input-group-btn">
-								   <a href="#" class="btn btn-default btn-sm">设置</a>
-								  </div>
-								</div>
-							</div>
-						</div>
-					</div>
-					<div>
-						S JS在此
-					</div>
-				</div>
-				<div class="modal-footer">
-        	<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-        	<button type="button" class="btn btn-primary">确定</button>
-      	</div>
-			</div>
-	  </div>
-	</div>
-	<!-- 弹窗人材机列设置 -->
-	<div class="modal fade" id="set-column2" 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="myModalLabel">人材机列设置</h4>
-	      </div>
-	      <div class="modal-body">
-					<div class="row">
 						<div class="col-md-12">
 							<div class="checkbox">
 						     <label>
-						       <input type="checkbox"> 是否显示调整价列
+						       <input type="checkbox"> 显示安装增加费
 						     </label>
 						   </div>
 						</div>
@@ -523,6 +433,47 @@
 			</div>
 		</div>
 	</div>
+	<!-- 弹窗 添加 计算程序清单模板列设置 -->
+	<div class="modal fade" id="addTaxGroup" 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="myModalLabel">添加计税组合</h4>
+	      </div>
+	      <div class="modal-body">
+			<div class="form-group">
+				 <label>计税方式</label>
+				 <select class="form-control">
+				 	<option>请选择计税方式</option>
+				 </select>
+		 	</div>
+			<div class="form-group">
+				 <label>计算程序</label>
+				 <select class="form-control">
+				 	<option>请选择计算程序</option>
+				 </select>
+		 	</div>
+			<div class="form-group">
+				 <label>清单模板</label>
+				 <select class="form-control">
+				 	<option>请选择清单模板</option>
+				 </select>
+		 	</div>
+			<div class="form-group">
+				 <label>列设置</label>
+				 <select class="form-control">
+				 	<option>请选择列设置</option>
+				 </select>
+		 	</div>
+	      </div>
+				<div class="modal-footer">
+        	<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+        	<button type="button" class="btn btn-primary">确定添加</button>
+      	</div>
+			</div>
+	  </div>
+	</div>
 </body>
 <script type="text/javascript">
     autoFlashHeight();