汇款金额 银行流水问题

saea-myList-detail.html

@@ -52,7 +52,7 @@
 						<!--1.借款相关状态显示-->
 						<!--借款审批中-->
 						<div class="entry loan-list">
-							<div class="seal"></div>
+							<div class="seal done"></div>
 							<div class="seTable">
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
@@ -73,9 +73,14 @@
 									<th class="taC" colspan="2">附件</th>
 									<tr><td colspan="2"><a href="#" class="sFile" target="_blank">发票1.jpg</a><a href="#" class="sFile" target="_blank">QQ截图20150624170045.png</a><a href="#" class="sFile" target="_blank">Doc1.docx</a></td></tr>
 									<tr class="warning"><td class="taR"><b>（#G1402130405003）本次费用合计</b></td><td class="taR"><b style="font-size:24px">￥7011.22</b><br>柒仟零壹拾壹元贰角贰分</td></tr>
-									<tr class="warning"><td class="taR"><b>汇款金额</b></td>
-										<td class="taR" width="140"><b style="font-size:24px">￥7011.22</b><br>柒仟零壹拾壹元贰角贰分</td>
-									</tr>
+									</tbody>
+								</table>
+								<br>
+								<!--结算结果（原汇款信息）自动生成-->
+								<table class="table table-bordered table-condensed table-hover">
+									<tbody>
+										<tr><th colspan="2" class="taC">费用结算</th></tr><tr><th>结算结果<br><span class="colGray">("支出"由你汇款至公司，"收入"由公司汇款给你。)</span></th><td class="taR" width="200"><span class="colGreen">收入</span><!-- <span class="colRed">支出</span>---></td></tr>
+								<tr><th>汇款金额</th><td class="taR" width="200">￥2050.00</td></tr>
 									</tbody>
 								</table>
 							</div>

saea-reportList-bill.html

@@ -59,11 +59,11 @@
 									<legend><div class="fR"></div>需要您处理</legend>
 									<table class="table table-bordered table-condensed">
 										<tbody>
-										<tr><th class="taC" width="140">费用类型</th><th class="taC">单号</th><th class="taC">金额</th><th class="taC">汇款金额</th><th class="taC">状态</th><th class="taC">操作</th></tr>
-										<tr><th>借款（报销）</th><td><a href="saea-myList-detail.html">#J201405291714(点我)</a></td><td class="taR">￥2000.00</td><td class="taR"><span class="colRed">支出</span>￥2000.00</td><td><span class="">审批中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
+										<tr><th class="taC" width="140">费用类型</th><th class="taC">单号</th><th class="taC">金额</th><th class="taC">费用结算</th><th class="taC">状态</th><th class="taC">操作</th></tr>
+										<tr><th>借款（报销）</th><td><a href="saea-myList-detail.html">#J201405291714(点我)</a></td><td class="taR">￥2000.00</td><td class="taR"><span class="colGreen">收入</span>￥1000.00</td><td><span class="">审批中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
 										<tr><th>报销单</th><td><a href="">#B201405291714</a></td><td class="taR">￥1000.00</td><td class="taR"><span class="colRed">支出</span>￥1000.00</td><td><span>审批中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
 										<tr><th>报销单</th><td><a href="">#B201405291714</a></td><td class="taR">￥1000.00</td><td class="taR"><span class="colRed">支出</span>￥1000.00</td><td><span class="colBlue">执行中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
-										<tr><th>报销单</th><td><a href="">#B201405291714</a></td><td class="taR">￥1000.00</td><td class="taR"><span class="colGreen">收入</span>￥5000.00</td><td><span class="colBlue">执行中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
+										<tr><th>报销单</th><td><a href="">#B201405291714</a></td><td class="taR">￥1000.00</td><td class="taR"><span class="colRed">支出</span>￥1000.00</td><td><span class="colBlue">执行中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
 										<tr><th>培训班结算</th><td><a href="saea-myList-detail2.html">#P201405291714（点我）</a></td><td class="taR">￥51000.00</td><td class="taR"><span class="colRed">支出</span>￥51000.00</td><td><span>审批中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
 										<tr><th>培训班结算</th><td><a href="saea-train-edit.html">#P201405291714</a></td><td class="taR">￥51000.00</td><td class="taR"><span class="colRed">支出</span>￥51000.00</td><td><span class="">审批中</span></td><td width="120"><a class="button btn-block"  href="#in-income" data-toggle="modal">录入流水</a></td></tr>
 										</tbody>
@@ -106,17 +106,17 @@
 							</td>
 						</tr>
 						<tr>
