outaozhen 8 лет назад
Родитель
Сommit
71b0086796
1 измененных файлов с 26 добавлено и 5 удалено
  1. 26 5
      invoice-input-billing-all.html

+ 26 - 5
invoice-input-billing-all.html

@@ -90,6 +90,7 @@
 						<th>收款认领</th>
 						<th>发票入账</th>
 						<th>退款</th>
+						<th>关联新款</th>
 						<th>开票流水号</th>
 						<th>操作</th>
 					</tr>
@@ -105,6 +106,7 @@
 	  					<td></td>
 	  					<td></td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#receive" data-toggle="modal">变更</a><br><a href="#money" data-toggle="modal">删除</a><br><a href="#refund" data-toggle="modal">退款</a></td>
 	  				</tr>
 					<!--未认领&认领-->
@@ -120,6 +122,7 @@
 	  					<td>张少珊 删除到款<br>2015-04-12 11:30:02</td>
 	  					<td></td>
 	  					<td></td>
+	  					<td></td>
 	  				</tr>
 	  				<tr>
 	  					<td><a href="#billing" data-toggle="modal">#SK20160316001</a></td>
@@ -132,6 +135,7 @@
 	  					<td></td>
 	  					<td></td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#receive"  data-toggle="modal">变更</a><br><a href="#search-invoice" data-toggle="modal">查询发票</a><br><a href="#refund" data-toggle="modal">退款</a></td>
 	  				</tr>
 	  				<!--未入账(需要退款)-->
@@ -146,7 +150,8 @@
 	  					<td></td>
 	  					<td>张少珊 退款 <b class="colRed">¥5000.00</b><br><a href="#refunded" data-toggle="modal">退款信息</a><br>2015-04-12 11:30:02</td>
 	  					<td></td>
-	  					<td><a href="#receipt" data-toggle="modal">关联新收款</a></td>
+	  					<td></td>
+	  					<td><a href="#receipt" data-toggle="modal">关联新款</a></td>
 	  				</tr>
 	  				<!--未入账(退款信息)-->
 	  				<tr>
@@ -158,7 +163,8 @@
 	  					<td>张少珊<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td></td>
-	  					<td>张少珊 退款  <b class="colRed">¥5000.00</b><br><a href="#invoiced" data-toggle="modal">#SK20160316005</a><br><a href="#refunded" data-toggle="modal">退款信息</a><br>2015-04-12 11:30:02</td>
+	  					<td>张少珊 退款  <b class="colRed">¥5000.00</b><br><a href="#refunded" data-toggle="modal">退款信息</a><br>2015-04-12 11:30:02</td>
+	  					<td>张少珊 关联新款 <a href="#invoiced" data-toggle="modal">#SK20160316005</a><br>2015-04-12 12:30:02</td>
 	  					<td></td>
 	  					<td></td>
 	  				</tr>
@@ -174,6 +180,7 @@
 	  					<td>刘飞 退票<br>2015-04-12 11:30:02</td>
 	  					<td></td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#search-invoice" data-toggle="modal">查询发票</a></td>
 	  				</tr>
 						<!--解绑后的发票-->
@@ -188,6 +195,7 @@
 	  					<td>刘飞 解绑<a href="#invoiced" data-toggle="modal">#F20160316001</a><br>2015-04-12 11:30:02</td>
 	  					<td></td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#search-invoice" data-toggle="modal">查询发票</a></td>
 	  				</tr>
 						<!--已入账(用户认领)-->
@@ -201,6 +209,7 @@
 	  					<td>陈特 认领<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a></td>
 	  					<td><a href="#billeidt" data-toggle="modal">解绑</a></td>
 	  				</tr>
@@ -215,6 +224,7 @@
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a></td>
 	  					<td><a href="#billeidt" data-toggle="modal">解绑</a></td>
 	  				</tr>
@@ -230,6 +240,7 @@
 	  					<td></td>
 	  					<td></td>
 	  					<td></td>
+	  					<td></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><br><a href="#refund" data-toggle="modal">退款</a></td>
 	  				</tr>
 						<!--一个收款绑定多个入账 - 发票金额不满足收款金额-->
@@ -243,6 +254,7 @@
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a>,<a href="#invoiced" data-toggle="modal">#F20160316003</a></td>
 	  					<td><a href="#billeidt" data-toggle="modal">解绑</a><br><a href="#search-invoice" data-toggle="modal">查询发票</a></td>
 	  				</tr>
@@ -257,6 +269,7 @@
 	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
 	  					<td>张少珊 入账<br>2015-04-12 11:30:02</td>
 	  					<td></td>
+	  					<td></td>
 	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a>,<a href="#invoiced" data-toggle="modal">#F20160316003</a></td>
 	  					<td><a href="#billeidt" data-toggle="modal">解绑</a></td>
 	  				</tr>
@@ -488,6 +501,10 @@
 					<th class="taC">退款金额</th>
 					<td><input type="text" name="" id="" placeholder="请输入退款金额" aria-required="true" aria-invalid="true"></td>
 				</tr>
+				<tr>
+					<th class="taC">备注</th>
+					<td><textarea style="width:390px"></textarea></td>
+				</tr>
 				</tbody>
 			</table>
     </div>
@@ -520,7 +537,11 @@
 				</tr>
 				<tr>
 					<th class="taC">退款金额</th>
-					<td>¥3000.00</td>
+					<td>¥5000.00</td>
+				</tr>
+				<tr>
+					<th class="taC">备注</th>
+					<td>客户只需要开票25000元,需要退款5000元。</td>
 				</tr>
 				</tbody>
 			</table>
@@ -584,8 +605,8 @@
 								<th class="taC">录入收款</th><td>张少珊 2015-04-12 11:30:02</td>
 							</tr> 
 							<tr>
-								<th class="taC">收款金额</th><td><b>¥300000.00</b></td>
-								<th class="taC">实际收款金额</th><td><b class="colGreen">¥250000.00</b></td>
+								<th class="taC">收款金额</th><td><b>¥30000.00</b></td>
+								<th class="taC">实际收款金额</th><td><b class="colGreen">¥25000.00</b></td>
 							</tr>
 							<tr>
 								<th class="taC">收款信息</th><td>陈宇</td>