调整费用执行的导出内容和修改发票审批的查看更多页

css/global.css

@@ -3755,4 +3755,31 @@ td div.dlLev3{
 }
 .shipLock dt{
   margin-bottom:10px
-}
+}
+.btn-back{
+  background:#ffa132;
+}
+.btn-back:hover{
+  background:#ff8a00;
+}
+.btn-back:active{
+  background:#e57c01;
+}
+.btn-undone{
+  background:#ce5e5e;
+}
+.btn-undone:hover{
+  background:#c01010;
+}
+.btn-undone:active{
+  background:#790000;
+}
+.btn-done{
+  background:#7ea85c;
+}
+.btn-done:hover{
+  background:#4f8e08;
+}
+.btn-undone:active{
+  background:#2a4f00;
+}

invoice-approval-all.html

@@ -51,11 +51,29 @@
 			</div>
 			<div class="adminContent autoHeight">
 				<legend>
-					已审批发票
+					审批发票
 				</legend>
 				<div class="demandCate">
 					<ul class="cateList">
 						<li>
+							<a class="now" href="#">所有</a>
+							<a href="#" title="待审批发票">待审批发票</a>
+							<a href="#" title="已审批发票">已审批发票</a>
+						</li>
+						<li>
+							<select>
+								<option>类型</option>
+								<option>普通发票</option>
+								<option>专用发票</option>
+							</select>
+						</li>
+						<li>
+							<select class="select">
+								<option>个人发票</option>
+								<option>培训班发票</option>
+							</select>
+						</li>
+						<li>
 							<div class="search">
 								<div class="input-append">
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
@@ -76,28 +94,84 @@
 				<div class="saeaList">
 					<table class="table table-hover">
 						<tbody>
-						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>提交开票</th><th>完成审批</th></tr>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>纳税人识别码</th><th>注册地址~电话</th><th>开户银行~账号</th><th>发票备注</th><th>收件人~电话</th><th>收件地址</th><th>邮寄物品</th><th>邮寄备注</th><th>开票内容</th><th>数量</th><th>单价</th><th>开票金额</th><th>提交开票</th>
+							<th>审批意见</th><th>完成审批</th></tr>
 						<tr>
 							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
 							<td>珠海XXXX公司</td>
+							<td>91610000220521254B</td>
+							<td>西安市雁塔区丈八东路262号 023-88131321	</td>
+							<td>建行西安长安路支行 61001720015050000695</td>
+							<td>测试备注</td>
+							<td>陈工 12345678901</td>
+							<td>广东省珠海市XXX路XXX号</td>
+							<td>合同x1、锁套装x1</td>
+							<td>邮寄物品备注信息</td>
+							<td>纵横公路工程造价管理系统V9.0</td>
+							<td>1</td>
+							<td>3000.00</td>
 							<td><b>￥3000.00</b></td>
 							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>最后审批人的审批意见</td>
 							<td><span class="colGreen">同意</span> 黄爱玲 2016-03-03 12:20:20</td>
 						</tr>
 						<tr>
 							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
 							<td>珠海XXXX公司</td>
+							<td>91610000220521254B</td>
+							<td>西安市雁塔区丈八东路262号 023-88131321	</td>
+							<td>建行西安长安路支行 61001720015050000695</td>
+							<td>测试备注</td>
+							<td>陈工 12345678901</td>
+							<td>广东省珠海市XXX路XXX号</td>
+							<td>合同x1、锁套装x1</td>
+							<td>邮寄物品备注信息</td>
+							<td>纵横公路工程造价管理系统V9.0</td>
+							<td>1</td>
+							<td>3000.00</td>
 							<td><b>￥3000.00</b><sup>专</sup></td>
 							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>最后审批人的审批意见</td>
 							<td><span class="colOrange">退回</span> 黄爱玲 2016-03-03 12:20:20</td>
 						</tr>
 						<tr>
 							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
 							<td>珠海XXXX公司</td>
+							<td>91610000220521254B</td>
+							<td>西安市雁塔区丈八东路262号 023-88131321	</td>
+							<td>建行西安长安路支行 61001720015050000695</td>
+							<td>测试备注</td>
+							<td>陈工 12345678901</td>
+							<td>广东省珠海市XXX路XXX号</td>
+							<td>合同x1、锁套装x1</td>
+							<td>邮寄物品备注信息</td>
+							<td>纵横公路工程造价管理系统V9.0</td>
+							<td>1</td>
+							<td>3000.00</td>
 							<td><b>￥3000.00</b><sup>专</sup></td>
 							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>最后审批人的审批意见</td>
 							<td><span class="colRed">终止</span> 黄爱玲 2016-03-03 12:20:20</td>
 						</tr>
