分页

global/js/invoice.js

@@ -3,9 +3,60 @@ function receiptYear(){
 	 $('#year').val($('#Y').val());
 	 form.submit();  
 }
+function sures()
+{
+  if(confirm('请确认核销该发票，核销后不可更改！'))
+    return true;
+else
+    return false;
+}
 
 $(function() {
 	
+	$('select[node-iryChange]').change(function() {
+		 var year=$(this).val();
+		 var month="All";
+		 var irmMebSea=$('input[data-irmMebSea]').val();
+		 var action = $('#iras').attr("action");
+		 action=encodeURI(action+'/'+year+'/'+month+"/"+irmMebSea);
+		 $('#iras').attr("action",action);
+		 $('#iras').submit();
+	});
+	
+	$('select[node-irmChange]').change(function() {
+		 var month=$(this).val();
+		 var year=$('select[node-iryChange]').val();
+		 var irmMebSea=$('input[data-irmMebSea]').val();
+		 
+		 var action = $('#iras').attr("action");
+		 action=encodeURI(action+'/'+year+'/'+month+"/"+irmMebSea);
+		 $('#iras').attr("action",action);
+		 $('#iras').submit();
+	});
+	
+	$('button[node-irmMebSea]').click(function() {
+		 var month=$('select[node-irmChange]').val();
+		 var year=$('select[node-iryChange]').val();
+		 var irmMebSea=$('input[data-irmMebSea]').val();
+		 
+		 var action = $('#iras').attr("action");
+		 action=encodeURI(action+'/'+year+'/'+month+"/"+irmMebSea);
+		 
+		 $('#iras').attr("action",action);
+		 $('#iras').submit();
+	});
+	
+	$('button[node-iramMebSea]').click(function() {
+		
+		 var irmMebSea=$('input[data-irmMebSea]').val();
+		 
+		 var action = $('#ira').attr("action");
+		 action=encodeURI(action+"/"+irmMebSea);
+		 
+		 $('#ira').attr("action",action);
+		 $('#ira').submit();
+	});
+	
 	$('a[node-express="untread"]').click(function() {
 		$('td[node-express="msg"]').html($(this).attr('title'));
 	});
@@ -181,6 +232,7 @@ $(function() {
 		$("input[name='key']").val(postData);
 		$("input[name='invoiceKey']").val("");
 		$("p[node-msg='true']").hide();
+		$("p[node-msg='true2']").hide();
 		$("p[node-loading='true']").hide();
 		$('tbody[data-invoice="myReceivables"]').html("");
 		
@@ -201,6 +253,13 @@ $(function() {
 					if(data.priceStatus == 1){
 						$('p[node-msg="true"]').html("收款金额超出开票金额 ￥"+data.price+"元，请谨慎操作。");
 						$('p[node-msg="true"]').show();
+					}else if(data.priceStatus == 2&& data.isReceivables != 0){
+						$('p[node-msg="true"]').html("收款金额少于开票金额 ￥"+data.price+"元，请谨慎操作。");
+						$('p[node-msg="true"]').show();
+					}
+					if(data.isReceivables == 0){
+						$('p[node-msg="true2"]').html("该发票还没有入账，请先进行选择收款入账");
+						$('p[node-msg="true2"]').show();
 					}
 				} 
 			},

global/js/invoice.validator.js

@@ -64,7 +64,7 @@ $(function () {
 	    focusCleanup: true,
 	    theme:"yellow_top",
 	    fields: {
-	        'opinion': 'required; '
+	        //'opinion': 'required; '
 	    }
 	});
 	

protected/config/acl.conf.php

@@ -15,6 +15,7 @@ $acl ['ordinary'] ['allow'] = array (
 				'invoiceUntreadDo',
 				'invoiceDelDo',
 				'invoiceAchieve',
+				'invoiceReceivablesAchieve',
 				'ajaxGetInvoiceInfoByType',
 				'ajaxGetInvoiceReceivables',
 				'ajaxGetInvoicePostDetail',
@@ -29,6 +30,7 @@ $acl ['收款管理'] ['allow'] = array (
 		'InvoiceController' => array (
 				'invoiceReceivables',
 				'invoiceReceivablesDo',
+				'invoiceReceivablesAS',
 				'ajaxGetStaffByCategory'
 		) 
 );

protected/config/routes.conf.php

@@ -369,6 +369,12 @@ $route['post']['/invoiceUntreadDo'] = array('InvoiceController', 'invoiceUntread
 $route['get']['/invoiceAchieve'] = array('InvoiceController', 'invoiceAchieve');
 $route['get']['/invoiceAchieve/:page'] = array('InvoiceController', 'invoiceAchieve');
 $route['get']['/invoiceAchieve/:page/:date'] = array('InvoiceController', 'invoiceAchieve');
+$route['get']['/invoiceAchieve/:page/:date/:MebSea'] = array('InvoiceController', 'invoiceAchieve');
+
+$route['get']['/invoiceReceivablesAchieve'] = array('InvoiceController', 'invoiceReceivablesAchieve');
+$route['get']['/invoiceReceivablesAchieve/:page'] = array('InvoiceController', 'invoiceReceivablesAchieve');
+$route['get']['/invoiceReceivablesAchieve/:page/:date'] = array('InvoiceController', 'invoiceReceivablesAchieve');
+$route['get']['/invoiceReceivablesAchieve/:page/:date/:MebSea'] = array('InvoiceController', 'invoiceReceivablesAchieve');
 
 $route['post']['/ajaxGetInvoiceInfoByType'] = array('InvoiceController', 'ajaxGetInvoiceInfoByType');
 $route['post']['/ajaxGetInvoiceReceivables'] = array('InvoiceController', 'ajaxGetInvoiceReceivables');
@@ -395,11 +401,17 @@ $route['post']['/ajaxGetInvoicePostDetail'] = array('InvoiceController', 'ajaxGe
 //发票退票
 $route['get']['/invoiceUntread'] = array('InvoiceController', 'invoiceUntread');
 $route['post']['/invoiceUntreadEstablishedDo'] = array('InvoiceController', 'invoiceUntreadEstablishedDo');
-
 //收款管理
 $route['get']['/invoiceReceivables'] = array('InvoiceController', 'invoiceReceivables');
 $route['post']['/invoiceReceivablesDo'] = array('InvoiceController', 'invoiceReceivablesDo');
 $route['post']['/ajaxGetStaffByCategory'] = array('InvoiceController', 'ajaxGetStaffByCategory');
+
+$route['get']['/invoiceReceivablesAS'] = array('InvoiceController', 'invoiceReceivablesAS');
+$route['get']['/invoiceReceivablesAS/:page'] = array('InvoiceController', 'invoiceReceivablesAS');
+$route['get']['/invoiceReceivablesAS/:page/:status'] = array('InvoiceController', 'invoiceReceivablesAS');
+$route['get']['/invoiceReceivablesAS/:page/:status/:year'] = array('InvoiceController', 'invoiceReceivablesAS');
+$route['get']['/invoiceReceivablesAS/:page/:status/:year/:month'] = array('InvoiceController', 'invoiceReceivablesAS');
+$route['get']['/invoiceReceivablesAS/:page/:status/:year/:month/:MebSea'] = array('InvoiceController', 'invoiceReceivablesAS');
 //公司汇总查阅
 $route['*']['/invoiceAggregate'] = array('InvoiceController', 'invoiceAggregate');
 $route['*']['/invoiceAggregateStaff'] = array('InvoiceController', 'invoiceAggregateStaff');

protected/controller/InvoiceController.php

@@ -1033,6 +1033,12 @@ class InvoiceController extends DooController {
 					'receivablesCategory' => $receivablesCategory,
 					'receivablesStaff' => $receivablesStaff 
 			);
+			if ($receivablesCategory != 'PUBLIC' && $receivablesStaff != 'PUBLIC') {
+				$item += array (
+				'confirmTime' => date ( "Y-m-d H:i:s" )
+				);
+			}
+			
 			$irid = $invoiceReceivables->addInvoiceReceivables ( $item );
 			
 			// 收款操作日志
@@ -1047,13 +1053,11 @@ class InvoiceController extends DooController {
 			elseif ($receivablesCategory != 'PUBLIC' && $receivablesStaff != 'PUBLIC') {
 				$receivablesStaff = explode ( '-', $receivablesStaff );
 				$item = array (
-						'operation' => $this->staff [0] ['username'] . " 转入 " . $receivablesStaff [1],
-						'bindDate' => date ( "Y-m-d H:i:s" ) 
+						'operation' => $this->staff [0] ['username'] . " 转入 " . $receivablesStaff [1]
 				);
 			}
 			$item += array (
 					'date' => date ( "Y-m-d" ),
-					
 					'status' => 1,
 					'img' => $this->staff [0] ['avatar'],
 					'username' => $this->staff [0] ['username'],
@@ -1630,10 +1634,15 @@ class InvoiceController extends DooController {
 		Doo::loadModel ( 'invoice' );
 		$invoice = new invoice ();
 		
+		$MebSea = isset($this->params ['MebSea']) ? urldecode($this->params ['MebSea']) : '';
+		
+		
 		$page_size=1;
 		$page = isset($this->params ['page'])&&is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
 		$date = isset($this->params ['date']) ? $this->params ['date'] : 'MONTHO';
 		
+		$get="/".$date;
+		
 		$con='';
 		if ($date=='MONTHO')
 			$con=' and updateTime>DATE_SUB(CURDATE(), INTERVAL 1 MONTH)';
@@ -1642,15 +1651,21 @@ class InvoiceController extends DooController {
 		elseif ($date=='MONTHY')
 			$con=' and updateTime>DATE_SUB(CURDATE(), INTERVAL 1 YEAR)';
 		
+		if (!empty($MebSea)){	
+			$con.=' and ( invoiceTitle like "%'.$MebSea.'%" or invoiceCompany like "%'.$MebSea.'%" or invoicePrice like "%'.$MebSea.'%" )';
+			$get.="/".$MebSea;
+		}
 		$pageinfo['page']=array('previous'=>'');
 		$sql='status=2 and untreadStatus=3 and sid='.$_COOKIE ["staff"].$con;
-		$pageinfo=$this->get_page("CLD_invoice", $sql, $page, $page_size, "invoiceAchieve","","");
+		$pageinfo=$this->get_page("CLD_invoice", $sql, $page, $page_size, "invoiceAchieve",$get,"");
 		
 		$limit=$pageinfo ['lower'].','.$page_size;
 		
 		$list=$invoice->getInvoiceByUntreadStatusPage($limit,$_COOKIE ["staff"],$con);
 		//print_r($pageinfo);
-		
+		$this->data['MebSeaEn']=$MebSea;
+		$this->data['MebSea']=urlencode($MebSea);
+		$this->data['get']=$get;
 		$this->data['page']=$pageinfo;
 		$this->data ['list'] = $list;
 		$this->data ['date']=$date;
@@ -1660,6 +1675,107 @@ class InvoiceController extends DooController {
 		$this->render ( "/admin/invoiceAchieve", $this->data );
 	}
 	
+	function invoiceReceivablesAchieve() {
+		Doo::loadModel ( 'invoiceReceivables' );
+		$invoiceReceivables = new invoiceReceivables ();
+	
+		$MebSea = isset($this->params ['MebSea']) ? urldecode($this->params ['MebSea']) : '';
+	
+		$page_size=1;
+		$page = isset($this->params ['page'])&&is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
+		$date = isset($this->params ['date']) ? $this->params ['date'] : 'MONTHO';
+	
+		$get="/".$date;
+		
+		$con='';
+		if ($date=='MONTHO')
+			$con=' and bindDate>DATE_SUB(CURDATE(), INTERVAL 1 MONTH)';
+		elseif ($date=='MONTHT')
+			$con=' and bindDate>DATE_SUB(CURDATE(), INTERVAL 3 MONTH)';
+		elseif ($date=='MONTHY')
+			$con=' and bindDate>DATE_SUB(CURDATE(), INTERVAL 1 YEAR)';
+	
+		if (!empty($MebSea)){
+			$con.=' and ( receivablesMessage like "%'.$MebSea.'%"  or receivablesPrice like "%'.$MebSea.'%" )';
+			$get.="/".$MebSea;
+		}
+		$pageinfo['page']=array('previous'=>'');
+		$sql=" bindStatus=1 and receivablesStaff like '" . $_COOKIE ["staff"] . "_%' ".$con;
+		$pageinfo=$this->get_page("CLD_invoiceReceivables", $sql, $page, $page_size, "invoiceReceivablesAchieve",$get,"");
+	
+		$limit=$pageinfo ['lower'].','.$page_size;	
+	
+		$list=$invoiceReceivables->getReceivablesByUntreadStatusPage($limit,$sql);
+				//print_r($pageinfo);
+		$this->data['MebSeaEn']=$MebSea;
+		$this->data['MebSea']=urlencode($MebSea);
+		$this->data['get']=$get;
+		$this->data['page']=$pageinfo;
+		$this->data ['list'] = $list;
+		$this->data ['date']=$date;
+		$this->data ['memu'] = "invoice";
+		$this->data ['staff'] = $this->staff;
+		$this->data ['receiptMemu'] = 'invoiceMyReceivables';
+		$this->render ( "/admin/invoiceReceivablesAchieve", $this->data );
+	}
+	
+	function invoiceReceivablesAS() {
+		Doo::loadModel ( 'invoiceReceivables' );
+		$invoiceReceivables = new invoiceReceivables ();
+	
+		$MebSea = isset($this->params ['MebSea']) ? urldecode($this->params ['MebSea']) : '';
+	
+		$page_size=1;
+		$page = isset($this->params ['page'])&&is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
+		$status = isset($this->params ['status']) ? $this->params ['status'] : 'All';
+		
+		$year=isset($this->params ['year'])&&is_numeric ( $this->params ['year'] )?$this->params ['year']:date('Y');
+		$month=isset($this->params ['month'])&&is_numeric ( $this->params ['month'] )?$this->params ['month']:"All";
+		
+		$con="Year(date) =".$year;
+		if($month!="All")
+			$con="Year(date) =".$year." and Month(date) = ".$month;
+			
+		if ($status=='Unclaimed')
+			$con.=' and bindStatus=0';
+		elseif ($status=='Credited')
+			$con.=' and bindStatus=1';
+		
+		$get="/".$status."/".$year."/".$month;
+			
+		if (!empty($MebSea)){
+			$con.=' and ( receivablesMessage like "%'.$MebSea.'%"  or receivablesPrice like "%'.$MebSea.'%" )';
+			$get.="/".$MebSea;
+		}
+		$pageinfo['page']=array('previous'=>'');
+		$pageinfo=$this->get_page("CLD_invoiceReceivables", $con, $page, $page_size, "invoiceReceivablesAS",$get,"");
+		$limit=$pageinfo ['lower'].','.$page_size;
+	
+		$list=$invoiceReceivables->getReceivablesByUntreadStatusPage($limit,$con);
+				//print_r($pageinfo);
+		$mothHtml="";
+		for($i=1;$i<=12;$i++){
+			if($month==$i)
+				$mothHtml.='<option selected value="'.$i.'">'.$i.'月</option>';
+			else
+				$mothHtml.='<option value="'.$i.'">'.$i.'月</option>';
+		}
+		
+		$this->data['MebSeaEn']=$MebSea;
+		$this->data['MebSea']=urlencode($MebSea);
+		$this->data['mothHtml']=$mothHtml;
+		$this->data['year']=$year;
+		$this->data['month']=$month;
+		$this->data['page']=$pageinfo;
+		$this->data['get']=$get;
+		$this->data ['list'] = $list;
+		$this->data ['status']=$status;
+		$this->data ['memu'] = "invoice";
+		$this->data ['staff'] = $this->staff;
+		$this->data ['receiptMemu'] = 'invoiceReceivables';
+		$this->render ( "/admin/invoiceReceivablesAS", $this->data );
+	}
+	
 	/**
 	 * 获得与我有关可收款的发票
 	 */
@@ -1691,6 +1807,7 @@ class InvoiceController extends DooController {
 						var invoiceKey=  $(this).attr("p-data");
 						var claimKey=$("input[name=\'key\']").val();
 						$("p[node-msg=\"true\"]").hide();
+						
 						var url = "/ajaxCompareInvoicePrice";
 						$.ajax({
 							url : url,
@@ -1797,6 +1914,7 @@ class InvoiceController extends DooController {
 		
 		$select = "iid,recipients,recipientsPhone,recipientsAddress,mailItems,expressCompany,expressNumber,actualItems";
 		$invoiceDetail = $invoice->getInvoiceByIid ( $iid, $select );
+		
 		echo json_encode ( array (
 				'status' => 1,
 				'invoiceDetail' => $invoiceDetail 
@@ -1860,17 +1978,21 @@ class InvoiceController extends DooController {
 		$invoiceReceivables->setInvoiceReceivablesByCondition ( $item );
 		
 		$price = 0;
-		$priceStatus = 0;
+		$priceStatus = 0;$isReceivables=0;
 		$invoiceReceivables = new invoiceReceivables ();
 		$list = $invoiceReceivables->getInvoiceReceivablesInIridString ( $iridString );
+		if (!empty($list))
+			$isReceivables=1;
 		$receivablesPrice = 0;
-		
 		foreach ( $list as $key => $value ) {
 			$receivablesPrice += $value ['receivablesPrice'];
 		}
 		if ($receivablesPrice > $detail ['invoicePrice']) {
 			$price = $receivablesPrice - $detail ['invoicePrice'];
 			$priceStatus = 1;
+		}elseif($receivablesPrice < $detail ['invoicePrice']){
+			$price = $detail ['invoicePrice']-$receivablesPrice;
+			$priceStatus = 2;
 		}
 		
 		echo json_encode ( array (
@@ -1885,7 +2007,7 @@ class InvoiceController extends DooController {
 						var element=($(this));
 						$("p[node-loading=\"true\"]").show();
 						$("p[node-loading=\"true\"]").html("移除处理中...");
-							
+						$("p[node-msg=\"true2\"]").hide();	
 						$("p[node-msg=\"true\"]").hide();
 						var url = "/ajaxReceivablesRemove";
 						$.ajax({
@@ -1907,6 +2029,9 @@ class InvoiceController extends DooController {
 									if(data.priceStatus == 1){
 										$("p[node-msg=\"true\"]").html("收款金额超出开票金额 ￥"+data.price+"元，请谨慎操作。");
 										$("p[node-msg=\"true\"]").show();
+									}else if(data.priceStatus == 2&& data.isReceivables != 0){
+										$("p[node-msg=\"true\"]").html("收款金额少于开票金额 ￥"+data.price+"元，请谨慎操作。");
+										$("p[node-msg=\"true\"]").show();
 									}
 								}else if(data.status == 2){
 									$("p[node-loading=\"true\"]").html(data.msg);
@@ -1919,7 +2044,8 @@ class InvoiceController extends DooController {
 					</script>
 				',
 				'price' => $price,
-				'priceStatus' => $priceStatus 
+				'priceStatus' => $priceStatus,
+				'isReceivables'=>$isReceivables
 		) );
 	}
 	
@@ -1978,15 +2104,22 @@ class InvoiceController extends DooController {
 		$invoiceOperationLog->setInvoiceOperationLog ( $item );
 		
 		$price = 0;
-		$priceStatus = 0;
+		$priceStatus = 0;$isReceivables=0;
+		$invoiceReceivables = new invoiceReceivables ();
 		$list = $invoiceReceivables->getInvoiceReceivablesInIridString ( $invoiceIrid );
+		
+		if (!empty($list))
+			$isReceivables=1;
 		$receivablesPrice = 0;
 		foreach ( $list as $key => $value ) {
 			$receivablesPrice += $value ['receivablesPrice'];
 		}
-		if ($receivablesPrice >= $detail ['invoicePrice']) {
+		if ($receivablesPrice > $detail ['invoicePrice']) {
 			$price = $receivablesPrice - $detail ['invoicePrice'];
 			$priceStatus = 1;
+		}elseif($receivablesPrice < $detail ['invoicePrice']){
+			$price = $detail ['invoicePrice']-$receivablesPrice;
+			$priceStatus = 2;
 		}
 		
 		echo json_encode ( array (
@@ -2005,7 +2138,7 @@ class InvoiceController extends DooController {
 						var element=($(this));
 						$("p[node-loading=\"true\"]").show();
 						$("p[node-loading=\"true\"]").html("入账处理中...");
-							
+						$("p[node-msg=\"true2\"]").hide();
 						$("p[node-msg=\"true\"]").hide();
 						var url = "/ajaxCompareClaimPrice";
 						$.ajax({
@@ -2027,7 +2160,10 @@ class InvoiceController extends DooController {
 									if(data.priceStatus == 1){
 										$("p[node-msg=\"true\"]").html("收款金额超出开票金额 ￥"+data.price+"元，请谨慎操作。");
 										$("p[node-msg=\"true\"]").show();
-									}
+									}else if(data.priceStatus == 2&& data.isReceivables != 0){
+						$("p[node-msg=\"true\"]").html("收款金额少于开票金额 ￥"+data.price+"元，请谨慎操作。");
+						$("p[node-msg=\"true\"]").show();
+					}
 								}else if(data.status == 2){
 									$("p[node-loading=\"true\"]").html(data.msg);
 								}
@@ -2039,7 +2175,8 @@ class InvoiceController extends DooController {
 					</script>
 				',
 				'price' => $price,
-				'priceStatus' => $priceStatus 
+				'priceStatus' => $priceStatus ,
+				'isReceivables'=>$isReceivables
 		) );
 	}
 	
@@ -2107,7 +2244,7 @@ class InvoiceController extends DooController {
 						var element=($(this));
 						$("p[node-loading=\"true\"]").show();
 						$("p[node-loading=\"true\"]").html("入账处理中...");
-							
+						$("p[node-msg=\"true2\"]").hide();	
 						$("p[node-msg=\"true\"]").hide();
 						var url = "/ajaxCompareClaimPrice";
 						$.ajax({
@@ -2129,7 +2266,10 @@ class InvoiceController extends DooController {
 									if(data.priceStatus == 1){
 										$("p[node-msg=\"true\"]").html("收款金额超出开票金额 ￥"+data.price+"元，请谨慎操作。");
 										$("p[node-msg=\"true\"]").show();
-									}
+									}else if(data.priceStatus == 2&& data.isReceivables != 0){
+						$("p[node-msg=\"true\"]").html("收款金额少于开票金额 ￥"+data.price+"元，请谨慎操作。");
+						$("p[node-msg=\"true\"]").show();
+					}
 								}else if(data.status == 2){
 									$("p[node-loading=\"true\"]").html(data.msg);
 								}
@@ -2162,7 +2302,7 @@ class InvoiceController extends DooController {
 						var element=($(this));
 						$("p[node-loading=\"true\"]").show();
 						$("p[node-loading=\"true\"]").html("移除处理中...");
-							
+						$("p[node-msg=\"true2\"]").hide();	
 						$("p[node-msg=\"true\"]").hide();
 						var url = "/ajaxReceivablesRemove";
 						$.ajax({
@@ -2184,6 +2324,9 @@ class InvoiceController extends DooController {
 									if(data.priceStatus == 1){
 										$("p[node-msg=\"true\"]").html("收款金额超出开票金额 ￥"+data.price+"元，请谨慎操作。");
 										$("p[node-msg=\"true\"]").show();
+									}else if(data.priceStatus == 2&& data.isReceivables != 0){
+										$("p[node-msg=\"true\"]").html("收款金额少于开票金额 ￥"+data.price+"元，请谨慎操作。");
+										$("p[node-msg=\"true\"]").show();
 									}
 								}else if(data.status == 2){
 									$("p[node-loading=\"true\"]").html(data.msg);
@@ -2199,15 +2342,20 @@ class InvoiceController extends DooController {
 		}
 		
 		$price = 0;
-		$priceStatus = 0;
+		$priceStatus = 0;$isReceivables=0;
 		$list = $invoiceReceivables->getInvoiceReceivablesInIridString ( $detail ['irid'] );
+		if (!empty($list))
+			$isReceivables=1;
 		$receivablesPrice = 0;
 		foreach ( $list as $key => $value ) {
 			$receivablesPrice += $value ['receivablesPrice'];
 		}
-		if ($receivablesPrice >= $detail ['invoicePrice']) {
+		if ($receivablesPrice > $detail ['invoicePrice']) {
 			$price = $receivablesPrice - $detail ['invoicePrice'];
 			$priceStatus = 1;
+		}elseif($receivablesPrice < $detail ['invoicePrice']){
+			$price = $detail ['invoicePrice']-$receivablesPrice;
+			$priceStatus = 2;
 		}
 		
 		echo json_encode ( array (
@@ -2215,7 +2363,9 @@ class InvoiceController extends DooController {
 				'html' => $html,
 				'html2' => $html2,
 				'price' => $price,
-				'priceStatus' => $priceStatus 
+				'priceStatus' => $priceStatus,
+				'isReceivables'=>$isReceivables
+				
 		) );
 	}
 	function ajaxGetInvoiceInfoByType() {

protected/model/invoice.php

@@ -254,13 +254,15 @@ class invoice extends DooModel {
 		if (is_numeric ( $iid ) && ! empty ( $iid ))
 			$Detail = $this->getOne ( $condition );
 		
-		$Detail ['expressCompany'] = '';
-		$Detail ['expressCom'] = '';
 		if (isset ( $Detail ['expressCompany'] ) && ! empty ( $Detail ['expressCompany'] )) {
 			$express = explode ( ":", $Detail ['expressCompany'] );
 			$Detail ['expressCompany'] = $express [0];
 			$Detail ['expressCom'] = $express [1];
+		}else{
+			$Detail ['expressCompany'] = '';
+			$Detail ['expressCom'] = '';
 		}
+			
 		$Detail ['iidKey'] = $this->authcode ( $Detail ['iid'], '' );
 		Doo::loadModel ( 'L_category' );
 		$lCategory = new L_category ();

protected/model/invoiceROLog.php

@@ -104,15 +104,15 @@ class invoiceROLog extends DooModel {
 	}
 	
 	/**
-	 * 根据发票ID获取操作日志数据
+	 * 根据收款ID获取操作日志数据
 	 *
-	 * @param integer $iid 发票ID
+	 * @param integer $irid 收款ID
 	 * @param integer $desc 获得一条操作日志最新或者最旧
 	 * @return array|array() 发票审批操作日志数据集
 	 */
 	public function getInvoiceROLogByIrid($irid = 0, $desc = '') {
 		$list = array ();
-		if (! empty ( $iid ) && is_numeric ( $irid ) && empty ( $desc ))
+		if ( is_numeric ( $irid ) && empty ( $desc ))
 			$list = $this->find ( array (
 					'where' => ' irid=' . $irid,
 					'asArray' => true 

protected/model/invoiceReceivables.php

@@ -166,6 +166,7 @@ class invoiceReceivables extends DooModel {
 					'where' => " irid in ( " . $iridString . " )",
 					'asArray' => TRUE 
 			) );
+		
 		$price=0;
 		$serial=0;
 		Doo::loadClass ( 'XDeode' );
@@ -268,6 +269,43 @@ class invoiceReceivables extends DooModel {
 		return $list;
 	}
 	
+	function getReceivablesByUntreadStatusPage($limit = 0, $con = "", $desc = 'desc') {
+		if (empty ( $limit ))
+			return array ();
+	
+			$list = $this->find ( array (
+					'where' => $con,//" bindStatus=1 and receivablesStaff like '" . $sid . "_%' ".$con,
+					'limit' => $limit,
+					$desc => 'irid',
+					'asArray' => TRUE
+			) );
+			Doo::loadClass ( 'XDeode' );
+			$XDeode = new XDeode ( 5 );
+			Doo::loadModel ( 'invoice' );
+			$invoice = new invoice ();
+			Doo::loadModel ( 'invoiceROLog' );
+			$invoiceROLog = new invoiceROLog ();
+			
+			foreach ( $list as $key => $value ) {
+				$list [$key] ['iridKeyK'] = $XDeode->encode ( $value ['irid'] );
+				if (isset($value ['iid'])&&!empty($value ['iid'])){
+					
+					$list [$key] ['iidKeyK'] = $XDeode->encode ( $value ['iid'] );
+					$list [$key] ['irList'] = $invoice->getInvoiceByIid( $value ['iid'] );
+				}else{
+					$list [$key] ['iidKeyK']='';
+					$list [$key] ['irList']=array('invoiceSerial'=>'');
+				}
+				$list [$key]['irolg']=$invoiceROLog->getInvoiceROLogByIrid($value ['irid'],'desc');
+// 				$list [$key] ['sumPrice'] = 0;
+// 				if (! empty ( $list [$key] ['irList'] ))
+// 					$list [$key] ['sumPrice'] = $list [$key] ['irList'] [0] ['sumPrice'];
+					// $list [$key] ['operationLog'] = $invoiceOperationLog->getInvoiceOperationLogByIid ( $value ['iid'], 'desc' );
+			}
+	
+			return $list;
+	}
+	
 	/**
 	 * 加密或解密指定字符串
 	 *

protected/view/admin/invoice.html

@@ -153,8 +153,9 @@
 							<div class="clearfix">
 							
 							
-							<!-- if !empty({{receivablesList}}) -->
+							
 							<legend><div class="fR"><a href="/invoiceAchieve">查看更多</a></div>最近入账</legend>
+							<!-- if !empty({{receivablesList}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC">开票单位（抬头）</th><th class="taC" width="90">开票金额</th><th class="taC">开票流水号</th><th class="taC" width="90">收款金额</th><th class="taC">收款流水号</th><th class="taC">处理时间</th></tr>
@@ -297,7 +298,7 @@
     <div class="modal-header">
     <h3>发票入账</h3>
     </div>
-    <form action="/invoiceEnterReceivables" method="post" >
+    <form action="/invoiceEnterReceivables" method="post" onsubmit="return sures()" >
 		<input type="hidden" name="key" value="">
 		<input type="hidden" name="invoiceKey" value="">
     <div class="modal-body">
@@ -311,7 +312,8 @@
 				
 				</tbody>
 			</table>
-    	<p node-msg='true' class="alert alert-erro hide">收款金额超出开票金额 ￥2000.00元，请谨慎操作。</p>
+    	<p node-msg='true' class="alert alert-erro hide"></p>
+    	<p node-msg='true2' class="alert alert-erro hide"></p>
 		<table class="table table-bordered table-condensed">
 			<thead><th>金额</th><th>到款信息</th><th>到款银行</th><th>到款时间</th><th>入账操作</th></thead>
 			<tbody data-invoice="myReceivables" >

protected/view/admin/invoiceAchieve.html

@@ -22,15 +22,17 @@
 				入账完成发票</legend>
 				<div class="demandCate">
 					<ul class="cateList">
-	  					<li><a <!-- if {{date}}=='MONTHO' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHO">最近一个月</a>
-	  					<a <!-- if {{date}}=='MONTHT' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHT">最近三个月</a>
-	  					<a <!-- if {{date}}=='MONTHY' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHY" >今年</a>
-	  					<a <!-- if {{date}}=='MONTHA' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHA" >更旧</a></li>
+	  					<li><a <!-- if {{date}}=='MONTHO' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHO/{{MebSea}}">最近一个月</a>
+	  					<a <!-- if {{date}}=='MONTHT' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHT/{{MebSea}}">最近三个月</a>
+	  					<a <!-- if {{date}}=='MONTHY' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHY/{{MebSea}}" >今年</a>
+	  					<a <!-- if {{date}}=='MONTHA' --> class="now" <!-- endif --> href="/invoiceAchieve/1/MONTHA/{{MebSea}}" >更旧</a></li>
 						<li>
 							<div class="search">
 							<div class="input-append">
-								<input class="span3" type="text" placeholder="发票抬头、开票金额">
-								<button class="btn btn-small" type="button">搜索</button>
+								<form action="/invoiceAchieve/1/{{date}}" id="ira" method="get" >
+								<input class="span3" type="text"  data-irmMebSea value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
+								<button class="btn btn-small" node-iramMebSea type="button">搜索</button>
+								</form>
 							</div>
 						</li>
 	  			</ul>
@@ -74,19 +76,19 @@
 	  							<!-- if {{page.previous}}==0 -->
 								<li><a href="javascript:void(0)" title="上一页">&lt;</a></li>
 								<!-- else -->
-								<li><a href="/invoiceAchieve/{{page.previous}}" title="上一页">&lt;</a></li>
+								<li><a href="/invoiceAchieve/{{page.previous}}{{get}}" title="上一页">&lt;</a></li>
 								<!-- endif -->	
 								
 	  							<!-- if {{page.on_page}}>=3 -->
-	  							<li><a href="/invoiceAchieve/1" title="上一页">1</a></li>
+	  							<li><a href="/invoiceAchieve/1{{get}}" title="上一页">1</a></li>
 	  							<li class="point"><span>...</span></li>
 	  							<!-- endif -->
 	  							
 	  							{{page.page}}
 	  							
 	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
-	  							<li><a href="/invoiceAchieve/4" >4</a></li>
-	  							<li><a href="/invoiceAchieve/5" >5</a></li>
+	  							<li><a href="/invoiceAchieve/4{{get}}" >4</a></li>
+	  							<li><a href="/invoiceAchieve/5{{get}}" >5</a></li>
 	  							<!-- endif -->
 	  							
 	  							<!-- if {{page.total_page}}>3 -->
@@ -96,7 +98,7 @@
 			  					<!-- if {{page.next}}=={{page.on_page}} -->
 								<li><a href="javascript:void(0)" title="下一页">&gt;</a></li>
 								<!-- else -->
-								<li><a href="/invoiceAchieve/{{page.next}}" title="下一页">&gt;</a></li>
+								<li><a href="/invoiceAchieve/{{page.next}}{{get}}" title="下一页">&gt;</a></li>
 								<!-- endif -->
 			  					
 			  		</ul>

protected/view/admin/invoiceAggregateCategory.html

@@ -31,7 +31,7 @@
 </select></li>
 						<li>开票总计：￥{{isList.statisticsYear.0.invoicePrice}}</li>
 						<li>收款总计：￥{{isList.statisticsYear.0.receivablesPrice}}</li>
-						<li>完成入账：￥{{isList.statisticsYear.0.accountPrice}}</li>
+						<li>完成核销：￥{{isList.statisticsYear.0.accountPrice}}</li>
 					</ul>
 					</form>
 				</div>

protected/view/admin/invoiceApproval.html

@@ -25,8 +25,9 @@
                 <div class="borad-news">
                     <div class="saeaList">
                         <div class="clearfix">
-                        	<!-- if !empty({{invoiceList}}) -->
+                        	
                             <legend><div class="fR"></div>待审批开票</legend>
+                            <!-- if !empty({{invoiceList}}) -->
                             <table class="table table-bordered table-condensed">
                                 <tbody>
                                 <tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">上一位审批</th><th class="taC" width="120">操作</th></tr>
@@ -61,8 +62,9 @@
                         </div>
                         
                         <div class="clearfix">
-                        	<!-- if !empty({{ilist}}) -->
+                        	
                             <legend><div class="fR"><a href="invoice-approval-all.html">查看更多</a></div>最近审批完成</legend>
+                            <!-- if !empty({{ilist}}) -->
                             <table class="table table-bordered table-condensed">
                                 <tbody>
                                 <tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">完成审批</th></tr>

protected/view/admin/invoiceMyReceivables.html

@@ -35,8 +35,9 @@
 							</table>
 						</div>
 						<div class="clearfix">
-							<!-- if !empty({{list.myClaim}}) -->
+							
 							<legend><div class="fR"></div>待入账</legend>
+							<!-- if !empty({{list.myClaim}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行到帐时间</th><th class="taC">收款处理</th><th class="taC" width="120">操作</th></tr>
@@ -63,8 +64,9 @@
 							<!-- endif -->
 						</div>
 						<div class="clearfix">
+							
+							<legend><div class="fR"><a href="/invoiceReceivablesAchieve">查看更多</a></div>最近入账</legend>
 							<!-- if !empty({{list.bindClaim}}) -->
-							<legend><div class="fR"><a href="invoice-billing-all.html">查看更多</a></div>最近入账</legend>
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC">银行到帐信息</th><th class="taC" width="90">收款金额</th><th class="taC">收款流水号</th><th class="taC" width="90">开票金额</th><th class="taC">开票流水号</th><th class="taC">入账时间</th></tr>

protected/view/admin/invoicePost.html

@@ -26,11 +26,12 @@
 				<div class="borad-news">
 					<div class="saeaList">
 						<div class="clearfix">
-							<!-- if !empty({{invoicePost}}) -->
+							
 							<legend>
 								<div class="fR"></div>
 								待邮寄
 							</legend>
+							<!-- if !empty({{invoicePost}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 									<tr>

protected/view/admin/invoicePrint.html

@@ -26,8 +26,9 @@
 					<div class="saeaList">
 					
 						<div class="clearfix">
-							<!-- if !empty({{toPrint}}) -->
+							
 							<legend><div class="fR"></div>待打印</legend>
+							<!-- if !empty({{toPrint}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">完成审批</th><th class="taC" width="120">操作</th></tr>

protected/view/admin/invoiceReceivables.html

@@ -29,7 +29,7 @@
 					<div class="saeaList">
 						<div class="clearfix">
 							<!-- if !empty({{receivablesList}}) -->
-							<legend><div class="fR"><a href="invoice-input-billing-all.html">查看更多</a></div>最近入账</legend>
+							<legend><div class="fR"><a href="/invoiceReceivablesAS">查看更多</a></div>最近入账</legend>
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行/到帐时间</th><th class="taC">收款录入</th><th class="taC">收款认领</th></tr>
@@ -73,7 +73,7 @@
 						<tr>
 							<th class="taC">收款金额</th>
 							<td>
-							<input value="" name="receivablesPrice" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number">
+							<input value="" name="receivablesPrice" placeholder="输入收款金额" pattern="[0-9]" min="0" step="0.01" type="number">
 							</td>
 						</tr>
 						<tr>

protected/view/admin/invoiceReceivablesAS.html

@@ -0,0 +1,312 @@
+<!-- include 'header' -->
+<script src="<?= WEB_SITE_GLOBAL ?>js/invoice.js"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include 'menuReceipt' -->
+				</ul>
+			</div>
+			
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include 'invoiceMenu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					收款管理
+				</legend>
+				<div class="demandCate">
+				<form action="/invoiceReceivablesAS/1/{{status}}" id="iras" method="get">
+					<ul class="cateList">
+					<li>
+						<a <!-- if {{status}}=='All' --> class="now" <!-- endif --> href="/invoiceReceivablesAS/1/All/{{year}}/{{month}}/{{MebSea}}">所有</a>
+	  					<a <!-- if {{status}}=='Unclaimed' --> class="now" <!-- endif --> title="未认领" href="/invoiceReceivablesAS/1/Unclaimed/{{year}}/{{month}}/{{MebSea}}">未认领</a>
+	  					<a <!-- if {{status}}=='Credited' --> class="now" <!-- endif --> title="已入账" href="/invoiceReceivablesAS/1/Credited/{{year}}/{{month}}/{{MebSea}}" >已入账</a>
+	  				</li>
+					
+					
+	  					<li><select node-iryChange >
+							<!-- include 'year' -->
+						</select>
+	  					
+						<select node-irmChange >
+	  					<option value="All">所有月份</option>
+	  					{{mothHtml}}
+	  					</select>
+	  					</li>
+	  					
+						<li><div class="search"><div class="input-append">
+									<input class="span3" data-irmMebSea placeholder="收款金额，收款信息" value="{{MebSeaEn}}" type="text">
+									<button class="btn btn-small" node-irmMebSea type="button">搜索</button>
+								</div>
+							</div></li>
+					</ul>
+					</form>
+	  			</div>
+				<div class="saeaList">
+		  		<table class="table table-hover">
+					<tr class="thead">
+						<th>收款金额</th>
+						<th>收款信息</th>
+						<th>到帐银行/到帐时间</th>
+						<th>录入收款</th>
+						<th>收款认领</th>
+						<th>开票流水号</th>
+						<th>操作</th>
+					</tr>
+					
+					<!-- loop list -->
+						<tr>
+						<td><b>￥{{list' value.receivablesPrice}}</b></td>
+						<td>{{list' value.receivablesMessage}}</td>
+						<td>{{list' value.receivablesBank}}<br>{{list' value.receivablesDate}}</td>
+						<td>{{list' value.inputStaff}} <br>{{list' value.date}}</td>
+						<td>{{list' value.irolg.operation}}<br/>{{list' value.confirmTime}}</td>
+						<td>
+						<a href="#invdetail" node-invoice='INFO' data-isKey="{{list' value.iidKeyK}}"  data-toggle="modal">{{list' value.irList.invoiceSerial}}</a>
+						</td>
+						<td>{{list' value.bindDate}}</td>
+						</tr>
+					<!-- endloop -->
+					
+					<!-- 
+	  				<tr>
+	  					<td><b>￥30000.00</b></td>
+	  					<td>李艳芬/鹅蛋山</td>
+	  					<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+	  					<td>张少珊<br>2015-04-12 11:30:02</td>
+	  					<td>陈特 认领<br>2015-04-12 11:30:02</td>
+	  					<td></td>
+	  					<td><a href="#receive"  data-toggle="modal">变更</a></td>
+	  				</tr>
+	  				<tr>
+	  					<td><b>￥30000.00</b></td>
+	  					<td>李艳芬/鹅蛋山</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+	  					<td>张少珊<br>2015-04-12 11:30:02</td>
+	  					<td>张少珊 转入 刘飞<br>2015-04-12 11:30:02</td>
+	  					<td></td>
+	  					<td><a href="#receive"  data-toggle="modal">变更</a></td>
+	  				</tr>
+	  				<tr>
+	  					<td><b>￥30000.00</b></td>
+	  					<td>李艳芬/鹅蛋山</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+	  					<td>张少珊<br>2015-04-12 11:30:02</td>
+	  					<td>陈特 认领<br>2015-04-12 11:30:02</td>
+	  					<td><a href="#invoiced" data-toggle="modal">#F20160316001</a></td>
+	  					<td></td>
+	  				</tr>
+	  				<tr>
+	  					<td><b>￥30000.00</b></td>
+	  					<td>李艳芬/鹅蛋山</td>
+						<td>广发银行珠海分行柠溪支行<br>2015-04-12</td>
+	  					<td>张少珊<br>2015-04-12 11:30:02</td>
+	  					<td></td>
+	  					<td></td>
+	  					<td><a href="#billeidt" data-toggle="modal">修改</a> <a  href="#billdel" data-toggle="modal">删除</a></td>
+	  				</tr>
+	  				 -->
+		  		</table>
+					</div>
+		  						<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+	  							<!-- if {{page.previous}}==0 -->
+								<li><a href="javascript:void(0)" title="上一页">&lt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceReceivablesAS/{{page.previous}}{{get}}" title="上一页">&lt;</a></li>
+								<!-- endif -->	
+								
+	  							<!-- if {{page.on_page}}>=3 -->
+	  							<li><a href="/invoiceReceivablesAS/1{{get}}" title="上一页">1</a></li>
+	  							<li class="point"><span>...</span></li>
+	  							<!-- endif -->
+	  							
+	  							{{page.page}}
+	  							
+	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
+	  							<li><a href="/invoiceReceivablesAS/4{{get}}" >4</a></li>
+	  							<li><a href="/invoiceReceivablesAS/5{{get}}" >5</a></li>
+	  							<!-- endif -->
+	  							
+	  							<!-- if {{page.total_page}}>3 -->
+	  							<li class="point"><span>...</span></li>
+			  					<!-- endif -->
+			  					
+			  					<!-- if {{page.next}}=={{page.on_page}} -->
+								<li><a href="javascript:void(0)" title="下一页">&gt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceReceivablesAS/{{page.next}}{{get}}" title="下一页">&gt;</a></li>
+								<!-- endif -->
+			  					
+			  		</ul>
+			  	</div>			
+			</div>
+		</div>
+	</div>
+
+<div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
+	
+	<div class="modal  fade" id="invdetail">
+		
+		<div id="nc"></div>
+	</div>
+
+	<!--弹出变更-->
+<div class="modal hide fade" id="receive">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>变更认领人</h3>
+    </div>
+    <div class="modal-body">
+    	<form class="form-horizontal">
+			<div class="control-group">
+				<label class="control-label"><span class="colRed">*</span>办事处</label>
+				<div class="controls">
+					<select><option>公共待认领收款</option><option>广西办</option></select>
+				</div>
+			</div>
+			<div class="control-group">
+				<label class="control-label"></label>
+				<div class="controls">
+					<select><option>办事处待认领收款</option><option>姜栋</option></select>
+				</div>
+			</div>
+		</form>
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button">确定</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--弹出变更-->
+	<!--弹出修改-->
+<div class="modal hide fade" id="billeidt">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>修改收款</h3>
+    </div>
+			<div class="modal-body saeaList">
+				<table class="table table-bordered table-condensed">
+					<tbody>
+					<tr>
+						<th class="taC" colspan="4">收款信息填写</th>
+					</tr>
+					<tr>
+						<th class="taC">收款金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+					</tr>
+					<tr>
+						<th class="taC">收款信息</th><td><input type="text"></td>
+					</tr>
+					<tr>
+						<th class="taC">收款银行</th><td>
+						<select>
+							<option>广发银行珠海分行柠溪支行</option>
+						</select></td>
+					</tr>
+					<tr>
+						<th class="taC">银行到帐时间</th><td><input type="date"></td>
+					</tr>
+					<tr>
+						<th class="taC">认领收款</th><td colspan="3">
+						<select>
+							<option>公共待认领款项</option>
+							<option>广东办</option>
+							<option>广西办</option>
+							<option>重庆办</option>
+						</select>
+
+						<select>
+							<option>办事处待认领款项</option>
+							<option>广东办-刘飞</option>
+						</select></td>
+					</tr>
+					</tbody></table>
+			</div>
+	<div class="modal-footer">
+	    <a href="#" class="button">确定</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--弹出修改-->   
+	<!--弹出删除-->
+<div class="modal hide fade" id="billdel">
+	<div class="modal-dialog">
+		<div class="modal-content">
+    <div class="modal-header">
+    <h3>删除收款</h3>
+    </div>
+    <div class="modal-body">
+    	数据诚可贵，删除需谨慎！
+    </div>
+	<div class="modal-footer">
+	    <a href="#" class="button">删除</a>
+	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+	</div>
+			</div></div>
+</div>
+    <!--弹出删除-->
+	<!--弹出（录入收款）-->
+	<div class="modal hide fade" id="inputbill">
+		<div class="modal-dialog ">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h3>录入收款</h3>
+				</div>
+				<div class="modal-body saeaList">
+					<table class="table table-bordered table-condensed">
+						<tbody>
+						<tr>
+							<th class="taC" colspan="4">收款信息填写</th>
+						</tr>
+						<tr>
+							<th class="taC">收款金额</th><td><input value="0" placeholder="输入开票金额" pattern="[0-9]" min="0" step="0.01" type="number"></td>
+						</tr>
+						<tr>
+							<th class="taC">收款信息</th><td><input type="text"></td>
+						</tr>
+						<tr>
+							<th class="taC">收款银行</th><td>
+							<select>
+								<option>广发银行珠海分行柠溪支行</option>
+							</select></td>
+						</tr>
+						<tr>
+							<th class="taC">银行到帐时间</th><td><input type="date"></td>
+						</tr>
+						<tr>
+							<th class="taC">认领收款</th><td colspan="3">
+							<select>
+								<option>公共待认领款项</option>
+								<option>广东办</option>
+								<option>广西办</option>
+								<option>重庆办</option>
+							</select>
+
+							<select>
+								<option>办事处待认领款项</option>
+								<option>广东办-刘飞</option>
+							</select></td>
+						</tr>
+						</tbody></table>
+				</div>
+				<div class="modal-footer">
+					<a href="#" class="button" data-dismiss="modal" aria-hidden="true">确认录入</a>
+					<a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
+				</div>
+			</div></div>
+	</div>
+	<!--弹出内容-->
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/admin/invoiceReceivablesAchieve.html

@@ -0,0 +1,114 @@
+<!-- include 'header' -->
+<script src="<?= WEB_SITE_GLOBAL ?>js/invoice.js"></script>
+<body>
+	<div class="mainLayout">
+		<div class="mainMenu">
+			<div class="menuItem">
+				<a href="#" class="mLogo">CLD</a>
+				<ul>
+					<!-- include 'menuReceipt' -->
+				</ul>
+			</div>
+			
+		</div>
+		<div class="warpContent">
+			<div class="subMenu fL">
+				<div class="menuItem">
+					<!-- include 'invoiceMenu' -->
+				</div>
+			</div>
+			<div class="adminContent autoHeight">
+				<legend>
+					入账完成收款
+				</legend>
+				<div class="demandCate">
+					<ul class="cateList">
+						<li><a <!-- if {{date}}=='MONTHO' --> class="now" <!-- endif --> href="/invoiceReceivablesAchieve/1/MONTHO/{{MebSea}}">最近一个月</a>
+	  					<a <!-- if {{date}}=='MONTHT' --> class="now" <!-- endif --> href="/invoiceReceivablesAchieve/1/MONTHT/{{MebSea}}">最近三个月</a>
+	  					<a <!-- if {{date}}=='MONTHY' --> class="now" <!-- endif --> href="/invoiceReceivablesAchieve/1/MONTHY/{{MebSea}}" >今年</a>
+	  					<a <!-- if {{date}}=='MONTHA' --> class="now" <!-- endif --> href="/invoiceReceivablesAchieve/1/MONTHA/{{MebSea}}" >更旧</a></li>
+						<li>
+							<div class="search">
+								<div class="input-append">
+									<form action="/invoiceReceivablesAchieve/1/{{date}}" id="ira" method="get" >
+									<input class="span3" type="text" data-irmMebSea value="{{MebSeaEn}}" placeholder="到款信息、收款金额">
+									<button class="btn btn-small" node-iramMebSea type="button">搜索</button>
+									</form>
+								
+								</div>
+							</div></li>
+					</ul>
+				</div>
+				<div class="saeaList">
+					<table class="table table-hover">
+						<tbody>
+						<tr class="thead"><th>收款流水号</th><th>收款金额</th><th>银行到款信息</th><th>到款银行</th><th>收款处理</th><th>开票流水号</th><th>发票金额</th><th>入账时间</th></tr>
+						<!-- loop list -->
+						<tr>
+						<td><a href="#billing" node-invoice='INFO' data-type="receivables" data-isKey="{{list' value.iridKeyK}}" data-toggle="modal">{{list' value.receivablesSerial}}</a></td>
+						<td><b>￥{{list' value.receivablesPrice}}</b></td>
+						<td>{{list' value.receivablesMessage}}</td>
+						<td>{{list' value.receivablesBank}}<br>{{list' value.receivablesDate}}</td>
+						<td>{{list' value.inputStaff}} 转入<br>{{list' value.confirmTime}}</td>
+						<td><a href="#invdetail" node-invoice='INFO' data-isKey="{{list' value.iidKeyK}}"  data-toggle="modal">{{list' value.irList.invoiceSerial}}</a></td>
+						<td>
+						<!-- if !empty({{list' value.irList.invoiceType}}) -->
+	                        <b>￥{{list' value.irList.invoicePrice}}</b><sup>专</sup>
+	                          <!-- else -->
+	                          <b>￥{{list' value.irList.invoicePrice}}</b>
+	                          <!-- endif -->						
+
+						</td><td>{{list' value.bindDate}}</td></tr>
+						<!-- endloop -->
+						
+						</tbody>
+					</table>
+				</div>
+						  		<!--翻页-->
+				<div class="demandPage">
+					<ul class="pagination fL">
+	  							<!-- if {{page.previous}}==0 -->
+								<li><a href="javascript:void(0)" title="上一页">&lt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceReceivablesAchieve/{{page.previous}}{{get}}" title="上一页">&lt;</a></li>
+								<!-- endif -->	
+								
+	  							<!-- if {{page.on_page}}>=3 -->
+	  							<li><a href="/invoiceReceivablesAchieve/1{{get}}" title="上一页">1</a></li>
+	  							<li class="point"><span>...</span></li>
+	  							<!-- endif -->
+	  							
+	  							{{page.page}}
+	  							
+	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
+	  							<li><a href="/invoiceReceivablesAchieve/4{{get}}" >4</a></li>
+	  							<li><a href="/invoiceReceivablesAchieve/5{{get}}" >5</a></li>
+	  							<!-- endif -->
+	  							
+	  							<!-- if {{page.total_page}}>3 -->
+	  							<li class="point"><span>...</span></li>
+			  					<!-- endif -->
+			  					
+			  					<!-- if {{page.next}}=={{page.on_page}} -->
+								<li><a href="javascript:void(0)" title="下一页">&gt;</a></li>
+								<!-- else -->
+								<li><a href="/invoiceReceivablesAchieve/{{page.next}}{{get}}" title="下一页">&gt;</a></li>
+								<!-- endif -->
+			  					
+			  		</ul>
+			  	</div>				
+			</div>
+		</div>
+	</div>
+	<div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
+	
+	<div class="modal  fade" id="invdetail">
+		
+		<div id="nc"></div>
+	</div>
+	
+	<div class="modal  fade" id="billing">
+		<div id="nr"></div>
+	</div>      	
+<script type="text/javascript">autoFlashHeight();</script>	
+</body>

protected/view/admin/invoiceReceivablesClaim.html

@@ -23,8 +23,9 @@
 				<div class="borad-news">
 					<div class="saeaList">
 						<div class="clearfix">
-							<!-- if !empty({{receivablesList.csClaim}}) -->
+							
 							<legend><div class="fR"></div>公共·待认领款项</legend>
+							<!-- if !empty({{receivablesList.csClaim}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">到帐银行/到帐时间</th><th class="taC">收款录入</th><th class="taC" width="120">操作</th></tr>
@@ -45,8 +46,9 @@
 							<!-- endif -->
 						</div>
 						<div class="clearfix">
-							<!-- if !empty({{receivablesList.sClaim}}) -->
+							
 							<legend><div class="fR"></div>办事处·待认领款项</legend>
+							<!-- if !empty({{receivablesList.sClaim}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">到帐银行/到帐时间</th><th class="taC">收款录入</th><th class="taC" width="120">操作</th></tr>
@@ -66,9 +68,9 @@
 							<!-- endif -->
 						</div>
 						<div class="clearfix">
-						<!-- if !empty({{receivablesList.arClaim}}) -->
+						
 							<legend>最近认领</legend>
-
+<!-- if !empty({{receivablesList.arClaim}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC" width="70">收款金额</th><th class="taC">银行到帐信息</th><th class="taC">银行/到帐时间</th><th class="taC">收款录入</th><th class="taC">收款认领</th></tr>

protected/view/admin/invoiceUntread.html

@@ -23,8 +23,9 @@
 				<div class="borad-news">
 					<div class="saeaList">
 						<div class="clearfix">
-						<!-- if !empty({{untreadInvoice}}) -->
+						
 							<legend><div class="fR"></div>待确认退票</legend>
+							<!-- if !empty({{untreadInvoice}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交退票</th><th class="taC">退票快递</th><th class="taC" width="120">操作</th></tr>
@@ -60,8 +61,9 @@
 							<!-- endif -->
 						</div>
 						<div class="clearfix">
-							<!-- if !empty({{establishedInvoice}}) -->
+							
 							<legend><div class="fR"><a href="invoice-return-all.html">查看更多</a></div>最近退票</legend>
+							<!-- if !empty({{establishedInvoice}}) -->
 							<table class="table table-bordered table-condensed">
 								<tbody>
 								<tr><th class="taC">开票流水号</th><th class="taC">开票单位（抬头）</th><th class="taC">开票金额</th><th class="taC">提交开票</th><th class="taC">快递信息</th><th class="taC">确认退票</th></tr>