-							<th class="taC">支出金额</th>
+							<th class="taC">金额</th>
 							<td>2000</td>
 						</tr>
 						<tr>
-							<th class="taC">备注</th>
-							<td><textarea></textarea></td>
-						</tr>
-						<tr>
 							<th class="taC">录入时间</th>
 							<td><input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-timepicker="true" data-language="zh" data-time-format="hh:ii:00"></td>
 						</tr>
+						<tr>
+							<th class="taC">备注</th>
+							<td><textarea></textarea></td>
+						</tr>
 						<!--收入出-->
 						<tr>
 							<th class="taC">流水类型</th>
@@ -135,7 +135,7 @@
 							</td>
 						</tr>
 						<tr>
-							<th class="taC">到款金额</th>
+							<th class="taC">金额</th>
 							<td>2000</td>
 						</tr>
 						<tr>

saea-reportList-pay-detail.html

@@ -9,6 +9,9 @@
 	<link rel=stylesheet href=css/global.css>
 	<script src=js/jquery-1.7.1.min.js></script>
 	<script src=js/global.js></script>
+	<link href="css/datepicker.min.css" rel="stylesheet" type="text/css">
+	<script src="js/datepicker.min.js"></script>
+	<script src="js/datepicker.zh.js"></script>
 </head>
 <body>
 	<div class="mainLayout">
@@ -79,15 +82,15 @@
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
 										<tr><th colspan="2" class="taC">生成银行流水</th></tr>
-										<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th><td class="taR" width="200"><span class="colGreen">收入</span><!-- <span class="colRed">支出</span> --></td></tr>
+										<tr><th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><!-- <span class="colGreen">收入</span> --><span class="colRed">支出</span></td></tr>
 										<tr><th>汇款金额</th><td class="taR" width="220">￥
 										    2050.00
 										</td></tr>
 										<!--支出类型-->
-										<!-- <tr><th>支出银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr> -->
+										<tr><th>支出银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr>
 										<!--收入类型-->
-										<tr><th>到款银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr>
-										<tr><th>录入时间</th><td><input class="datepicker-here span3" placeholder="按时间筛选" type="text" data-timepicker="true" data-language="zh" data-time-format="hh:ii:00"></td></tr>
+										<!-- <tr><th>到款银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr> -->
+										<tr><th>录入时间</th><td><input class="datepicker-here span3" placeholder="选择时间" type="text" data-timepicker="true" data-language="zh" data-time-format="hh:ii:00" value="2019-10-09 15:11:00"></td></tr>
 										<tr><th>备注</th><td><textarea></textarea></td></tr>
 										</tbody>
 								</table>
@@ -96,9 +99,13 @@
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
 										<tr><th colspan="2" class="taC">银行水流详情</th></tr>
-										<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th><td class="taR" width="200">支出</td></tr>
-										<tr><th>汇款金额</th><td class="taR" width="220">￥2050.00
+										<tr><th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><span class="colRed">支出</span><!-- <span class="colGreen">收入</span> --></td></tr>
+										<tr><th>金额</th><td class="taR" width="220">￥2050.00
+										</td></tr>
+										<tr><th>支出银行</th><td class="taR" width="220">广发银行
 										</td></tr>
+										<!-- <tr><th>到款银行</th><td class="taR" width="220">广发银行
+										</td></tr> -->
 										<tr><th>提交人</th><td class="taR" width="220">
 										总部-黄嘉玲</td></tr>
 										<tr><th>备注</th><td class="taR" width="220">
@@ -173,12 +180,21 @@
 									</tbody>
 								</table>
 								<br>
+								<!--执行需要生成流水-->
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
-									<tr><th colspan="3" class="taC">确认汇款金额</th></tr>
-									<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="200">￥<input required placeholder="输入汇款金额" pattern="[0-9]" step="1" min="0" class="span2" type="number"></td></tr>
-									<tr><th>支付银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr>
-									</tbody>
+										<tr><th colspan="2" class="taC">生成银行流水</th></tr>
+										<tr><th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><span class="colGreen">收入</span><!-- <span class="colRed">支出</span> --></td></tr>
+										<tr><th>汇款金额</th><td class="taR" width="220">￥
+										    2050.00
+										</td></tr>
+										<!--支出类型--><!-- 
+										<tr><th>支出银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr> -->
+										<!--收入类型-->
+										<tr><th>到款银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr>
+										<tr><th>录入时间</th><td><input class="datepicker-here span3" placeholder="选择时间" type="text" data-timepicker="true" data-language="zh" data-time-format="hh:ii:00"></td></tr>
+										<tr><th>备注</th><td><textarea></textarea></td></tr>
+										</tbody>
 								</table>
 							</div>
 							<div class="seCensor receipt-censor">