+						<tr>
+							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
+							<td>珠海XXXX公司</td>
+							<td>91610000220521254B</td>
+							<td>西安市雁塔区丈八东路262号 023-88131321	</td>
+							<td>建行西安长安路支行 61001720015050000695</td>
+							<td>测试备注</td>
+							<td>陈工 12345678901</td>
+							<td>广东省珠海市XXX路XXX号</td>
+							<td>合同x1、锁套装x1</td>
+							<td>邮寄物品备注信息</td>
+							<td>纵横公路工程造价管理系统V9.0</td>
+							<td>1</td>
+							<td>3000.00</td>
+							<td><b>￥3000.00</b><sup>专</sup></td>
+							<td>广东办刘飞 2016-03-03 12:20:20</td>
+							<td>最后审批人的审批意见</td>
+							<td><a href="#approvalInvice" data-toggle="modal">审批发票</a></td>
+						</tr>
 						</tbody>
 					</table>
 				</div>
@@ -116,96 +190,131 @@
 			</div>
 		</div>
 	</div>
-	<!--弹出（录入收款）-->
-<div class="modal hide fade" id="inputbill">
-    <div class="modal-header">
-    <h3>录入收款</h3>
-    </div>
-    <div class="modal-body">
-    	<form>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款金额</label>
-              <div class="controls">
-                <input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number">
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款信息</label>
-              <div class="controls">
-                <input type="text">
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>到款银行</label>
-              <div class="controls">
-                <select>
-	            	<option>广发银行珠海分行柠溪支行</option>
-	            </select>
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label"><span class="colRed">*</span>银行到款时间</label>
-              <div class="controls">
-                <input type="date">
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label">指定认领人</label>
-              <div class="controls">
-                <select>
-	            	<option>待认领款项</option>
-	            	<option>广东办-刘飞</option>
-	            </select>
-              </div>
-            </div>
-    		<div class="control-group">
-              <label class="control-label">未收款发票</label>
-              <div class="controls">
-                <select>
-	            	<option>￥30000.00-珠海XXXXXXX公司-441027465</option>
-	            	<option>￥40000.00-珠海XXXXXXX公司-441027465</option>
-	            </select>
-              </div>
-            </div>
-    	</form>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认录入</a>
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
-	</div>
-</div>
-    <!--弹出内容-->
-	<!--弹出（录入收款）-->
-<div class="modal hide fade" id="receive">
-    <div class="modal-header">
-    <h3>认领收款</h3>
-    </div>
-    <div class="modal-body">
-    	<table class="table">
-    		<thead><tr><th width="50">收款信息</th><td></td>
-    			<th width="60"></th><td></td></tr></thead>
-    		<tr>
-    		</tr>
-    		<tr>
-    			<th>收款金额</th><td><b class="colOrange">￥200000.00</b></td>
-    			<th>收款信息</th><td>陈宇</td>
-    		</tr>
-    		<tr>
-    			<th>收款银行</th><td>广发银行珠海分行柠溪支行</td>
-    			<th>银行到帐</th><td>2016-04-11</td>
-    		</tr>
-    		<tr>
-    			<th>录入收款</th><td>张少珊<br>2015-04-12 11:30:02</td>
-    			<th></th><td></td>
-    		</tr>
-    	</table>
-    	<p class="colRed">请确认该收款属于您</p>
-    </div>
-	<div class="modal-footer">
-	    <a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认认领</a>
-	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	<!--弹出（发票打印详情）-->
+	<div class="modal hide fade" id="approvalInvice">
+		<div class="modal-dialog modal-lg">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>发票审批详情</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed" style="margin:15px 0;">
+						<tbody>
+							<tr>
+								<th class="taC" width="150">发票审批</th><td><textarea style="width:98%" placeholder="在这写下您的审批意见，选填。"></textarea></td>
+							</tr>
+						</tbody>
+					</table>
+					<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th class="taC" width="150">开票流水号</th><td>#F20160316001</td>
+								<th class="taC" width="150">提交时间</th><td>2016-03-01 12:30:01</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">所在办事处</th><td>广东办（刘飞）</td>
+								<th class="taC">开票内容</th><td>纵横公路工程造价管理系统V9.0</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">发票备注</th><td colspan="3"></td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">数量</th><td><b>1</b></td>
+								<th class="taC">单价</th><td><b>￥20000.00</b></td>
+							</tr>
+							<tr>
+								<th class="taC">开票金额</th><td colspan="3"><b class="colOrange" style="font-size:18px">￥20000.00</b></td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">增值税普通发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">单位名称</th><td>珠海纵横创建软件有限公司</td>
+
+							</tr>
+							<tr>
+								<th class="taC" width="150">纳税人识别码</th><td>1212123123123</td>
+
+							</tr>
+							<tr>
+								<th class="taC">注册地址、电话</th><td></td>
+							</tr>
+							<tr>
+								<th class="taC">开户银行及账号</th><td></td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="2" class="taC">增值税专用发票</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">单位名称</th><td>珠海纵横创建软件有限公司</td>
+
+							</tr>
+							<tr>
+								<th class="taC" width="150">纳税人识别码</th><td>1212123123123</td>
+
+							</tr>
+							<tr>
+								<th class="taC">注册地址、电话</th><td>广东省珠海市香洲区银桦路8号24D0756-34324</td>
+							</tr>
+							<tr>
+								<th class="taC">开户银行及账号</th><td>广发银行234324234</td>
+							</tr>
+							</tbody>
+						</table>
+						<table class="table table-bordered table-condensed">
+							<tbody>
+							<tr>
+								<th colspan="4" class="taC">邮寄信息</th>
+							</tr>
+							<tr>
+								<th class="taC" width="150">收件人</th><td>陈工</td>
+								<th class="taC" width="150">收件人手机/电话</th><td>12345678901</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">收件地址</th><td colspan="3">广东省珠海市XXX路XXX号</td>
+							</tr>
+							<tr>
+								<th class="taC" width="150">邮寄物品</th><td colspan="3">合同x1、锁套装x1</td>
+							</tr>
+							</tbody>
+						</table>
+					<table class="table table-bordered table-condensed">
+						<tr><th class="taC" >审批流程</th></tr>
+						<tr><td>
+									<blockquote>
+										<p><span class="colGray">2016-11-10 11:03:11</span>&nbsp;广东办-刘飞&nbsp;创建</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-10 11:15:23</span>&nbsp;广东办-刘飞&nbsp;提交审批</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colGreen">同意</span> 审批意见文本</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colOrange">退回</span> 审批意见文本</p>
+									</blockquote>
+									<blockquote>
+										<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colRed">终止</span> 审批意见文本</p>
+									</blockquote>
+								</td></tr>
+					</table>
+				</div>
+				<div class="modal-footer">
+					<a href="" class="button btn-done" style="width:100px;" data-placement="top" data-toggle="ctooltip" data-original-title="完成后自动跳转下一张发票">同意</a>
+					<a href="" class="button btn-back" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后重新审批">退回</a>
+					<a href="" class="button btn-undone" data-placement="top" data-toggle="ctooltip" data-original-title="终止发票申请">终止</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
 	</div>
