开票界面修改

index.php

@@ -16,7 +16,7 @@ include $config['BASE_PATH'].'app/DooConfig.php';
 Doo::conf()->set($config);
 
 # remove this if you wish to see the normal PHP error view.
-include $config['BASE_PATH'].'diagnostic/debug.php';
+//include $config['BASE_PATH'].'diagnostic/debug.php';
 
 Doo::acl()->rules=$acl;
 

protected/config/execute/invoice.ini

@@ -1 +1 @@
-,43,58,50,50
+,43,58,50,50,9,2

protected/config/invoice/invoice.ini

@@ -1 +1 @@
-{"\u53d1\u7968\u6253\u5370":"43,58","\u53d1\u7968\u5ba1\u6279":",50"}
+{"\u53d1\u7968\u6253\u5370":"43,58","\u53d1\u7968\u5ba1\u6279":",50,9,2"}

protected/view/admin/implement.html

@@ -102,9 +102,15 @@
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
-	  						<tr class="warning"><td class="taR"><b>（{{receiptDetail' value.receiptOrder}}）本次报销费用合计</b></td>
-	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
-	  						<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>借款结余</b></td>
+	  						<tr class="warning">
+	  						<td class="taR"><b>本次借款</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
+	  						</tr>
+	  						<tr class="warning">
+	  						<td class="taR"><b>本次报销金额</b></td>
+	  						<td class="colGreed taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td>
+	  						</tr>
+	  						<tr <!-- if {{receiptDetail' value.relust}}>=0 --> class="success" <!-- else --> class="error" <!-- endif --> ><td class="taR"><b>差额</b></td>
 	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
 	  						</tbody>
 	  					</table>
@@ -141,9 +147,12 @@
 							<tbody>
 								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
 								<tr><th>汇款金额（用于生成汇款单）</th>
-								<td class="taR" width="200">￥<input placeholder="输入汇款金额" pattern="[0-9]" data-tm="{{receiptDetail' value.sum}}" id="amountLoan" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number">
+								<td class="taR" width="200">￥
+								
+								<input placeholder="输入汇款金额" pattern="[0-9]" data-tm="{{receiptDetail' value.sum}}" id="amountLoan" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number">
 								<button class="btn btn-small" node-qmk="tm" data='amountLoan'  type="button">取值</button>
 								
+								
 								</td></tr>
 							</tbody>
 						</table>
@@ -159,7 +168,7 @@
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
 	  					</div>
-	  					<div class="censorList">
+	  					<div class="censorList clearfix censorHeight">
 	  					<ul>
 		  						<li class="post">
 		  							<div class="avtra"><img src="{{receiptDetail' value.staffDetail.avatar}}_2.jpg" width="32"></div>
@@ -264,8 +273,15 @@
 							<tbody>
 								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
 								<tr><th>汇款金额（用于生成汇款单）</th>
-								<td class="taR" width="200">￥<input placeholder="输入汇款金额" pattern="[0-9]" data-tm="{{receiptDetail' value.sum}}" id="amountPublic" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number">
+								<td class="taR" width="200">￥
+								
+								
+								
+								<input placeholder="输入汇款金额" pattern="[0-9]" data-tm="{{receiptDetail' value.sum}}" id="amountPublic" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number">
 								<button class="btn btn-small" node-qmk="tm" data='amountPublic'  type="button">取值</button>
+								
+								
+								
 								</td></tr>
 							</tbody>
 						</table>
@@ -281,7 +297,7 @@
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
 	  					</div>
-	  					<div class="censorList">
+	  					<div class="censorList clearfix censorHeight">
 	  					<ul>
 	  							
 		  						<li class="post">
@@ -415,8 +431,17 @@
 	  					<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">￥<input placeholder="输入汇款金额" data-tm="{{receiptDetail' value.sum}}" pattern="[0-9]" id="amountReceipt" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number">
+								<tr><th>汇款金额（用于生成汇款单）</th><td class="taR" width="200">￥
+								
+								
+								
+								
+								
+								<input placeholder="输入汇款金额" data-tm="{{receiptDetail' value.sum}}" pattern="[0-9]" id="amountReceipt" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number">
 								<button class="btn btn-small" node-qmk="tm" data='amountReceipt'  type="button">取值</button>
+								
+								
+								
 								</td></tr>
 							</tbody>
 						</table>
@@ -434,7 +459,7 @@
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
 	  					</div>
-	  					<div class="censorList">
+	  					<div class="censorList clearfix censorHeight">
 	  					<ul>
 	  							
 		  						<li class="post">

protected/view/admin/invoiceAdd.html

@@ -95,7 +95,7 @@
 								<tr>
 									<th class="taC"><span class="colRed">*</span>开户银行</th>
 									<td><input type="text" name="bank" id="bank"></td>
-									<th class="taC"><span class="colRed">*</span>银行账户</th>
+									<th class="taC"><span class="colRed">*</span>银行账号</th>
 									<td><input type="text" name="bankAccount" id="bankAccount"></td>
 								</tr>
 								</tbody>

protected/view/admin/invoiceApprovalDetail.html

@@ -75,7 +75,7 @@
 							</tr>
 							<tr>
 								<th class="taC">开户银行</th><td>{{invoiceDetail.bank}}</td>
-								<th class="taC">银行账户</th><td>{{invoiceDetail.bankAccount}}</td>
+								<th class="taC">银行账号</th><td>{{invoiceDetail.bankAccount}}</td>
 							</tr>
 							</tbody>
 						</table>

protected/view/admin/invoiceEdit.html

@@ -108,7 +108,7 @@
 							<tr>
 								<th class="taC"><span class="colRed">*</span>开户银行</th>
 								<td><input type="text" name="bank" id="bank" value="{{invoiceDetail.bank}}"></td>
-								<th class="taC"><span class="colRed">*</span>银行账户</th>
+								<th class="taC"><span class="colRed">*</span>银行账号</th>
 								<td><input type="text" name="bankAccount" id="bankAccount" value="{{invoiceDetail.bankAccount}}"></td>
 							</tr>
 							</tbody>

protected/view/admin/invoicePrintAchieve.html

@@ -41,7 +41,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></tr>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th> <th>纳税人识别码</th> <th>注册地址`电话</th><th>开户银行`账号</th> <th>开票金额</th><th>提交开票</th><th>发票号</th><th>打印发票</th></tr>
 						
 						<!-- loop list -->
 						<tr>
@@ -51,6 +51,11 @@
 	                                    <!-- else -->
 	                                    {{list' value.invoiceTitle}}
 	                                    <!-- endif --></td>
+	                                    
+	                          <td>{{list' value.TIN}}</td>   
+	                          <td>{{list' value.address}} {{list' value.phone}}</td>             
+	                           <td>{{list' value.bank}} {{list' value.bankAccount}}</td>                      
+	                                    
 							<td>
 							<!-- if !empty({{list' value.invoiceType}}) -->
 	                        <b>￥{{list' value.invoicePrice}}</b><sup>专</sup>
@@ -59,6 +64,8 @@
 	                          <!-- endif -->
 							</td>
 							
+							
+							
 							<td>{{list' value.categoryName}}{{list' value.userName}} {{list' value.date}}</td>
 							<td>
 							  {{invoiceList' value.invoiceNo}}

protected/view/admin/invoicePrintDetail.html

@@ -69,12 +69,12 @@
 							</tr>
 							</tr>
 							<tr>
-								<th class="taC">注册地址</th><td>{{invoiceDetail.address}}</td>
-								<th class="taC">注册电话</th><td>{{invoiceDetail.phone}}</td>
+								<th class="taC">注册地址`电话</th><td>{{invoiceDetail.address}}&nbsp;{{invoiceDetail.phone}}</td>
+								
 							</tr>
 							<tr>
-								<th class="taC">开户银行</th><td>{{invoiceDetail.bank}}</td>
-								<th class="taC">银行账户</th><td>{{invoiceDetail.bankAccount}}</td>
+								<th class="taC">开户银行`账号</th><td>{{invoiceDetail.bank}}&nbsp;{{invoiceDetail.bankAccount}}</td>
+								
 							</tr>
 							</tbody>
 						</table>

protected/view/admin/invoiceUntreadAchieve.html

@@ -41,7 +41,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></tr>
+						<tr class="thead"><th>开票流水号</th><th>开票单位（抬头）</th><th>开票金额</th><th>发票号</th><th>提交退票</th><th>快递信息</th><th>确认退票</th></tr>
 						
 						<!-- loop list -->
 						<tr>
@@ -59,6 +59,8 @@
 	                          <!-- endif -->
 							</td>
 							
+							<td>{{list' value.invoiceNo}}</td>
+							
 							<td>{{list' value.categoryName}}{{list' value.userName}} {{list' value.date}}</td>
 							<td>{{invoiceList' value.untreadCompany}}:
                                     <a href="#shipping" title="{{invoiceList' value.untreadItems}}" node-express="untread" data-toggle="modal">{{invoiceList' value.untreadNumber}}</a>