多处小筛选修改

admin-invoice-blist.html

@@ -39,6 +39,7 @@
 					<ul class="navTabs">
 						<li><a href="admin-invoice.html">员工权限</a></li>
 						<li class="active"><a href="admin-invoice-blist.html">办事处汇总权限</a></li>
+						<li><a href="admin-invoice-receivables.html">应收款权限</a></li>
 					</ul>
 				</div>
 					<form>

admin-invoice.html

@@ -39,6 +39,7 @@
 		    	<ul class="navTabs">
 					  <li class="active"><a href="admin-invoice.html">员工权限</a></li>
 					  <li><a href="admin-invoice-blist.html">办事处汇总权限</a></li>
+					  <li><a href="admin-invoice-receivables.html">应收款权限</a></li>
 					</ul>
 				</div>
 				<div class="control-group">

admin-reportGroup-carriedout.html

@@ -39,6 +39,7 @@
 						<li><a href="admin-reportGroup.html">审批组</a></li>
 						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
 						<li class="active"><a href="">费用执行人</a></li>
+						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
 					</ul>
 				</div>
 					<legend>编辑执行人</legend><form method="post" action="/addCategory" name="group">

admin-reportGroup-role.html

@@ -39,6 +39,7 @@
 						<li><a href="admin-reportGroup.html">审批组</a></li>
 						<li class="active"><a href="">审批角色</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
+						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
 					</ul>
 				</div>
 					<form>

admin-reportGroup.html

@@ -39,6 +39,7 @@
 						<li class="active"><a href="">审批组</a></li>
 						<li><a href="admin-reportGroup-role.html">审批角色</a></li>
 						<li><a href="admin-reportGroup-carriedout.html">费用执行人</a></li>
+						<li><a href="admin-reportGroup-collect.html">汇总权限</a></li>
 					</ul>
 				</div>
 					<form>

css/global.css

