汇款信息

global/js/receipt.js

@@ -467,17 +467,35 @@ $(function() {
 		timely: 3,
 	    focusCleanup: true,
 	    theme:"yellow_top",
+	    rules: {
+	    	remittanceBankType: function() {
+	    		var rbt=$('select[node-rbt]').val();
+	    		if(rbt==0)
+	    			return false;
+	    		return true;
+	        }
+	    },
 	    fields: {
 	        'verify': 'required; ',
 	        'explanation':'required; ',
 	        
 	        'remittanceName':'required; ',
 	        'bankName':'required; ',
-	        'bankNumber':'required; '
+	        'bankNumber':'required; ',
+	        'coupletNumber':'required(remittanceBankType); '
 	        
 	    }
 	});
 	
+	$("select[node-rbt]").change(function(){
+		var rbt=$(this).val();
+		if(rbt==0){
+			$("tr[node-cn]").hide();
+		}else if(rbt==1){
+			$("tr[node-cn]").show();
+		}
+	});
+	
 
 })
 

protected/class/invoice.func.php

@@ -73,4 +73,5 @@ function excelTime($date, $time = false) {
 	return $date;
 }
 
+
 ?>

protected/config/execute/execute.ini

@@ -0,0 +1 @@
+,41,41,41,41,58

protected/config/routes.conf.php

@@ -178,8 +178,10 @@ $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['post']['/exportRemittance'] = array('ReceiptController', 'exportRemittance');
+
 
+$route['*']['/implement/:rid'] = array('ReceiptController', 'implement','extension'=>'.html');
 $route['*']['/approvalExpenses/:status/:page'] = array('ReceiptController', 'approvalExpenses');
 
 

protected/controller/ReceiptController.php