@@ -318,17 +334,26 @@
 								<table class="table table-bordered table-condensed">
 									<tr class="warning"><td class="taR"><b>本次借款</b></td><td class="taR" width="140"><b style="font-size:24px">￥3000.00</b><br>叁仟元整</td></tr>
 									<tr class="warning"><td class="taR"><b>本次报销金额</b></td><td class="taR"><b style="font-size:24px">￥2050.00</b><br>贰仟零伍拾元整</td></tr>
-									<tr class="error"><td class="taR"><b>差额</b></td>
-										<td class="taR"><b style="font-size:24px">-750.00</b><br>柒佰零伍拾元整</td>
+									<tr class="error"><td class="taR"><span class="colGray">报销 - 借款 = </span><b>差额</b></td>
+										<td class="taR"><b style="font-size:24px">-950.00</b><br>柒佰零伍拾元整</td>
 									</tr>
 								</table>
 								<br>
+								<!--执行需要生成流水-->
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
-									<tr><th colspan="3" class="taC">确认汇款金额</th></tr>
-									<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="200">￥<input required placeholder="输入汇款金额" pattern="[0-9]" step="1" min="0" class="span2" type="number"></td></tr>
-									<tr><th>支付银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr>
-									</tbody>
+										<tr><th colspan="2" class="taC">生成银行流水</th></tr>
+										<tr><th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><span class="colGreen">收入</span><!-- <span class="colRed">支出</span>--></td></tr>
+										<tr><th>汇款金额</th><td class="taR" width="220">￥
+										    950.00
+										</td></tr>
+										<!--支出类型-->
+										<!-- <tr><th>支出银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr> -->
+										<!--收入类型-->
+										<tr><th>到款银行</th><td class="taR" width="200"><select><option>请选择</option><option>纵横广发</option><option>纵横工行</option><option>个人广发</option><option>华润银行</option></select></td></tr>
+										<tr><th>录入时间</th><td><input class="datepicker-here span3" placeholder="选择时间" type="text" data-timepicker="true" data-language="zh" data-time-format="hh:ii:00" value="2019-10-09 15:11:00"></td></tr>
+										<tr><th>备注</th><td><textarea></textarea></td></tr>
+										</tbody>
 								</table>
 							</div>
 							<div class="seCensor loan-censor">

saea-reportList-pay.html

@@ -67,7 +67,7 @@
 	  			<!--执行列表-->
 	  			<div class="entry">
 	  				<table class="table table-bordered table-condensed">
-	  					<thead><tr><th width="54">上报人</th><th width="80">费用类型</th><th width="100">费用总金额</th><th width="100">汇款金额</th><th width="120">费用所在办事处</th><th width="120">费用单号</th><th>费用说明</th><th width="100">状态</th><th width="100">操作</th></tr></thead>
+	  					<thead><tr><th width="54">上报人</th><th width="80">费用类型</th><th width="100">费用总金额</th><th width="100">费用结算</th><th width="120">费用所在办事处</th><th width="120">费用单号</th><th>费用说明</th><th width="100">状态</th><th width="100">操作</th></tr></thead>
 	  					<tbody>
 	  						<tr>
 	  							<td><div class="avtra"><img src="images/avatar-6.png" width="32"><br>刘飞</td>

saea-reportList-report.html

@@ -87,11 +87,11 @@
 									</tbody>
 								</table>
 								<br>
-								<!--需要填信息，用于生成流水-->
+								<!--结算结果（原汇款信息）自动生成-->
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
-										<tr><th colspan="2" class="taC">费用结算</th></tr><tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th><td class="taR" width="200"><span class="colGreen">收入</span><!-- <span class="colRed">支出</span> --></td></tr>
-								<tr><th>汇款金额（如果为“支出”则会生成汇款单）</th><td class="taR" width="200">￥3000.00</td></tr>
+										<tr><th colspan="2" class="taC">费用结算</th></tr><tr><th>结算结果<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><!-- <span class="colGreen">收入</span> --><span class="colRed">支出</span></td></tr>
+								<tr><th>汇款金额</th><td class="taR" width="200">￥2050.00</td></tr>
 									</tbody>
 								</table>
 								<!--已经有流水，不需要填信息-->
@@ -99,9 +99,13 @@
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
 										<tr><th colspan="2" class="taC">银行水流详情</th></tr>
-										<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th><td class="taR" width="200">支出</td></tr>
-										<tr><th>汇款金额</th><td class="taR" width="220">￥2050.00
+										<tr><th>流水类型<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><span class="colRed">支出</span><!-- <span class="colGreen">收入</span> --></td></tr>
+										<tr><th>金额</th><td class="taR" width="220">￥2050.00
 										</td></tr>