-</div>
-    <!--弹出内容-->
+	<!--弹出发票打印详情-->
 <script type="text/javascript">autoFlashHeight();</script>
 </body>

invoice-approval.html

@@ -56,7 +56,7 @@
                 <div class="borad-news">
                     <div class="saeaList">
                         <div class="clearfix">
-                            <legend><div class="fR"></div>待审批开票</legend>
+                            <legend><div class="fR"><a href="invoice-approval-all.html">查看更多</a></div>待审批开票</legend>
                             <table class="table table-bordered table-condensed">
                                 <tbody>
                                 <tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">上一位审批</th><th class="taC" width="120">操作</th></tr>

invoice-ball.html

@@ -59,6 +59,13 @@
 				<div class="demandCate">
 					<ul class="cateList">
 						<li>
+							<select class="select">
+								<option>类型</option>
+								<option>普通发票</option>
+								<option>专用发票</option>
+							</select>
+						</li>
+						<li>
 							<div class="search">
 								<div class="input-append">
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"

invoice-print-all.html

@@ -65,6 +65,19 @@
 							<a href="#" title="已打印发票">已打印发票</a>
 						</li>
 						<li>
+							<select>
+								<option>类型</option>
+								<option>普通发票</option>
+								<option>专用发票</option>
+							</select>
+						</li>
+						<li>
+							<select class="select">
+								<option>个人发票</option>
+								<option>培训班发票</option>
+							</select>
+						</li>
+						<li>
 							<div class="search">
 								<div class="input-append">
 									<input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-range="true"
@@ -85,7 +98,7 @@
 				<div class="saeaList">
 					<table class="table table-hover">
 						<tbody>