@@ -260,10 +260,17 @@ class ReceiptController extends DooController {
 		$bankName = $this->get_args ( 'bankName' ) ? $this->get_args ( 'bankName' ) : "";
 		$bankNumber = $this->get_args ( 'bankNumber' ) ? $this->get_args ( 'bankNumber' ) : "";
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
+		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
+		
 		// print_r($agency);die;
 		
 		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $explanation ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber )) {
 			
+			if ($remittanceBankType==1&&empty($coupletNumber)){
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				die ( '请填写联行号' );
+			}
+			
 			Doo::loadModel ( 'receipt' );
 			Doo::loadModel ( 'receiptDetail' );
 			Doo::loadModel ( 'accountItem' );
@@ -331,7 +338,9 @@ class ReceiptController extends DooController {
 			$receipt->remittanceName = $remittanceName;
 			$receipt->bankName = $bankName;
 			$receipt->bankNumber = $bankNumber;
-			$receipt->coupletNumber = $coupletNumber;
+			$receipt->remittanceBankType = $remittanceBankType;
+			if ($remittanceBankType==1)
+				$receipt->coupletNumber = $coupletNumber;
 			
 			$rid = $receipt->insert ();
 			
@@ -485,12 +494,19 @@ class ReceiptController extends DooController {
 		$bankNumber = $this->get_args ( 'bankNumber' ) ? $this->get_args ( 'bankNumber' ) : "";
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
 		
+		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
+		
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 7 );
 		$rid = $XDeode->decode ( $ridKey );
 		
 		if (! empty ( $rid )&&! empty ( $explanation ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber )) {
 			
+			if ($remittanceBankType==1&&empty($coupletNumber)){
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				die ( '请填写联行号' );
+			}
+			
 			Doo::loadModel ( 'receipt' );
 			Doo::loadModel ( 'receiptDetail' );
 			Doo::loadModel ( 'accountItem' );
@@ -562,7 +578,9 @@ class ReceiptController extends DooController {
 			$receipt->remittanceName = $remittanceName;
 			$receipt->bankName = $bankName;
 			$receipt->bankNumber = $bankNumber;
-			$receipt->coupletNumber = $coupletNumber;
+			$receipt->remittanceBankType = $remittanceBankType;
+			if ($remittanceBankType==1)
+				$receipt->coupletNumber = $coupletNumber;
 			
 			$receipt->update ();
 			
@@ -958,11 +976,16 @@ class ReceiptController extends DooController {
 		$bankName = $this->get_args ( 'bankName' ) ? $this->get_args ( 'bankName' ) : "";
 		$bankNumber = $this->get_args ( 'bankNumber' ) ? $this->get_args ( 'bankNumber' ) : "";
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
-		
+		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
 		// die;
 		
 		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $explanation ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber )) {
 			
+			if ($remittanceBankType==1&&empty($coupletNumber)){
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				die ( '请填写联行号' );
+			}
+			
 			Doo::loadModel ( 'receipt' );
 			Doo::loadModel ( 'receiptDetail' );
 			Doo::loadModel ( 'accountItem' );
@@ -1041,8 +1064,9 @@ class ReceiptController extends DooController {
 			$receipt->remittanceName = $remittanceName;
 			$receipt->bankName = $bankName;
 			$receipt->bankNumber = $bankNumber;
-			$receipt->coupletNumber = $coupletNumber;
-			
+			$receipt->remittanceBankType = $remittanceBankType;
+			if ($remittanceBankType==1)
+				$receipt->coupletNumber = $coupletNumber;
 			
 			$rid = $receipt->insert ();
 			return "/saeaBorad";
@@ -1098,6 +1122,9 @@ class ReceiptController extends DooController {
 		
 		$receiptInfo ['loanItem'] = json_decode ( $receiptInfo ['loanItem'], true );
 		
+		//print_r($receiptInfo);
+		
+		
 		$data ['receiptInfo'] = $receiptInfo;
 		$data ['category'] = $lCategory->find ( array (
 				'asArray' => true 
@@ -1123,7 +1150,7 @@ class ReceiptController extends DooController {
 		$bankName = $this->get_args ( 'bankName' ) ? $this->get_args ( 'bankName' ) : "";
 		$bankNumber = $this->get_args ( 'bankNumber' ) ? $this->get_args ( 'bankNumber' ) : "";
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
-		
+		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
 		// die;
 		
 		Doo::loadClass ( 'XDeode' );
@@ -1132,6 +1159,11 @@ class ReceiptController extends DooController {
 		
 		if (! empty ( $cid ) && ! empty ( $explanation ) && ! empty ( $rid )&& ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber )) {
 			
+			if ($remittanceBankType==1&&empty($coupletNumber)){
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				die ( '请填写联行号' );
+			}
+			
 			Doo::loadModel ( 'receipt' );
 			Doo::loadModel ( 'receiptDetail' );
 			Doo::loadModel ( 'accountItem' );
@@ -1197,7 +1229,9 @@ class ReceiptController extends DooController {
 			$receipt->remittanceName = $remittanceName;
 			$receipt->bankName = $bankName;
 			$receipt->bankNumber = $bankNumber;
-			$receipt->coupletNumber = $coupletNumber;
+			$receipt->remittanceBankType = $remittanceBankType;
+			if ($remittanceBankType==1)
+				$receipt->coupletNumber = $coupletNumber;
 			
 			$receipt->update ( array (
 					'where' => 'rid=' . $rid 
@@ -1491,9 +1525,15 @@ class ReceiptController extends DooController {
 		$bankName = $this->get_args ( 'bankName' ) ? $this->get_args ( 'bankName' ) : "";
 		$bankNumber = $this->get_args ( 'bankNumber' ) ? $this->get_args ( 'bankNumber' ) : "";
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
+		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
 		
 		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $explanation ) && ! empty ( $rid ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber )) {
 			
+			if ($remittanceBankType==1&&empty($coupletNumber)){
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				die ( '请填写联行号' );
+			}
+			
 			Doo::loadModel ( 'receipt' );
 			Doo::loadModel ( 'receiptDetail' );
 			Doo::loadModel ( 'accountItem' );
@@ -1606,7 +1646,9 @@ class ReceiptController extends DooController {
 			$receipt->remittanceName = $remittanceName;
 			$receipt->bankName = $bankName;
 			$receipt->bankNumber = $bankNumber;
-			$receipt->coupletNumber = $coupletNumber;
+			$receipt->remittanceBankType = $remittanceBankType;
+			if ($remittanceBankType==1)
+				$receipt->coupletNumber = $coupletNumber;
 			
 			$receipt->update ( array (
 					'where' => 'rid=' . $rid 
@@ -5175,9 +5217,13 @@ class ReceiptController extends DooController {
 		$moth = $this->get_args ( 'moth' ) ? $this->get_args ( 'moth' ) : 'MONTH';
 		$day = $this->get_args ( 'day' ) ? $this->get_args ( 'day' ) : 'DAY';
 		$sop = $this->get_args ( 'sop' ) ? $this->get_args ( 'sop' ) : 'SOP';
+		
+		$cidKey = $this->get_args ( 'cidKey' ) ? $this->get_args ( 'cidKey' ) : 'ALL';
+		
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
 		Doo::loadModel ( 'receipt' );
 		$receipt = new receipt ();
-		
 		Doo::loadModel ( 'L_category' );
 		$Lcategory = new L_category ();
 		Doo::loadModel ( 'verify' );
@@ -5189,6 +5235,8 @@ class ReceiptController extends DooController {
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
 		
+		$cid = $XDeode->decode ( $cidKey );
+		
 		$condition = "";
 		if ($item == "expenses")
 			$condition = " and Rtype=1 ";
@@ -5201,7 +5249,7 @@ class ReceiptController extends DooController {
 		}
 		
 		$statusCon = '(status=8 or status=9 or status=1 or status=6 )';
-		$sopString = "";
+		$sopString =$cidString= "";
 		
 		$lastYear = date ( "Y", strtotime ( "-1 year" ) );
 		
@@ -5223,11 +5271,12 @@ class ReceiptController extends DooController {
 		
 		if ($sop != 'SOP')
 			$sopString = " and staff=" . $sop;
+		if ($cidKey != 'ALL')
+			$cidString = " and cid=" . $cid;
+			
 			
-			// $noPassSum=$receipt->receiptByYear($year,$this->staff[0]['sid']); and (status=1 or status=6)
-		
 		$receiptList = $receipt->find ( array (
-				'where' => $statusCon . $condition . $dateCondition . $sopString,
+				'where' => $statusCon . $condition . $dateCondition . $sopString.$cidString,
 				'desc' => 'rid',
 				'asArray' => true 
 		) );
@@ -5241,16 +5290,38 @@ class ReceiptController extends DooController {
 		$sopStaff = array ();
 		foreach ( $receiptList2 as $key => $value ) {
 			$staffDetail = $staff->getOne ( array (
+					'select'=>'username',
 					'where' => 'sid=' . $value ['staff'],
 					'asArray' => true 
 			) );
 			$sopStaff [$value ['staff']] = $staffDetail ['username'];
 		}
 		//办事处筛选
+		$categoryScreen=array();
+		$categorList=$Lcategory->getCategory();
+		foreach ( $receiptList2 as $key => $value ) {
+			foreach ($categorList as $k=>$v){
+				if ($value['cid']==$v['cid']){
+					$categoryScreen[$v['cidKey']]=$v['title'];
+					break;
+				}
+			}
+		}
+		$categoryScreenHtml = "";
+		foreach ( $categoryScreen as $key => $value ) {
+			if ($cidKey == $key)
+				$categoryScreenHtml .= '<option value="' . $key . '" selected >' . $value . '</option>';
+			else
+				$categoryScreenHtml .= '<option value="' . $key . '" >' . $value . '</option>';
+		}
+		$data['categoryScreenHtml']=$categoryScreenHtml;
+		$data['cidKey']=$cidKey;
 		
 		$Locate = 0;
 		$roleId = 0;
 		$button = 0;
+		$staffBatchNumber=100001;
+		$remittanceList=array();
 		foreach ( $receiptList as $key => $value ) {
 			$receiptList [$key] ['ridKey'] = $XDeode->encode ( $value ['rid'] );
 			$receiptList [$key] ['Texe'] = 'false';
@@ -5412,14 +5483,25 @@ class ReceiptController extends DooController {
 			}
 			
 			$receiptList [$key] ['verifyList'] = $verifyList;
-			$receiptList [$key] ['staffDetail'] = $staff->getOne ( array (
+			$staffDetail=$staff->getOne ( array (
 					'where' => 'sid=' . $value ['staff'],
 					'asArray' => true 
 			) );
-			
+			$receiptList [$key] ['staffDetail'] =$staffDetail;
+			 
+			 
 			$receiptList [$key] ['button'] = $button;
+			
+			//设置导出汇款execl
+			if (!empty($value['remittanceName'])&&!empty($value['bankName'])&&!empty($value['bankNumber'])){
+				$remittanceDetail=array($staffBatchNumber,$value['remittanceName'],$value['bankNumber'],$value['bankName'],$value['remittanceBankType'],$value['coupletNumber'],$value['sum']);
+				array_push($remittanceList, $remittanceDetail);
+				$staffBatchNumber++;
+			}
 		}
 		
+		$data['remittanceList']=json_encode($remittanceList);
+		
 		// print_r($receiptList);
 		$mothHtml = "";
 		for($i = 1; $i <= 12; $i ++) {
@@ -5462,6 +5544,25 @@ class ReceiptController extends DooController {
 		$data ['sop'] = $sop;
 		$this->render ( "/admin/hisImplement", $data );
 	}
+	/**
+	 * 导出汇款信息的exelc
+	 */
+	function exportRemittance(){
+		$remittanceInfo = $_POST['remittanceInfo'];//$this->get_args ( 'remittanceInfo' )  ? $this->get_args ( 'remittanceInfo' ) : '';
+		if (empty ( $remittanceInfo ))
+			die ( 'illegal request' );
+		
+		$title=array('员工编号','姓名','员工账号','员工账户开户行','转账类型','联行号','金额');	
+		$data=json_decode($remittanceInfo,true);
+		if (empty ( $data ))
+			die ( 'illegal request' );
+		Doo::loadClass ( 'receipt.func' );
+		exportExcel($title,$data,'批量日常报销-公司账号','./',true);
+		
+		header ( 'Content-Type:text/html;charset=utf-8' );
+		die ( '导出'.count($data).'条数据,<a href="/hisImplement">返回</a>' );
+	}
+	
 	function ajaxExamine() {
 		$rid = $this->get_args ( 'rid' ) && is_numeric ( $this->get_args ( 'rid' ) ) ? $this->get_args ( 'rid' ) : 0;
 		
@@ -5469,7 +5570,6 @@ class ReceiptController extends DooController {
 		$receipt = new receipt ();
 		
 		if (! empty ( $rid )) {
-			
 			$rLRes = $receipt->find ( array (
 					'where' => 'status=2 and (nowStaff like "%,' . $this->staff [0] ['sid'] . '%" or nowStaff like "%' . $this->staff [0] ['sid'] . ',%" or nowStaff=' . $this->staff [0] ['sid'] . ' ) and rid!=' . $rid,
 					'asArray' => true 
@@ -5853,9 +5953,15 @@ class ReceiptController extends DooController {
 		$bankName = $this->get_args ( 'bankName' ) ? $this->get_args ( 'bankName' ) : "";
 		$bankNumber = $this->get_args ( 'bankNumber' ) ? $this->get_args ( 'bankNumber' ) : "";
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
+		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
 		
 		if (! empty ( $verify ) && ! empty ( $cid ) && ! empty ( $explanation ) && ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber )) {
 			
+			if ($remittanceBankType==1&&empty($coupletNumber)){
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				die ( '请填写联行号' );
+			}
+			
 			Doo::loadModel ( 'receipt' );
 			Doo::loadModel ( 'receiptDetail' );
 			Doo::loadModel ( 'accountItem' );
@@ -5961,7 +6067,9 @@ class ReceiptController extends DooController {
 			$receipt->remittanceName = $remittanceName;
 			$receipt->bankName = $bankName;
 			$receipt->bankNumber = $bankNumber;
-			$receipt->coupletNumber = $coupletNumber;
+			$receipt->remittanceBankType = $remittanceBankType;
+			if ($remittanceBankType==1)
+				$receipt->coupletNumber = $coupletNumber;
 			
 			$rid = $receipt->insert ();
 			
@@ -6207,11 +6315,18 @@ class ReceiptController extends DooController {
 		$bankNumber = $this->get_args ( 'bankNumber' ) ? $this->get_args ( 'bankNumber' ) : "";
 		$coupletNumber = $this->get_args ( 'coupletNumber' ) ? $this->get_args ( 'coupletNumber' ) : "";
 		
+		$remittanceBankType = $this->get_args ( 'remittanceBankType' ) && is_numeric ( $this->get_args ( 'remittanceBankType' ) ) ? $this->get_args ( 'remittanceBankType' ) : 0;
+		
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 7 );
 		$rid = $XDeode->decode ( $ridKey );
 		
 		if (! empty ( $rid )&&! empty ( $explanation )&& ! empty ( $remittanceName ) && ! empty ( $bankName ) && ! empty ( $bankNumber )) {
+
+			if ($remittanceBankType==1&&empty($coupletNumber)){
+				header ( 'Content-Type:text/html;charset=utf-8' );
+				die ( '请填写联行号' );
+			}
 			
 			Doo::loadModel ( 'receipt' );
 			Doo::loadModel ( 'receiptDetail' );
@@ -6332,7 +6447,9 @@ class ReceiptController extends DooController {
 			$receipt->remittanceName = $remittanceName;
 			$receipt->bankName = $bankName;
 			$receipt->bankNumber = $bankNumber;
-			$receipt->coupletNumber = $coupletNumber;
+			$receipt->remittanceBankType = $remittanceBankType;
+			if ($remittanceBankType==1)
+				$receipt->coupletNumber = $coupletNumber;
 			
 			$receipt->update ();
 			

protected/model/receipt.php

@@ -47,6 +47,7 @@ class receipt extends DooModel {
     public $bankName;
     public $bankNumber;
     public $coupletNumber;
+    public $remittanceBankType;
     
     public $_table = 'CLD_receipt';
     public $_primarykey = 'rid';
@@ -56,7 +57,7 @@ class receipt extends DooModel {
     		,'amount','loanDate','remittanceName',
 			'bankName',
 			'bankNumber',
-			'coupletNumber');
+			'coupletNumber','remittanceBankType');
 
 	function receiptByYear($dateCondition,$sid){
     	//
@@ -68,21 +69,7 @@ class receipt extends DooModel {
 		return $result;
     }
     
-    /*
-    function getClientByCid($cid){
-    	$sql = "select * from " . $this->_table . " as a left join CLD_staff as b on (a.sid=b.sid)  where a.cid= '".$cid."' " ;
-		
-    	$query = Doo::db ()->query ( $sql );
-		
-		$result = $query->fetch ();
-		
-		return $result;
-    }
-    
-    public function getProjectByIdList($projectid){
-    	return $this->find ( array ('where' => "pid= '".$projectid."'", 'asArray' => TRUE ) );
-    }
-    */
+   
 }
 
 ?>

protected/model/staff.php

@@ -25,6 +25,7 @@ class staff extends DooModel {
 	public $bankName;
 	public $bankNumber;
 	public $coupletNumber;
+	public $remittanceBankType;
 	public $_table = 'CLD_staff';
 	public $_primarykey = 'sid';
 	public $_fields = array (
@@ -51,6 +52,7 @@ class staff extends DooModel {
 			'remittanceName',
 			'bankName',
 			'bankNumber',
+			'remittanceBankType',
 			'coupletNumber'
 	);
 	public function checkUser($uid, $passwork) {

protected/view/admin/hisImplement.html

@@ -21,7 +21,7 @@
 			<div class="adminContent autoHeight" style="height: 821px;">
 				<legend><div class="fR"></div>费用执行历史数据</legend>
 				<div class="demandCate">
-				<form action="/hisImplement" id="up" method="post">
+				<form action="/hisImplement" id="up" method="post" >
 					<input type="hidden" name="item" <!-- if {{item}}=="pendImplement" --> value="pendImplement" <!-- else --> value="{{item}}" <!-- endif -->  />
 					
 					<input type="hidden" name="year" id="year"  />
@@ -29,9 +29,7 @@
 					<input type="hidden" name="day" id="day" value="DAY"  />
 					<input type="hidden" name="sop" id="sop" value="SOP"  />
 					
-					<ul class="cateList ">
-						
-						
+					<ul class="cateList " style="display:inline;">
 						<li>
 							<a <!-- if {{item}}=="pendImplement"||{{item}}=="" --> class="now" <!-- endif -->  href="/hisImplement/pendImplement">待执行</a>
 							<a href="/hisImplement/expenses" <!-- if {{item}}=="expenses" --> class="now" <!-- endif --> >借款</a>
@@ -45,12 +43,11 @@
 						<li><input type="date" name="date" id="date" value="{{rdate}}" onChange="receiptDate();" style="width:120px"></li>
 						
 						<li>
-							<select  id="S" onchange="receiptSop();">
-		  					<option value="SOP" <!-- if {{sop}}=='SOP' --> selected <!-- endif --> >所有</option>
-		  					{{sopHtml}}
+							<select  name="cidKey" onchange="receiptSop();">
+		  					<option value="ALL" <!-- if {{cidKey}}=='ALL' --> selected <!-- endif --> >所有</option>
+		  					{{categoryScreenHtml}}
 		  					</select>
 						</li>
-						
 						<li>
 							<select  id="S" onchange="receiptSop();">
 		  					<option value="SOP" <!-- if {{sop}}=='SOP' --> selected <!-- endif --> >所有</option>
@@ -58,43 +55,13 @@
 		  					</select>
 						</li>
 						
-						
-						
-						
-						
-						<li style="display:none">
-						<a href="/hisImplement" <!-- if {{item}}=="all"||{{item}}=="" --> class="now" <!-- endif --> >所有</a>
-						<a href="/hisImplement/expenses" <!-- if {{item}}=="expenses" --> class="now" <!-- endif --> >借款申请</a>
-						<a href="/hisImplement/receipts" <!-- if {{item}}=="receipts" --> class="now" <!-- endif --> >报销单</a>
-						<a href="/hisImplement/remits" <!-- if {{item}}=="remits" --> class="now" <!-- endif --> >对公汇款</a>
-						<a href="/hisImplement/teipts" <!-- if {{item}}=="teipts" --> class="now" <!-- endif --> >待执行</a>
-						</li>
-					
-	  					
-	  					
-	  					
-	  					<li style="display:none">
-	  					<select  id="Y" onchange="receiptYear();">
-	  					<!-- include 'year' -->
-	  					</select> 
-	  					<select  id="M" onchange="receiptMoth()">
-	  					<option value="MONTH" <!-- if {{moth}}=='MONTH' --> selected <!-- endif --> >所有月份</option>
-	  					{{mothHtml}}
-	  					</select>
-	  					<select  id="D" onchange="receiptDay();">
-	  					<option value="DAY" <!-- if {{day}}=='DAY' --> selected <!-- endif --> >所有</option>
-	  					{{dayHtml}}
-	  					</select>
-	  					
-	  					
-	  					
-	  					<select  id="S" onchange="receiptSop();">
-	  					<option value="SOP" <!-- if {{sop}}=='SOP' --> selected <!-- endif --> >所有</option>
-	  					{{sopHtml}}
-	  					</select>
-	  					
-	  					</li>
-	  					
+	  			</ul>
+	  			</form>
+	  			<form action="/exportRemittance" id="up" method="post" >
+	  			<input type="hidden" name="remittanceInfo" value='{{remittanceList}}'  />
+	  			<ul class="cateList ">
+	  			<li>
+	  			<input type="submit" class="button" value="导出汇款信息">
 	  			</ul>
 	  			</form>
 	  		</div>

protected/view/admin/remitAdd.html

@@ -142,13 +142,24 @@
 							<tr><th>汇款人户名</th>
 							<td><input type="text" name="remittanceName" id="remittanceName"  value="" placeholder="请输入汇款人户名" ></td>
 							</tr>
+							
+							<tr>
+							<th>汇款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">公司广发</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
 							<tr><th>汇款开户银行名称</th><td>
 							<input type="text" name="bankName" id="bankName" value="" placeholder="请输入汇款开户银行名称" >
 							</td></tr>
 							<tr><th>汇款帐号</th><td>
 							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="">
 							</td></tr>
-							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
+							<tr node-cn style="display:none"><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="">
 							</td></tr>
 	  						

protected/view/admin/remitEdit.html

@@ -143,13 +143,24 @@
 							<tr><th>汇款人户名</th>
 							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入汇款人户名" ></td>
 							</tr>
+							
+							<tr>
+							<th>汇款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">公司广发</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
 							<tr><th>汇款开户银行名称</th><td>
 							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入汇款开户银行名称" >
 							</td></tr>
 							<tr><th>汇款帐号</th><td>
 							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
 							</td></tr>
-							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
 							</td></tr>
 	  						

protected/view/admin/saeaLoanAdd.html

@@ -42,7 +42,6 @@
 								<option value="{{veList' value.vid}}" >{{veList' value.description}}（
 								{{veList' value.staff}}
 								
-								
 								）</option>
 								<!-- endloop -->
 								</select>
@@ -65,13 +64,24 @@
 							<tr><th>汇款人户名</th>
 							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{staff.0.remittanceName}}" placeholder="请输入汇款人户名" ></td>
 							</tr>
+							
+							<tr>
+							<th>汇款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">公司广发</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
 							<tr><th>汇款开户银行名称</th><td>
 							<input type="text" name="bankName" id="bankName" value="{{staff.0.bankName}}" placeholder="请输入汇款开户银行名称" >
 							</td></tr>
 							<tr><th>汇款帐号</th><td>
 							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{staff.0.bankNumber}}">
 							</td></tr>
-							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{staff.0.coupletNumber}}">
 							</td></tr>
 							

protected/view/admin/saeaLoanAddReceipt.html

@@ -254,13 +254,24 @@
 							<tr><th>汇款人户名</th>
 							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入汇款人户名" ></td>
 							</tr>
+							
+							<tr>
+							<th>汇款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">公司广发</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
 							<tr><th>汇款开户银行名称</th><td>
 							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入汇款开户银行名称" >
 							</td></tr>
 							<tr><th>汇款帐号</th><td>
 							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
 							</td></tr>
-							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
 							</td></tr>
 	  						

protected/view/admin/saeaLoanEdi.html

@@ -37,7 +37,7 @@
 	  						</tr>
 	  						<!-- endloop -->
 	  						
-							<tr class="warning"><td class="taR"><b>本次借款费用合计</b></td><td class="colGreed taR"><b id="agencyResult" style="font-size:24px">￥0.00</b></td></tr>
+							<tr class="warning"><td class="taR"><b>本次借款费用合计</b></td><td class="colGreed taR"><b id="agencyResult" style="font-size:24px">￥{{receiptInfo.loanItem.cSum.loanSum}}</b></td></tr>
 							<!-- if {{receiptInfo.status}}!=4 -->
 							<tr><th colspan="2" class="taC">借款审批</th></tr>
 							<tr>
@@ -72,13 +72,25 @@
 							<tr><th>汇款人户名</th>
 							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptInfo.remittanceName}}" placeholder="请输入汇款人户名" ></td>
 							</tr>
+							
+							<tr>
+							<th>汇款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">公司广发</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
+							
 							<tr><th>汇款开户银行名称</th><td>
 							<input type="text" name="bankName" id="bankName" value="{{receiptInfo.bankName}}" placeholder="请输入汇款开户银行名称" >
 							</td></tr>
 							<tr><th>汇款帐号</th><td>
 							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptInfo.bankNumber}}">
 							</td></tr>
-							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptInfo.coupletNumber}}">
 							</td></tr>
 							

protected/view/admin/saeaLoanEdiReceipt.html

@@ -214,13 +214,24 @@
 							<tr><th>汇款人户名</th>
 							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{receiptDetail.remittanceName}}" placeholder="请输入汇款人户名" ></td>
 							</tr>
+							
+							<tr>
+							<th>汇款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">公司广发</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
 							<tr><th>汇款开户银行名称</th><td>
 							<input type="text" name="bankName" id="bankName" value="{{receiptDetail.bankName}}" placeholder="请输入汇款开户银行名称" >
 							</td></tr>
 							<tr><th>汇款帐号</th><td>
 							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{receiptDetail.bankNumber}}">
 							</td></tr>
-							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{receiptDetail.coupletNumber}}">
 							</td></tr>
 	  						

protected/view/admin/saea_create.html

@@ -163,13 +163,24 @@
 							<tr><th>汇款人户名</th>
 							<td><input type="text" name="remittanceName" id="remittanceName"  value="{{staff.0.remittanceName}}" placeholder="请输入汇款人户名" ></td>
 							</tr>
+							
+							<tr>
+							<th>汇款银行</th>
+							<td>
+							<select node-rbt name="remittanceBankType">
+							<option value="0">公司广发</option>
+							<option value="1">其他</option>
+							</select>
+							</td>
+							</tr>
+							
 							<tr><th>汇款开户银行名称</th><td>
 							<input type="text" name="bankName" id="bankName" value="{{staff.0.bankName}}" placeholder="请输入汇款开户银行名称" >
 							</td></tr>
 							<tr><th>汇款帐号</th><td>
 							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="{{staff.0.bankNumber}}">
 							</td></tr>
-							<tr><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
+							<tr node-cn style="display:none" ><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="{{staff.0.coupletNumber}}">
 							</td></tr>
 	  						

protected/view/contacts_client.html

@@ -283,21 +283,29 @@
 				  				<table>
 				  					<tbody>
 				  					<tr>
-				  					<th>姓名</th><td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="*必填；请填写真实姓名，如：张三、李四；不能出现其他信息" ><input type="text" name="clientname" id="adclientname" style="width:55%" required="required">
+				  					<th><span data-placement="right" data-toggle="ctooltip" data-original-title="*必填；请填写真实姓名，如：张三、李四；不能出现其他信息">姓名</span></th>
+				  					<td><span  ><input type="text" name="clientname" id="adclientname" style="width:55%" required="required">
 				  					<select name="priority" id="priority"><option value="5" selected>优先级</option><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option></select>
 				  					</span></td>
-				  					<th>昵称</th><td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="*必填；格式：'林（声平）总:''江（东明）工：'" ><input type="text" name="nicename" style="width:55%" required="required"></span>
+				  					<th><span data-placement="right" data-toggle="ctooltip" data-original-title="*必填；格式：'林（声平）总:''江（东明）工：'">昵称</span> </th>
+				  					<td><span><input type="text" name="nicename" style="width:55%" required="required"></span>
 				  					<select name="gender">
 				  					<option value="男">男</option><option value="女">女</option>
 				  					</select>
 				  					</td>
 				  					</tr>
-				  					<tr><th>手机</th><td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="多个号码请用分号间隔即可" ><input type="text" name="telephone"><span></td>
-				  					<th>电话</th><td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="填写格式为：0756-3850888；多个号码请用分号间隔即可" ><input type="text" name="phone"></span></td></tr>
-				  					<tr><th>部门</th><td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="请规范填写部门，系统将按此关键词自动归类同单位同部门下的客户" ><input type="text" name="department" required="required"></span></td>
-				  					<th>职务</th><td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="请填写简短清晰的职务" ><input type="text"name="position"></span></td></tr>
-				  					<tr><th>办公室</th><td colspan="4"><span data-placement="bottom" data-toggle="ctooltip" data-original-title="填写客户所在办公室位置等" ><input type="text" name="office"></span></td></tr>
-				  					<tr><th>QQ</th><td><span data-placement="right" data-toggle="ctooltip" data-original-title="多个QQ请用分号间隔即可" ><input type="text" name="qq"></span></td><th>邮箱</th><td><span data-placement="left" data-toggle="ctooltip" data-original-title="多个邮箱请用分号间隔即可" ><input type="text" name="email"></span></td></tr>
+				  					<tr><th><span data-placement="right" data-toggle="ctooltip" data-original-title="多个号码请用分号间隔即可">手机</span></th>
+				  					<td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="" ><input type="text" name="telephone"><span></td>
+				  					<th><span data-placement="right" data-toggle="ctooltip" data-original-title="填写格式为：0756-3850888；多个号码请用分号间隔即可">电话</span></th>
+				  					<td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="" ><input type="text" name="phone"></span></td></tr>
+				  					<tr><th><span data-placement="right" data-toggle="ctooltip" data-original-title="请规范填写部门，系统将按此关键词自动归类同单位同部门下的客户">部门</span></th>
+				  					<td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="" ><input type="text" name="department" required="required"></span></td>
+				  					<th><span data-placement="right" data-toggle="ctooltip" data-original-title="请填写简短清晰的职务">职务</span></th>
+				  					<td><span data-placement="bottom" data-toggle="ctooltip" data-original-title="" ><input type="text"name="position"></span></td></tr>
+				  					<tr><th><span data-placement="right" data-toggle="ctooltip" data-original-title="填写客户所在办公室位置等">办公室</span></th>
+				  					<td colspan="4"><span data-placement="bottom" data-toggle="ctooltip" data-original-title="" ><input type="text" name="office"></span></td></tr>
+				  					<tr><th><span data-placement="right" data-toggle="ctooltip" data-original-title="多个QQ请用分号间隔即可">QQ</span></th>
+				  					<td><span data-placement="right" data-toggle="ctooltip" data-original-title="" ><input type="text" name="qq"></span></td><th>邮箱</th><td><span data-placement="left" data-toggle="ctooltip" data-original-title="多个邮箱请用分号间隔即可" ><input type="text" name="email"></span></td></tr>
 				  					<tr><th>备注</th><td colspan="4"><span data-placement="bottom" data-toggle="ctooltip" data-original-title="" ><input type="text" name="mark"></span></td></tr>
 				  				</tbody></table>
 				  			</div>