+										<tr><th>支出银行</th><td class="taR" width="220">广发银行
+										</td></tr>
+										<!-- <tr><th>到款银行</th><td class="taR" width="220">广发银行
+										</td></tr> -->
 										<tr><th>提交人</th><td class="taR" width="220">
 										总部-黄嘉玲</td></tr>
 										<tr><th>备注</th><td class="taR" width="220">
@@ -246,34 +250,6 @@
 												<p>同意</p>
 											</div>
 										</li>
-										<li class="back">
-											<div class="avtra"><img src="images/avatar-3.png" width="32"></div>
-											<div class="comment">
-												<p class="colGray"><span class="fR">2014-02-13</span>赵淑燕</p>
-												<p>撤回</p>
-											</div>
-										</li>
-										<li class="post">
-											<div class="avtra"><img src="images/avatar-6.png" width="32"></div>
-											<div class="comment">
-												<p><span class="fR">2014-02-13</span>刘飞</p>
-												<p>提交审批</p>
-											</div>
-										</li>
-										<li class="done">
-											<div class="avtra"><img src="images/avatar-1.png" width="32"></div>
-											<div class="comment">
-												<p class="colGray"><span class="fR">2014-02-13</span>谭玉堂（经理）</p>
-												<p>同意支付！阿斯顿萨上的事实的是当时的是对</p>
-											</div>
-										</li>
-										<li class="done">
-											<div class="avtra"><img src="images/avatar-2.png" width="32"></div>
-											<div class="comment">
-												<p class="colGray"><span class="fR">2014-02-13</span>何银龄（经理）</p>
-												<p>同意</p>
-											</div>
-										</li>
 										<li>
 											<div class="avtra"><img src="images/avatar-3.png" width="32"></div>
 											<div class="comment">
@@ -287,18 +263,6 @@
 												<p class="colGray">杨福芳</p>
 											</div>
 										</li>
-										<li>
-											<div class="avtra"><img src="images/avatar-4.png" width="32"></div>
-											<div class="comment">
-												<p class="colGray">杨福芳</p>
-											</div>
-										</li>
-										<li>
-											<div class="avtra"><img src="images/avatar-4.png" width="32"></div>
-											<div class="comment">
-												<p class="colGray">杨福芳</p>
-											</div>
-										</li>
 									</ul>
 								</div>
 								<div class="reportButton">

saea-reportList-report2.html

@@ -213,11 +213,12 @@
 							</tbody>
 						</table>
 						<br>
-						<!--付总部款为负数时，自动生成汇款金额-->
+						<!--根据付总部款，结算结果（原汇款信息）自动生成-->
+						<!--付总部款为负数时，结算结果为支出,付总部款为正数时，结算结果为收入-->
 						<table class="table table-bordered table-condensed table-hover">
 							<tbody>
-								<tr><th colspan="2" class="taC">费用结算</th></tr><tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th><td class="taR" width="200"><span class="colGreen">收入</span><!-- <span class="colRed">支出</span> --></td></tr>
-								<tr><th>汇款金额（如果为“支出”则会生成汇款单）</th><td class="taR" width="200">￥3000.00</td></tr>
+								<tr><th colspan="2" class="taC">费用结算</th></tr><tr><th>结算结果<br><span class="colGray">("支出"由公司汇出，"收入"提交人需汇款至公司。)</span></th><td class="taR" width="200"><!-- <span class="colGreen">收入</span> --><span class="colRed">支出</span></td></tr>
+						<tr><th>汇款金额</th><td class="taR" width="200">￥2050.00</td></tr>
 							</tbody>
 						</table>
 						<!--已经有流水，不需要填信息-->
@@ -225,8 +226,10 @@
 								<table class="table table-bordered table-condensed table-hover">
 									<tbody>
 										<tr><th colspan="2" class="taC">银行水流详情</th></tr>
-										<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th><td class="taR" width="200">收入</td></tr>
-										<tr><th>汇款金额</th><td class="taR" width="220">￥2050.00
+										<tr><th>流水类型("支出"由公司汇出，"收入"提交人汇款至公司。)</th><td class="taR" width="200"><span class="colGreen">收入</span></td></tr>
+										<tr><th>金额</th><td class="taR" width="220">￥2050.00
+										</td></tr>
+										<tr><th>到款银行</th><td class="taR" width="220">珠海广发
 										</td></tr>
 										<tr><th>提交人</th><td class="taR" width="220">
 										总部-黄嘉玲</td></tr>