-						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>纳税人识别码</th><th>注册地址、电话</th><th>开户银行及账号</th><th>备注</th><th>开票内容</th><th>数量</th><th>单价</th><th>开票金额</th><th>发票号</th><th>提交开票</th><th>打印发票</th></tr>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>纳税人识别码</th><th>注册地址、电话</th><th>开户银行及账号</th><th>备注</th><th>开票内容</th><th>数量</th><th>单价</th><th>开票金额</th><th>发票号</th><th>提交开票</th><th>审批意见</th><th>打印发票</th></tr>
 						<tr>
 							<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
 							<td>珠海XXXX公司</td>
@@ -99,6 +112,7 @@
 							<td><b>￥3000.00</b></td>
 							<td>No.99028</td>
 							<td>广东办刘飞（重庆办）<br>2016-03-03 12:20:20</td>
+							<td>最后审批人的审批意见</td>
 							<td>赵淑燕<br><span title=" 12:20:20">2016-03-03</span></td>
 						</tr>
 						<tr>
@@ -114,6 +128,7 @@
 							<td><b>￥3000.00</b><sup>专</sup></td>
 							<td>No.99028</td>
 							<td>广东办刘飞（重庆办）<br>2016-03-03 12:20:20</td>
+							<td>最后审批人的审批意见</td>
 							<td>赵淑燕<br>2016-03-03 12:20:20</td>
 						</tr>
 						<tr>
@@ -129,7 +144,8 @@
 							<td><b>￥3000.00</b><sup>专</sup></td>
 							<td>No.99028</td>
 							<td>广东办刘飞（重庆办）<br>2016-03-03 12:20:20</td>
-							<td><a class="button btn-block"  href="#invdetail" data-toggle="modal" >打印发票</a></td>
+							<td>最后审批人的审批意见</td>
+							<td><a href="#invdetail" data-toggle="modal" >打印发票</a></td>
 						</tr>
 						</tbody>
 					</table>
@@ -158,13 +174,13 @@
 					<h3>发票打印详情</h3>
 				</div>
 				<div class="modal-body saeaList">
-					<table class="table table-bordered table-condensed" style="padding:25px 0;">
+					<!-- <table class="table table-bordered table-condensed" style="margin:15px 0;">
 						<tbody>
 							<tr>
 								<th class="taC">发票号</th><td><span class="colRed">*</span>No.<input value="" type="text" placeholder="输入发票号"></td>
 							</tr>
 						</tbody>
-					</table>
+					</table> -->
 					<table class="table table-bordered table-condensed">
 							<tbody>
 							<tr>
@@ -247,7 +263,7 @@
 							</tbody>
 						</table>
 					<table class="table table-bordered table-condensed">
-						<tr><th class="taC" >审批流程</th></tr>
+						<tr><th class="taC" width="60%">审批流程</th><th class="taC">发票打印</th></tr>
 						<tr><td>
 									<blockquote>
 										<p><span class="colGray">2016-11-10 11:03:11</span>&nbsp;广东办-刘飞&nbsp;创建</p>
@@ -264,7 +280,9 @@
 									<blockquote>
 										<p><span class="colGray">2016-11-11 09:54:01</span>&nbsp;总部-张少珊&nbsp;<span class="colRed">终止</span> 审批意见文本</p>
 									</blockquote>
-								</td></tr>
+								</td>
+								<td><p><span class="colRed">*</span>No.<input value="" type="text" placeholder="输入发票号"></p></td>
+							</tr>
 					</table>
 				</div>
 				<div class="modal-footer">

saea-reportList-pay.html

@@ -148,31 +148,23 @@
 
 <!--弹出汇款信息-->
 <div class="modal hide fade" id="saea-remit">
-	<div class="modal-dialog modal-lg">
+	<div class="modal-dialog">
 		<div class="modal-content">
 	<div class="modal-header">
 		<h3>汇款信息</h3>
 	</div>
 	<div class="modal-body saeaList">
-		<table class="table table-bordered table-condensed">
-			<tbody>
-				<tr>
-					<th class="taC">银行信息</th>
-					<th class="taC">卡号</th>
-				</tr>
-				<tr>
-					<td>建行西安长安路支行</td>
-					<td>61001720015050000695</td>
-				</tr>
-				<tr>
-					<td>建行西安长安路支行</td>
-					<td>61001720015050000695</td>
-				</tr>
-			</tbody>
-		</table>
+		<p style="padding-bottom: 20px;">请选择导出的内容</p>
+		<select>
+			<option>待执行</option>
+			<option>已执行</option>
+		</select>
+		<select>
+			<option>办事处</option>
+		</select>
 	</div>
 	<div class="modal-footer">
-		<a href="#" class="button btn-primary" >确定</a>
+		<a href="#" class="button btn-primary" >导出Excel</a>
 		<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
 			</div></div>