费用汇款金额

global/js/receipt.js

@@ -39,7 +39,20 @@ function receiptSop(){
 function updateApprovalReceipt(status,rid){
 	 var form = $('#verifyOpinion_'+rid); 
 	 $('#status_'+rid).val(status);
-	form.submit(); 
+	 $("input[name='amount']").val($('#amount').val());
+	 
+	 form.submit(); 
+}
+
+function setExeReceipt(tr,rid){
+	 var form = $('#implement'+tr);
+	 var amount=$('#amount'+tr).val();
+	 console.log(amount);
+	 if(amount=='0.00')
+		 return alert('请填写汇款金额');
+	 $("#amountInp"+tr).val(amount);
+	 
+	 form.submit(); 
 }
 
 function expensesDefray(status,rid){

protected/config/routes.conf.php

@@ -168,16 +168,25 @@ $route['*']['/saeaLoanEdiDo'] = array('ReceiptController', 'saeaLoanEdiDo');
 $route['*']['/confirmation/:rid'] = array('ReceiptController', 'confirmation');
 $route['*']['/approvalExpenses'] = array('ReceiptController', 'approvalExpenses');
 $route['*']['/approvalExpenses/:status'] = array('ReceiptController', 'approvalExpenses');
-$route['*']['/approvalExpenses/:status/:page'] = array('ReceiptController', 'approvalExpenses');
+
+//审批请求
 $route['*']['/expensesEdi/:rid'] = array('ReceiptController', 'expensesEdi');
 $route['*']['/expensesDefray'] = array('ReceiptController', 'expensesDefray');
+$route['*']['/receiptburEdi/:rid'] = array('ReceiptController', 'receiptburEdi');
+$route['*']['/updateApprovalReceipt'] = array('ReceiptController', 'updateApprovalReceipt');
+$route['*']['/remitApproval/:rid'] = array('ReceiptController', 'remitApproval');
+//执行请求
+$route['*']['/implement/:rid'] = array('ReceiptController', 'implement','extension'=>'.html');
+
+$route['*']['/approvalExpenses/:status/:page'] = array('ReceiptController', 'approvalExpenses');
+
 
 $route['*']['/saeaLoanReceiptAdd/:rid'] = array('ReceiptController', 'saeaLoanReceiptAdd');
 $route['*']['/saeaLoanReceiptAddDo'] = array('ReceiptController', 'saeaLoanReceiptAddDo');
 
 $route['*']['/saeaLoanReceiptEdi/:rid'] = array('ReceiptController', 'saeaLoanReceiptEdi');
 
-$route['*']['/implement/:rid'] = array('ReceiptController', 'implement','extension'=>'.html');
+
 $route['*']['/implementDo'] = array('ReceiptController', 'implementDo');
 $route['*']['/ajaxExamineExe'] = array('ReceiptController', 'ajaxExamineExe');
 
@@ -186,12 +195,12 @@ $route['*']['/remitAdd'] = array('ReceiptController', 'remitAdd');
 $route['*']['/remitAddDo'] = array('ReceiptController', 'remitAddDo');
 $route['*']['/remitEdit/:rid'] = array('ReceiptController', 'remitEdit');
 
-$route['*']['/remitApproval/:rid'] = array('ReceiptController', 'remitApproval');
+
 $route['*']['/remitEdiDo'] = array('ReceiptController', 'remitEdiDo');
 
 $route['*']['/expensesDoc/:rid'] = array('ReceiptController', 'expensesDoc');
 
-$route['*']['/receiptburEdi/:rid'] = array('ReceiptController', 'receiptburEdi');
+
 
 $route['*']['/expensesRetreats/:rid'] = array('ReceiptController', 'expensesRetreats');
 $route['*']['/hisImplement'] = array('ReceiptController', 'hisImplement');
@@ -218,7 +227,7 @@ $route['*']['/approvalDetails/:rid'] = array('ReceiptController', 'approvalDetai
 
 $route['*']['/remittance'] = array('ReceiptController', 'remittance', 'authName' =>  'Hello', 'auth' => array('costsmart' => 'costsmart'));//
 $route['*']['/approval/:status'] = array('ReceiptController', 'approval');
-$route['*']['/updateApprovalReceipt'] = array('ReceiptController', 'updateApprovalReceipt');
+
 $route['*']['/approvalChe'] = array('ReceiptController', 'updateCheReceipt');
 
 $route['*']['/revisePrice'] = array('ReceiptController', 'revisePrice');

protected/controller/ReceiptController.php

@@ -3459,6 +3459,7 @@ class ReceiptController extends DooController {
 		$status = $this->get_args ( 'status' ) && is_numeric ( $this->get_args ( 'status' ) ) ? $this->get_args ( 'status' ) : 0;
 		$rid = $this->get_args ( 'rid' ) && is_numeric ( $this->get_args ( 'rid' ) ) ? $this->get_args ( 'rid' ) : 0;
 		$Locate = $this->get_args ( 'Locate' ) && is_numeric ( $this->get_args ( 'Locate' ) ) ? $this->get_args ( 'Locate' ) : 0;
+		$amount = $this->get_args ( 'amount' ) && is_numeric ( $this->get_args ( 'amount' ) ) ? $this->get_args ( 'amount' ) : 0;
 		
 		if (! empty ( $rid )) {
 			
@@ -3588,6 +3589,7 @@ class ReceiptController extends DooController {
 				$receipt->nowStaff = $nowStaff;
 				$receipt->verifyStaff = $vStaffString;
 				
+				
 				$loanReceipt->nowStaff = $nowStaff;
 				$loanReceipt->verifyStaff = $vStaffString;
 			} else {
@@ -3857,6 +3859,8 @@ class ReceiptController extends DooController {
 				$this->setWXMsg ( $rid, 1 );
 			}
 			
+			$receipt->amount = $amount;
+			
 			$receipt->update ( array (
 					'where' => ' rid = ' . $rid 
 			) );
@@ -4337,8 +4341,9 @@ class ReceiptController extends DooController {
 	function implementDo() {
 		$rid = $this->get_args ( 'rid' ) && is_numeric ( $this->get_args ( 'rid' ) ) ? $this->get_args ( 'rid' ) : 0;
 		$implementOpinions = $this->get_args ( 'opinion' ) ? $this->get_args ( 'opinion' ) : "";
+		$amount = $this->get_args ( 'amount' ) && is_numeric ( $this->get_args ( 'amount' ) ) ? $this->get_args ( 'amount' ) : 0;
 		
-		if (! empty ( $rid )) {
+		if (! empty ( $rid )&&!empty($amount)) {
 			Doo::loadModel ( 'receipt' );
 			$receipt = new receipt ();
 			Doo::loadClass ( 'XDeode' );
@@ -4382,7 +4387,7 @@ class ReceiptController extends DooController {
 			} else {
 				$receipt->executeStaff = json_encode ( $executeStaff );
 			}
-			
+			$receipt->amount=$amount;
 			$receipt->update ( array (
 					'where' => 'rid=' . $rid 
 			) );
@@ -7214,6 +7219,7 @@ class ReceiptController extends DooController {
 		$status = $this->get_args ( 'status' ) && is_numeric ( $this->get_args ( 'status' ) ) ? $this->get_args ( 'status' ) : 0;
 		$rid = $this->get_args ( 'rid' ) && is_numeric ( $this->get_args ( 'rid' ) ) ? $this->get_args ( 'rid' ) : 0;
 		$Locate = $this->get_args ( 'Locate' ) && is_numeric ( $this->get_args ( 'Locate' ) ) ? $this->get_args ( 'Locate' ) : 0;
+		$amount = $this->get_args ( 'amount' ) && is_numeric ( $this->get_args ( 'amount' ) ) ? $this->get_args ( 'amount' ) : 0;
 		
 		if (! empty ( $rid )) {
 			
@@ -7765,7 +7771,7 @@ class ReceiptController extends DooController {
 				// 微信企业号通知
 				$this->setWXMsg ( $rid, 1 );
 			}
-			
+			$receipt->amount=$amount;
 			$receipt->update ( array (
 					'where' => ' rid = ' . $rid 
 			) );

protected/model/receipt.php

@@ -40,12 +40,14 @@ class receipt extends DooModel {
     public $explanation;
     public $implementOpinions;
     public $notice;
+    public $amount;
     
     public $_table = 'CLD_receipt';
     public $_primarykey = 'rid';
     
     public $_fields = array('aid', 'accountItem', 'staff', 'sum', 'date','pastDate' ,'cid', 'status', 'reviseDetail', 'revisePrice', 'verify','verifyStaff',
-    'nowStaff','receiptOrder','explanation','notice','Rtype','loanItem','loanRid','loanSum','implementOpinions','isBK','executeCopy','executeStaff','verifyBreakup','executeDate');
+    'nowStaff','receiptOrder','explanation','notice','Rtype','loanItem','loanRid','loanSum','implementOpinions','isBK','executeCopy','executeStaff','verifyBreakup','executeDate'
+    		,'amount');
 
 	function receiptByYear($dateCondition,$sid){
     	//

protected/plugin/TemplateTag.php

@@ -30,49 +30,49 @@ function isTimeTR($day = 3,$cTime) {
 	return $flag;
 }
 function isInvoiceNew($type = "GLOBAL") {
-// 	Doo::loadModel ( 'invoice' );
-// 	$invoice = new invoice ();
-// 	Doo::loadModel ( 'invoiceReceivables' );
-// 	$invoiceReceivables = new invoiceReceivables ();
-// 	Doo::loadModel ( 'staff' );
-// 	$staff = new staff ();
+	Doo::loadModel ( 'invoice' );
+	$invoice = new invoice ();
+	Doo::loadModel ( 'invoiceReceivables' );
+	$invoiceReceivables = new invoiceReceivables ();
+	Doo::loadModel ( 'staff' );
+	$staff = new staff ();
 	
-// 	$st = $staff->getUserByIdList ( $_COOKIE ["staff"] );
+	$st = $staff->getUserByIdList ( $_COOKIE ["staff"] );
 	
-// 	// 我的发票待处理
-// 	$pendingInvoice = $invoice->getOne ( array (
-// 			'where' => "(status=3 or status=4 or (status=2 and printStatus=1 and untreadStatus=0 ) or (status=2 and printStatus=1 and untreadStatus=2 )  )  and isDelete=0 and sid=" . $_COOKIE ["staff"],
-// 			'desc' => 'iid',
-// 			'asArray' => TRUE 
-// 	) );
-// 	// 我的收款待入账
-// 	$myClaim = $invoiceReceivables->getOne ( array (
-// 			'where' => " receivablesStaff like '" . $_COOKIE ["staff"] . "-%' and receivablesCategory like '" . $st [0] ['cid'] . ":%' and bindStatus=0",
-// 			'desc' => 'irid',
-// 			'asArray' => TRUE 
-// 	) );
-// 	// 发票审批
-// 	$approval = $invoice->getOne ( array (
-// 			'where' => 'status=1 and pendingApprovals=' . $_COOKIE ["staff"],
-// 			'desc' => 'iid',
-// 			'asArray' => true 
-// 	) );
-// 	// 发票邮寄
-// 	$post = $invoice->getOne ( array (
-// 			'where' => "postStatus=0 and doPost=1 and status=2",
-// 			'asArray' => TRUE 
-// 	) );
-// 	// 发票打印
-// 	$print = $invoice->getOne ( array (
-// 			'where' => "status=2 and printStatus=0 and moldManage like '%[\"" . $_COOKIE ["staff"] . "\",%'",
-// 			'desc' => 'iid',
-// 			'asArray' => TRUE 
-// 	) );
-// 	// 发票退票
-// 	$untread = $invoice->getOne ( array (
-// 			'where' => " printStatus=1 and untreadStatus=1 and status=2 ",
-// 			'asArray' => TRUE 
-// 	) );
+	// 我的发票待处理
+	$pendingInvoice = $invoice->getOne ( array (
+			'where' => "(status=3 or status=4 or (status=2 and printStatus=1 and untreadStatus=0 ) or (status=2 and printStatus=1 and untreadStatus=2 )  )  and isDelete=0 and sid=" . $_COOKIE ["staff"],
+			'desc' => 'iid',
+			'asArray' => TRUE 
+	) );
+	// 我的收款待入账
+	$myClaim = $invoiceReceivables->getOne ( array (
+			'where' => " receivablesStaff like '" . $_COOKIE ["staff"] . "-%' and receivablesCategory like '" . $st [0] ['cid'] . ":%' and bindStatus=0",
+			'desc' => 'irid',
+			'asArray' => TRUE 
+	) );
+	// 发票审批
+	$approval = $invoice->getOne ( array (
+			'where' => 'status=1 and pendingApprovals=' . $_COOKIE ["staff"],
+			'desc' => 'iid',
+			'asArray' => true 
+	) );
+	// 发票邮寄
+	$post = $invoice->getOne ( array (
+			'where' => "postStatus=0 and doPost=1 and status=2",
+			'asArray' => TRUE 
+	) );
+	// 发票打印
+	$print = $invoice->getOne ( array (
+			'where' => "status=2 and printStatus=0 and moldManage like '%[\"" . $_COOKIE ["staff"] . "\",%'",
+			'desc' => 'iid',
+			'asArray' => TRUE 
+	) );
+	// 发票退票
+	$untread = $invoice->getOne ( array (
+			'where' => " printStatus=1 and untreadStatus=1 and status=2 ",
+			'asArray' => TRUE 
+	) );
 	
 	$new = array (
 			'GLOBAL' => FALSE,

protected/view/admin/expensesCollect.html

@@ -104,6 +104,13 @@
 	  						</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">￥{{receiptList' value.amount}}</td></tr>
+							</tbody>
+						</table>
 	  					
 	  					<!-- else -->
 	  					
@@ -125,7 +132,13 @@
 							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</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>汇款金额（用于生成汇款单）</th><td class="taR" width="200">￥{{receiptList' value.amount}}</td></tr>
+							</tbody>
+						</table>
 	  					<!-- endif -->
 	  				
 					</div>
@@ -222,6 +235,13 @@
 	  					
 	  						</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">￥{{receiptList' value.amount}}</td></tr>
+							</tbody>
+						</table>
 	  				</div>
 	  				
 	  				
@@ -340,6 +360,13 @@
 	  					
 	  						</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">￥{{receiptList' value.amount}}</td></tr>
+							</tbody>
+						</table>
 	  				</div>
 	  				
 	  				

protected/view/admin/expensesDoc.html

@@ -115,6 +115,7 @@
 	  					</table>
 	  					
 	  					
+	  					
 	  					<!-- else -->
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
@@ -138,7 +139,13 @@
 	  					
 	  					<!-- endif -->
 	  				
-						
+						<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">￥{{receiptList' value.amount}}</td></tr>
+							</tbody>
+						</table>
 						
 					</div>
 	  			
@@ -248,6 +255,13 @@
 	  					
 	  						</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">￥{{receiptList' value.amount}}</td></tr>
+							</tbody>
+						</table>
 	  				</div>
 	  				
 	  				
@@ -380,6 +394,14 @@
 	  					
 	  						</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">￥{{receiptList' value.amount}}</td></tr>
+							</tbody>
+						</table>
 	  				</div>
 	  				
 	  				

protected/view/admin/expensesEdi.html

@@ -53,11 +53,11 @@
 	  				<div class="seal undone"></div>
 	  			<!-- endif -->
 	  			
-	  			
+	  			<div class="seTable reportTable">
 	  			<!-- if {{receiptList' value.Rtype}}==1 -->
 	  			
 
-					<div class="seTable reportTable">
+					
 						<table class="table table-bordered table-condensed table-hover">
 							<tbody>
 							<tr><th colspan="2" class="taC">借款费用</th></tr>
@@ -77,11 +77,11 @@
 							
 							</tbody>
 						</table>
-					</div>
+					
 
 
 	  			<!-- else -->
-	  				<div class="seTable reportTable">
+	  				
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
@@ -121,6 +121,12 @@
 	  						</form>
 	  						</td>
 	  						</tr>
+	  						<!-- elseif -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
 	  						<!-- endif -->
 	  						<!-- loop receiptList' value.reviseDetail -->
 	  						<tr><th><a href="/revocationAdjustment/{{receiptList' value' value.sid}}/{{receiptList' value' value.price}}/{{receiptList' value.rid}}">撤销</a><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
@@ -148,16 +154,26 @@
 
 						</tbody>
 	  					</table>
-	  				</div>
-	  				<!-- endif -->
+	  					
+	  					
+	  					
 	  				
+	  				<!-- endif -->
+	  				<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">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+							</tbody>
+						</table>
+	  				</div>
 	  				
 	  				<div class="seCensor loan-censor ">
 	  					<form action="/expensesDefray" method="post" id="verifyOpinion_{{receiptList' value.rid}}" name="verifyOpinion_{{receiptList' value.rid}}">
 	  						<input type="hidden" id="status_{{receiptList' value.rid}}" name="status" value=""></input>
 	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}"></input>
 	  						<input type="hidden" name="Locate" value="{{receiptList' value.Locate}}"></input>
-	  						
+	  						<input type="hidden" name="amount" value="{{receiptList' value.amount}}">
 		  					<div class="title">
 		  					{{receiptDetail' value.receiptOrder}}
 		  					</div>

protected/view/admin/hisImplement.html

@@ -124,7 +124,7 @@
 							<td>
 							
 							<!-- if {{receiptList' value.Texe}}=='true'&&{{receiptList' value.TRexe}}=='true'&&({{receiptList' value.status}}==1 || {{receiptList' value.status}}==6) -->
-								<a href="/implement/{{receiptList' value.ridKey}}.html" class="button" target="_blank">去审批</a>
+								<a href="/implement/{{receiptList' value.ridKey}}.html" class="button" target="_blank">去执行</a>
 							<!-- else -->
 							<a href="/expensesDoc/{{receiptList' value.rid}}" target="_blank">详情</a>
 							

protected/view/admin/implement.html

@@ -49,6 +49,11 @@
 	  							<tr><th>{{receiptList' value' value.name}}</th><td  width="140" class="taR">￥{{receiptList' value' value.price}}</td></tr>
 	  						<!-- endloop -->
 							
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
 							
 							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
@@ -85,7 +90,14 @@
 	  						<!-- loop receiptDetail' value.accountItem.其他 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
+	  						
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.otherSum}}</td></tr>
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
+	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
@@ -124,14 +136,22 @@
 	  					
 	  					<!-- endif -->
 	  				
+	  				<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">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amountLoan" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+							</tbody>
+						</table>
+	  				
 					</div>
 	  			
 	  			
 	  			
 	  			<div class="seCensor loan-censor">
-	  					<form method="post" action="/implementDo" >
+	  					<form method="post" action="/implementDo" id="implementLoan" >
 	  					<input type="hidden" name='rid' value="{{receiptList' value.rid}}" >
-	  					
+	  					<input type="hidden" name="amount" id="amountInpLoan" value="{{receiptList' value.amount}}">
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
 	  					</div>
@@ -192,8 +212,8 @@
 	  					</ul>
 	  					<!-- if {{receiptDetail' value.button2}}==1 -->
 	  					<div class="reportButton">
-								<button class="buttonDone buttonBlock" type="submit">执行完成</button>
-							
+								
+							<a href="javascript:void(0)" onClick="setExeReceipt('Loan',{{receiptList' value.rid}})" class="buttonDone buttonBlock">执行完成</a>
 	  					</div>
 	  					<!-- endif -->
 	  					</form>
@@ -218,9 +238,11 @@
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptList' value.accountItem.cSum.agencySum}}</td></tr>
 	  						
-	  						
-	  						
-	  						
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
 	  						
 	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
@@ -232,14 +254,23 @@
 	  					
 	  						</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">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amountPublic" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+							</tbody>
+						</table>
+	  					
 	  				</div>
 	  				
 	  				
 	  				
 	  				<div class="seCensor public-censor">
-	  					<form method="post" action="/implementDo" >
+	  					<form method="post" action="/implementDo" id="implementPublic" >
 	  					<input type="hidden" name='rid' value="{{receiptList' value.rid}}" >
-	  					
+	  					<input type="hidden" name="amount" id="amountInpPublic" value="{{receiptList' value.amount}}">
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
 	  					</div>
@@ -305,7 +336,8 @@
 	  					</ul>
 	  					<!-- if {{receiptDetail' value.button2}}==1 -->
 	  					<div class="reportButton">
-	  							<button class="buttonDone buttonBlock" type="submit">执行完成</button>
+	  					<a href="javascript:void(0)" onClick="setExeReceipt('Public',{{receiptList' value.rid}})" class="buttonDone buttonBlock">执行完成</a>
+	  							
 								
 							</div>
 							<!-- endif -->
@@ -353,7 +385,15 @@
 	  						<!-- loop receiptDetail' value.accountItem.其他 -->
 	  						<tr><th>{{receiptDetail' value' value.name}}</th><td  width="140" class="taR">￥{{receiptDetail' value' value.price}}</td></tr>
 	  						<!-- endloop -->
+	  						
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">￥{{receiptDetail' value.accountItem.cSum.otherSum}}</td></tr>
+	  						
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
+	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
@@ -363,13 +403,24 @@
 	  					
 	  						</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">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amountReceipt" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+							</tbody>
+						</table>
+	  					
 	  				</div>
 	  				
 	  				
 	  				
 	  				<div class="seCensor receipt-censor">
-	  					<form method="post" action="/implementDo" >
+	  					<form method="post" action="/implementDo" id="implementReceipt" >
 	  					<input type="hidden" name='rid' value="{{receiptList' value.rid}}" >
+	  					<input type="hidden" name="amount" id="amountInpReceipt" value="{{receiptList' value.amount}}">
+	  					
 	  					
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
@@ -435,9 +486,9 @@
 	  					</ul>
 	  					<!-- if {{receiptDetail' value.button2}}==1 -->
 	  					<div class="reportButton">
-	  							<button class="buttonDone buttonBlock" type="submit">执行完成</button>
-								
-							</div>
+	  							
+							<a href="javascript:void(0)" onClick="setExeReceipt('Receipt',{{receiptList' value.rid}})" class="buttonDone buttonBlock">执行完成</a>
+						</div>
 							<!-- endif -->
 	  					
 	  					</form>

protected/view/admin/receiptburEdi.html

@@ -40,10 +40,10 @@
 	  			
 	  			
 	  			
-	  			
+	  			<div class="seTable reportTable">
 	  			<!-- if {{receiptList' value.Rtype}}==1 -->
 	  			
-	  			<div class="seTable reportTable">
+	  			
 	  			<table class="table table-bordered table-condensed table-hover">
 							<tbody>
 							<tr><th colspan="2" class="taC">借款费用</th></tr>
@@ -62,9 +62,9 @@
 							<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td></tr>
 							</tbody>
 						</table>
-				</div>
+				
 	  			<br/>
-	  			<div class="seTable reportTable">
+	  			
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
@@ -131,10 +131,10 @@
 	  						<td class="taR"><b style="font-size:24px">￥{{receiptDetail' value.relust}}</b><br>{{receiptDetail' value.relustCN}}</td></tr>
 						</tbody>
 	  					</table>
-	  				</div>
+	  				
 	  			
 	  			<!-- else -->
-	  				<div class="seTable reportTable">
+	  				
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
 	  					<tbody>
@@ -174,7 +174,14 @@
 	  						</form>
 	  						</td>
 	  						</tr>
+	  						<!-- elseif -->
+	  						<tr><th colspan="2" class="taC">报销金额调整</th></tr>
+	  						<!-- loop receiptList' value.reviseDetail -->
+	  						<tr><th><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
+	  						<!-- endloop -->
+	  						<tr><th class="taR">合计</th><td class="colOrange taR">￥{{receiptList' value.revisePrice}}</td></tr>
 	  						<!-- endif -->
+	  						
 	  						<!-- loop receiptList' value.reviseDetail -->
 	  						<tr><th><a href="/revocationAdjustment/{{receiptList' value' value.sid}}/{{receiptList' value' value.price}}/{{receiptList' value.rid}}">撤销</a><span class="interval">|</span>{{receiptList' value' value.name}}：{{receiptList' value' value.description}}</th><td class="taR">￥{{receiptList' value' value.price}}</td></tr>
 	  						<!-- endloop -->
@@ -200,24 +207,29 @@
 
 						</tbody>
 	  					</table>
-	  				</div>
+	  				
 	  				<!-- endif -->
+	  				<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">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+							</tbody>
+						</table>
 	  				
+	  				</div>
 	  				
 	  				<div class="seCensor <!-- if {{receiptList' value.Rtype}}==1 --> loan-censor <!-- else --> receipt-censor <!-- endif -->">
 	  					<form action="/updateApprovalReceipt" method="post" id="verifyOpinion_{{receiptList' value.rid}}" name="verifyOpinion_{{receiptList' value.rid}}">
 	  						<input type="hidden" id="status_{{receiptList' value.rid}}" name="status" value=""></input>
 	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}"></input>
 	  						<input type="hidden" name="Locate" value="{{receiptList' value.Locate}}"></input>
-	  						
+	  						<input type="hidden" name="amount" value="{{receiptList' value.amount}}">
 		  					<div class="title">
 		  					{{receiptDetail' value.receiptOrder}}
 		  					</div>		  					
 		  					<div class="reportButton clearfix" style="display:" >
 		  					
-		  					
-	  							
-		  					
 		  						<!-- if {{receiptDetail' value.button}}==4 -->
 		  						<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
 		  						

protected/view/admin/remitApproval.html

@@ -93,6 +93,14 @@
 
 						</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">￥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+							</tbody>
+						</table>
 	  				</div>
 	  				
 	  				
@@ -102,7 +110,7 @@
 	  						<input type="hidden" id="status_{{receiptList' value.rid}}" name="status" value=""></input>
 	  						<input type="hidden" name="rid" value="{{receiptList' value.rid}}"></input>
 	  						<input type="hidden" name="Locate" value="{{receiptList' value.Locate}}"></input>
-	  						
+	  						<input type="hidden" name="amount" value="{{receiptList' value.amount}}">
 		  					<div class="title">
 		  					{{receiptDetail' value.receiptOrder}}
 		  					</div>