@@ -2026,7 +2026,7 @@ table .taC{
 .saeaList .entry table th .repMark .rmUdone{
   color:#F89406;
 }
-.saeaList td sup {
+.saeaList th sup,.saeaList td sup {
   color:#fff;
   vertical-align: top;
   margin-left: 5px;

invoice-addn.html

@@ -92,7 +92,7 @@
 								<tr>
 									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 									<label class="radio inline"><input type="radio">增值税普通发票</label>
-									<label class="radio inline"><input type="radio">增值税专用发票</label>
+									<label class="radio inline colRed"><input type="radio"><sup>专</sup> 增值税专用发票</label>
 									</td>
 								</tr>
 								</tbody>
@@ -118,10 +118,10 @@
 								</tr>
 								</tbody>
 							</table>
-						<table class="table table-bordered table-condensed">
+						<table class="table table-bordered table-condensed ">
 								<tbody>
 								<tr>
-									<th colspan="4" class="taC">增值税专用发票</th>
+									<th colspan="4" class="taC colRed"><sup>专</sup> 增值税专用发票</th>
 								</tr>
 								<tr>
 									<th class="taC" width="150"><span class="colRed">*</span>单位名称</th><td><input type="text" placeholder="必填"></td>

invoice-batch-edit.html

@@ -92,7 +92,7 @@
 								<tr>
 									<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 									<label class="radio inline"><input type="radio">增值税普通发票</label>
-									<label class="radio inline"><input type="radio">增值税专用发票</label>
+									<label class="radio inline colRed"><input type="radio"><sup>专</sup> 增值税专用发票</label>
 									</td>
 								</tr>
 								</tbody>
@@ -121,7 +121,7 @@
 						<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr>
-									<th colspan="4" class="taC">增值税专用发票</th>
+									<th colspan="4" class="taC colRed"><sup>专</sup> 增值税专用发票</th>
 								</tr>
 								<tr>
 									<th class="taC" width="150"><span class="colRed">*</span>单位名称</th><td><input type="text" placeholder="必填"></td>

invoice-blist-agency-detail.html

@@ -66,6 +66,7 @@
 	  							<option>刘飞</option>
 	  						</select>
 	  					</li>
+	  					<li><select style="width:150px;"><option>所有开票内容</option></select></li>
 							<li>
 								<div class="search">
 									<div class="input-append">

invoice-blist-agency-detail2.html

@@ -66,6 +66,7 @@
 	  							<option>刘飞</option>
 	  						</select>
 	  					</li>
+	  					<li><select style="width:150px;"><option>所有开票内容</option></select></li>
 							<li>
 								<div class="search">
 									<input type="radio">按录入时间 

invoice-dlist-receivables.html

@@ -62,13 +62,15 @@
 						<li><select><option>所有</option><option>未入账</option><option>已入账</option><option>部分入账</option></select></li>
 						<li><select><option>办事处</option><option>广东办</option></select>&nbsp;<select><option>员工</option></select></li>
 						<li><select><option>2017</option></select>&nbsp;<select><option>全年</option><option>1月</option></select></li>
+						<li><select style="width:150px;"><option>所有开票内容</option></select></li>
 						<li>开票数量：<b>150</b> 张</li>
 						<li>开票总计：￥9000.00</li>
 						<li>应收款总计：<span class="colGreen">￥7000.00</span></li>
+						<li>已入账总计：￥3000.00</li>
 					</ul>
 				</div>
 				<div class="saeaList">
-					<div class="entry autoHeightI2" style="margin-bottom:0;">
+					<div class="entry" style="margin-bottom:0;">
 					<script type="text/javascript">$(document).ready(function() {
 						// $('#invoiceTable').fixedHeaderTable({ fixedColumns:1 });
 					});</script>
@@ -84,6 +86,18 @@
 					</table>
 				</div>
 					</div>
+					<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+						<li><a href="#">&lt;</a></li>
+						<li><a href="#">1</a></li>
+						<li class="active"><a href="#">2</a></li>
+						<li><a href="#">3</a></li>
+						<li><a href="#">4</a></li>
+						<li><a href="#">5</a></li>
+						<li><a href="#">&gt;</a></li>
+					</ul>
+			  	</div>
 			</div>
 		</div>
 	</div>

invoice-edit.html

@@ -92,7 +92,7 @@
 							<tr>
 								<th class="taC"><span class="colRed">*</span>发票类型</th><td colspan="3">
 								<label class="radio inline"><input type="radio">增值税普通发票</label>
-								<label class="radio inline"><input type="radio">增值税专用发票</label>
+								<label class="radio inline colRed"><input type="radio"><sup>专</sup> 增值税专用发票</label>
 							</td>
 							</tr>
 							</tbody>
@@ -111,7 +111,7 @@
 						<table class="table table-bordered table-condensed">
 							<tbody>
 							<tr>
-								<th colspan="4" class="taC">增值税专用发票</th>
+								<th colspan="4" class="taC colRed"><sup>专</sup> 增值税专用发票</th>
 							</tr>
 							<tr>
 								<th class="taC" width="150"><span class="colRed">*</span>单位名称</th><td><input type="text"></td>

invoice-input-billing-all.html

@@ -81,6 +81,7 @@
 				<div class="saeaList">
 		  		<table class="table table-hover">
 					<tr class="thead">
+						<th>收款流水号</th>
 						<th>收款金额</th>
 						<th>收款信息</th>
 						<th>到帐银行/到帐时间</th>
@@ -92,6 +93,7 @@
 					</tr>
 					<!--未认领&认领-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
 	  					<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
@@ -99,9 +101,10 @@
 	  					<td></td>
 	  					<td></td>
 	  					<td></td>
-	  					<td><a href="#receive"  data-toggle="modal">变更</a></td>
+	  					<td><a href="#receive" data-toggle="modal">变更</a><br><a href="#money" data-toggle="modal">删除</a></td>
 	  				</tr>
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
 	  					<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
@@ -113,9 +116,10 @@
 	  				</tr>
 						<!--未入账（绑定发票被退票）-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+							<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>刘飞 退票<br>2015-04-12 11:30:02</td>
@@ -124,9 +128,10 @@
 	  				</tr>
 						<!--解绑后的发票-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+							<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>刘飞 解绑<a href="#invoiced" data-toggle="modal">#F20160316001</a><br>2015-04-12 11:30:02</td>
@@ -135,9 +140,10 @@
 	  				</tr>
 						<!--已入账（用户认领）-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+							<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>陈特 认领<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
@@ -146,9 +152,10 @@
 	  				</tr>
 						<!--已入账（管理员绑定）-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+							<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
@@ -157,20 +164,22 @@
 	  				</tr>
 						<!--导入银行到款-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+							<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td></td>
 	  					<td></td>
 	  					<td></td>
-	  					<td><a href="#claim" data-toggle="modal">设置认领</a><br><a href="#search-invoice" data-toggle="modal">查询发票</a></td>
+	  					<td><a href="#claim" data-toggle="modal">设置认领</a><br><a href="#search-invoice" data-toggle="modal">查询发票</a><br><a href="#money" data-toggle="modal">删除</a></td>
 	  				</tr>
 						<!--一个收款绑定多个入账 - 发票金额不满足收款金额-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+							<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
@@ -179,9 +188,10 @@
 	  				</tr>
 						<!--一个收款绑定多个入账 - 发票金额满足收款金额-->
 	  				<tr>
+	  					<td><a href="#">#SK20160316001</a></td>
 	  					<td><b>￥30000.00</b></td>
 	  					<td>李艳芬/鹅蛋山</td>
-						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+							<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
@@ -370,5 +380,30 @@
 		</div>
 </div>
     <!--弹出设置认领-->
+<!--弹出删除到款-->
+<div class="modal hide fade" id="money">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>删除该到款</h3>
+    </div>
+    <div class="modal-body">
+    	<table class="table table-bordered table-condensed">
+				<tbody>
+				<tr>
+					<th class="taC">到款单位名称</th>
+					<td><input type="text" name="" id="" placeholder="请输入到款单位名称" aria-required="true" aria-invalid="true"></td>
+				</tr>
+				</tbody>
+			</table>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button">确定</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div>
+		</div>
+</div>
+    <!--弹出删除到款-->
 <script type="text/javascript">autoFlashHeight();</script>
 </body>