更新费用功能

protected/controller/MainController.php

@@ -4059,7 +4059,7 @@ class MainController extends DooController {
 		}
 	}
 	function searchClient() {
-		$searchDbInforItem = isset ( $_GET ['searchDbInforItem'] ) ? $_GET ['searchDbInforItem'] : "";
+		$searchDbInforItem = $this->get_args('searchDbInforItem') ? $this->get_args('searchDbInforItem') : "";   
 		
 		if (! empty ( $searchDbInforItem )) {
 			
@@ -4079,7 +4079,7 @@ class MainController extends DooController {
 		}
 	}
 	function searchCompany() {
-		$searchDbInforItem = isset ( $_GET ['searchDbInforItem'] ) ? $_GET ['searchDbInforItem'] : "";
+		$searchDbInforItem = $this->get_args('searchDbInforItem') ? $this->get_args('searchDbInforItem') : "";    
 		
 		if (! empty ( $searchDbInforItem )) {
 			
@@ -4179,7 +4179,7 @@ class MainController extends DooController {
 		}
 	}
 	function searchLongle() {
-		$searchDbInforItem = isset ( $_GET ['searchDbInforItem'] ) ? $_GET ['searchDbInforItem'] : "";
+		$searchDbInforItem = $this->get_args('searchDbInforItem') ? $this->get_args('searchDbInforItem') : "";  
 		
 		if (! empty ( $searchDbInforItem )) {
 			

protected/controller/ReceiptController.php

@@ -4454,7 +4454,10 @@ class ReceiptController extends DooController {
 			) );
 		}
 		$ridKey = $XDeode->encode ( $rid );
-		return "/implement/" . $ridKey . ".html";
+		
+		return "/hisImplement";
+		
+		//return "/implement/" . $ridKey . ".html";
 	}
 	function receiptburEdi() {
 		$rid = isset ( $this->params ['rid'] ) ? $this->params ['rid'] : 0;

protected/view/admin/approvalExpenses.html

@@ -113,6 +113,10 @@
 	  							<!-- elseif {{receiptDetail' value.status}}==1 or {{receiptDetail' value.status}}==6 --> 
 	  							执行中
 	  							<!-- elseif {{receiptDetail' value.status}}==8 or {{receiptDetail' value.status}}==9 --> 
+	  							<!-- if {{receiptDetail' value.loanDate}}!=0 --> 
+	  							借款完成
+	  							<p class="colGray">{{receiptDetail' value.loanDate}}</p>
+	  							<!-- endif -->
 	  							 费用完成
 	  							 <p class="colGray">{{receiptDetail' value.pastDate}}</p>
 	  							 
@@ -137,7 +141,7 @@
 	  									<a class="button" target="_blank" href="/receiptburEdi/{{receiptDetail' value.rid}}">去审批</a>
 	  								<!-- endif -->
 	  							<!-- else --> 
-	  							<a  href="/expensesDoc/{{receiptDetail' value.rid}}">详情</a>
+	  							<a  target="_blank" href="/expensesDoc/{{receiptDetail' value.rid}}">详情</a>
 	  							<!-- endif --> 
 	  							</td>
 	  						</tr>