收款管理相关功能

global/js/invoice.js

@@ -305,5 +305,67 @@ $(function() {
 	});
 	
 	
+	$("a[node-alter]").click(function() {
+		
+		var postData = $(this).attr("data-isKey");
+		
+		//$("div[loading-msg='true']").html("<img src='/global/img/loadIco.gif' />");
+		var url = "/ajaxGetInvoiceReceivablesByStaff";
+		$.ajax({
+			url : url,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			data : {
+				postData : postData
+			},
+			global : true,
+			success : function(data) {
+				if (data.status == 1) {
+					
+						$("input[name='claimKey']").val(postData);
+						$("select[html-category]").html(data.categoryHtml);
+					
+						$("select[html-staff]").html(data.staffHtml);
+				} else
+					$("div[loading-msg='categoryStaff']").html("illegal request");
+			},
+			error : function(err) {
+				$("div[loading-msg='true']").html("");
+			}
+		});
+	});
+	
+	
+	$("a[node-irUpdate]").click(function() {
+		
+		var postData = $(this).attr("data-isKey");
+		
+		//$("div[loading-msg='true']").html("<img src='/global/img/loadIco.gif' />");
+		var url = "/ajaxGetInvoiceReceivablesByStaff";
+		$.ajax({
+			url : url,
+			type : "post",
+			cache : false,
+			dataType : "json",
+			data : {
+				postData : postData
+			},
+			global : true,
+			success : function(data) {
+				if (data.status == 1) {
+					
+					$("input[name='claimuKey']").val(postData);
+					$("select[html-rcategory]").html(data.categoryHtml);
+					
+					$("select[html-rstaff]").html(data.staffHtml);
+				} else
+					$("div[loading-msg='categoryStaff']").html("illegal request");
+			},
+			error : function(err) {
+				$("div[loading-msg='true']").html("");
+			}
+		});
+	});
 	
 })

global/js/invoice.validator.js

@@ -118,4 +118,13 @@ $(function () {
 	    }
 	});
 	
+//	$("form[name='invoiceReceivablesUpdateClaim']").validator({
+//	    timely: 3,
+//	    focusCleanup: true,
+//	    fields: {
+//			receivablesCategory: 'required '
+//			,receivablesStaff: 'required '
+//	    }
+//	});
+	
 })

protected/config/acl.conf.php

@@ -30,8 +30,10 @@ $acl ['收款管理'] ['allow'] = array (
 		'InvoiceController' => array (
 				'invoiceReceivables',
 				'invoiceReceivablesDo',
+				'invoiceReceivablesUpdateClaim',
 				'invoiceReceivablesAS',
-				'ajaxGetStaffByCategory'
+				'ajaxGetStaffByCategory',
+				'ajaxGetInvoiceReceivablesByStaff'
 		) 
 );
 $acl ['发票审批'] ['allow'] = array (

protected/config/routes.conf.php

@@ -404,7 +404,11 @@ $route['post']['/invoiceUntreadEstablishedDo'] = array('InvoiceController', 'inv
 //收款管理
 $route['get']['/invoiceReceivables'] = array('InvoiceController', 'invoiceReceivables');
 $route['post']['/invoiceReceivablesDo'] = array('InvoiceController', 'invoiceReceivablesDo');
+$route['post']['/invoiceReceivablesUpdateClaim'] = array('InvoiceController', 'invoiceReceivablesUpdateClaim');
+
 $route['post']['/ajaxGetStaffByCategory'] = array('InvoiceController', 'ajaxGetStaffByCategory');
+$route['post']['/ajaxGetInvoiceReceivablesByStaff'] = array('InvoiceController', 'ajaxGetInvoiceReceivablesByStaff');
+
 
 $route['get']['/invoiceReceivablesAS'] = array('InvoiceController', 'invoiceReceivablesAS');
 $route['get']['/invoiceReceivablesAS/:page'] = array('InvoiceController', 'invoiceReceivablesAS');

protected/controller/InvoiceController.php

@@ -13,7 +13,6 @@ class InvoiceController extends DooController {
 	public $data;
 	private $INVOICEKEY = "APPROVAL";
 	private $INVOICECOLLECTPATH = "protected/cache/invoiceCollect/";
-	
 	public function beforeRun($resource, $action) {
 		Doo::loadModel ( "invoiceManage" );
 		$invoiceManage = new invoiceManage ();
@@ -49,9 +48,6 @@ class InvoiceController extends DooController {
 		if (! $flag)
 			die ( 'illegal request' );
 	}
-	
-	
-	
 	function __construct() {
 		if (isset ( $_COOKIE ["staff"] )) {
 			if (! empty ( $_COOKIE ["staff"] )) {
@@ -70,7 +66,7 @@ class InvoiceController extends DooController {
 				// if (!$falg)
 				// return Doo::conf()->APP_URL;
 				
-				$this->data['new']=$this->isInvoiceNew();
+				$this->data ['new'] = $this->isInvoiceNew ();
 				
 				$this->staff = $staff->getUserByIdList ( $_COOKIE ["staff"] );
 				return "/";
@@ -112,9 +108,9 @@ class InvoiceController extends DooController {
 		$expressList = $express->getExpressByAll ();
 		$invoiceList = $invoice->getMyInvoice ( $_COOKIE ["staff"] );
 		
-		//$list = $invoiceReceivables->getInvoiceReceivablesByClaim ( $this->staff [0] ['cid'], $this->staff [0] ['sid'] );
+		// $list = $invoiceReceivables->getInvoiceReceivablesByClaim ( $this->staff [0] ['cid'], $this->staff [0] ['sid'] );
 		
-		$list=$invoice->getInvoiceByUntreadStatusPage(4,$_COOKIE ["staff"]);
+		$list = $invoice->getInvoiceByUntreadStatusPage ( 4, $_COOKIE ["staff"] );
 		
 		// print_r($list);
 		
@@ -1035,12 +1031,13 @@ class InvoiceController extends DooController {
 			);
 			if ($receivablesCategory != 'PUBLIC' && $receivablesStaff != 'PUBLIC') {
 				$item += array (
-				'confirmTime' => date ( "Y-m-d H:i:s" )
+						'confirmTime' => date ( "Y-m-d H:i:s" ) 
 				);
 			}
 			
 			$irid = $invoiceReceivables->addInvoiceReceivables ( $item );
 			
+			$item=array();
 			// 收款操作日志
 			if ($receivablesCategory == 'PUBLIC' && $receivablesStaff == 'PUBLIC')
 				$item = array (
@@ -1053,7 +1050,7 @@ class InvoiceController extends DooController {
 			elseif ($receivablesCategory != 'PUBLIC' && $receivablesStaff != 'PUBLIC') {
 				$receivablesStaff = explode ( '-', $receivablesStaff );
 				$item = array (
-						'operation' => $this->staff [0] ['username'] . " 转入 " . $receivablesStaff [1]
+						'operation' => $this->staff [0] ['username'] . " 转入 " . $receivablesStaff [1] 
 				);
 			}
 			$item += array (
@@ -1109,6 +1106,85 @@ class InvoiceController extends DooController {
 	}
 	
 	/**
+	 * 更新收款相关数据
+	 */
+	function invoiceReceivablesUpdateClaim() {
+		$receivablesPrice = $this->get_args ( 'receivablesPrice' ) ? $this->get_args ( 'receivablesPrice' ) : "";
+		$receivablesMessage = $this->get_args ( 'receivablesMessage' ) ? $this->get_args ( 'receivablesMessage' ) : "";
+		$receivablesBank = $this->get_args ( 'receivablesBank' ) ? $this->get_args ( 'receivablesBank' ) : "";
+		$receivablesDate = $this->get_args ( 'receivablesDate' ) ? $this->get_args ( 'receivablesDate' ) : "";
+		$receivablesCategory = $this->get_args ( 'receivablesCategory' ) ? $this->get_args ( 'receivablesCategory' ) : "";
+		$receivablesStaff = $receivablesStaff2 = $this->get_args ( 'receivablesStaff' ) ? $this->get_args ( 'receivablesStaff' ) : "";
+		
+		$claimKey = $this->get_args ( 'claimKey' ) ? $this->get_args ( 'claimKey' ) : "";
+		
+		if (empty ( $claimKey ))
+			die ( 'illegal request' );
+		
+		Doo::loadModel ( 'invoiceReceivables' );
+		$invoiceReceivables = new invoiceReceivables ();
+		Doo::loadModel ( 'invoiceROLog' );
+		$invoiceROLog = new invoiceROLog ();
+		$con = ' and iid=0 and receivablesCategory!="PUBLIC" and receivablesStaff!="PUBLIC"';
+		$detail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $claimKey, $con );
+		if (empty ( $detail ))
+			die ( 'illegal request' );
+		
+		$invoiceReceivables = new invoiceReceivables ();
+		
+		/*
+		 * 'receivablesPrice' => $receivablesPrice, 'receivablesMessage' => $receivablesMessage, 'receivablesSerial' => "#SK" . date ( "Ymd" ) . mt_rand ( 1000, 9999 ), 'receivablesBank' => $receivablesBank, 'receivablesDate' => $receivablesDate, 'inputStaff' => $this->staff [0] ['username'], 'date' => date ( "Y-m-d" ), 'receivablesCategory' => $receivablesCategory, 'receivablesStaff' => $receivablesStaff
+		 */
+		
+		$item = array (
+				'irid' => $detail ['irid'] 
+		);
+		if ($receivablesCategory != 'PUBLIC' && $receivablesStaff != 'PUBLIC') {
+			$item += array (
+					'confirmTime' => date ( "Y-m-d H:i:s" )
+			);
+		}
+		if (! empty ( $receivablesCategory ))
+			$item += array (
+					'receivablesCategory' => $receivablesCategory 
+			);
+		if (! empty ( $receivablesStaff ))
+			$item += array (
+					'receivablesStaff' => $receivablesStaff 
+			);
+		$invoiceReceivables->setInvoiceReceivablesByCondition ( $item );
+		
+		// 收款操作日志
+		$item=array();
+		if ($receivablesCategory == 'PUBLIC' && $receivablesStaff == 'PUBLIC')
+			$item = array (
+					'operation' => $this->staff [0] ['username'] . " 转入 公共待认领款项 " 
+			);
+		elseif ($receivablesCategory != 'PUBLIC' && $receivablesStaff == 'PUBLIC')
+			$item = array (
+					'operation' => $this->staff [0] ['username'] . "转入 办事处待认领款项" 
+			);
+		elseif ($receivablesCategory != 'PUBLIC' && $receivablesStaff != 'PUBLIC') {
+			$receivablesStaff = explode ( '-', $receivablesStaff );
+			$item = array (
+					'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'],
+				'uid' => $this->staff [0] ['sid'],
+				'category' => $this->staff [0] ['category'],
+				'irid' => $detail ['irid'] 
+		);
+		$invoiceROLog->setInvoiceROLog ( $item );
+		
+		return '/invoiceReceivablesAS';
+	}
+	
+	/**
 	 * 管理员录入的收款 ，确认认领到谁的名下.统计收款金额
 	 */
 	function invoiceReceivablesAscription() {
@@ -1269,6 +1345,9 @@ class InvoiceController extends DooController {
 		if (empty ( $detail ))
 			die ( 'illegal request' );
 		
+		if (empty ( $detail ['irid'] ))
+			die ( 'illegal request' );
+		
 		$item = array (
 				'untreadStatus' => 3,
 				'updateTime' => date ( "Y-m-d H:i:s" ),
@@ -1634,142 +1713,145 @@ class InvoiceController extends DooController {
 		Doo::loadModel ( 'invoice' );
 		$invoice = new invoice ();
 		
-		$MebSea = isset($this->params ['MebSea']) ? urldecode($this->params ['MebSea']) : '';
+		$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';
 		
-		$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;
 		
-		$get="/".$date;
+		$con = '';
+		if ($date == 'MONTHO')
+			$con = ' and updateTime>DATE_SUB(CURDATE(), INTERVAL 1 MONTH)';
+		elseif ($date == 'MONTHT')
+			$con = ' and updateTime>DATE_SUB(CURDATE(), INTERVAL 3 MONTH)';
+		elseif ($date == 'MONTHY')
+			$con = ' and updateTime>DATE_SUB(CURDATE(), INTERVAL 1 YEAR)';
 		
-		$con='';
-		if ($date=='MONTHO')
-			$con=' and updateTime>DATE_SUB(CURDATE(), INTERVAL 1 MONTH)';
-		elseif ($date=='MONTHT')
-			$con=' and updateTime>DATE_SUB(CURDATE(), INTERVAL 3 MONTH)';
-		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;
+		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",$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;
+		$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", $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;
+		$this->data ['date'] = $date;
 		$this->data ['memu'] = "invoice";
 		$this->data ['staff'] = $this->staff;
 		$this->data ['receiptMemu'] = 'invoice';
 		$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;
+		
+		$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;
+		$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 ['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";
+		$MebSea = isset ( $this->params ['MebSea'] ) ? urldecode ( $this->params ['MebSea'] ) : '';
 		
-		$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';
+		$page_size = 12;
+		$page = isset ( $this->params ['page'] ) && is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
+		$status = isset ( $this->params ['status'] ) ? $this->params ['status'] : 'All';
 		
-		$get="/".$status."/".$year."/".$month;
-			
-		if (!empty($MebSea)){
-			$con.=' and ( receivablesMessage like "%'.$MebSea.'%"  or receivablesPrice like "%'.$MebSea.'%" )';
-			$get.="/".$MebSea;
+		$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>';
+		$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>';
+				$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 ['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 ['status'] = $status;
 		$this->data ['memu'] = "invoice";
 		$this->data ['staff'] = $this->staff;
 		$this->data ['receiptMemu'] = 'invoiceReceivables';
@@ -1978,11 +2060,12 @@ class InvoiceController extends DooController {
 		$invoiceReceivables->setInvoiceReceivablesByCondition ( $item );
 		
 		$price = 0;
-		$priceStatus = 0;$isReceivables=0;
+		$priceStatus = 0;
+		$isReceivables = 0;
 		$invoiceReceivables = new invoiceReceivables ();
 		$list = $invoiceReceivables->getInvoiceReceivablesInIridString ( $iridString );
-		if (!empty($list))
-			$isReceivables=1;
+		if (! empty ( $list ))
+			$isReceivables = 1;
 		$receivablesPrice = 0;
 		foreach ( $list as $key => $value ) {
 			$receivablesPrice += $value ['receivablesPrice'];
@@ -1990,8 +2073,8 @@ class InvoiceController extends DooController {
 		if ($receivablesPrice > $detail ['invoicePrice']) {
 			$price = $receivablesPrice - $detail ['invoicePrice'];
 			$priceStatus = 1;
-		}elseif($receivablesPrice < $detail ['invoicePrice']){
-			$price = $detail ['invoicePrice']-$receivablesPrice;
+		} elseif ($receivablesPrice < $detail ['invoicePrice']) {
+			$price = $detail ['invoicePrice'] - $receivablesPrice;
 			$priceStatus = 2;
 		}
 		
@@ -2045,7 +2128,7 @@ class InvoiceController extends DooController {
 				',
 				'price' => $price,
 				'priceStatus' => $priceStatus,
-				'isReceivables'=>$isReceivables
+				'isReceivables' => $isReceivables 
 		) );
 	}
 	
@@ -2104,12 +2187,13 @@ class InvoiceController extends DooController {
 		$invoiceOperationLog->setInvoiceOperationLog ( $item );
 		
 		$price = 0;
-		$priceStatus = 0;$isReceivables=0;
+		$priceStatus = 0;
+		$isReceivables = 0;
 		$invoiceReceivables = new invoiceReceivables ();
 		$list = $invoiceReceivables->getInvoiceReceivablesInIridString ( $invoiceIrid );
 		
-		if (!empty($list))
-			$isReceivables=1;
+		if (! empty ( $list ))
+			$isReceivables = 1;
 		$receivablesPrice = 0;
 		foreach ( $list as $key => $value ) {
 			$receivablesPrice += $value ['receivablesPrice'];
@@ -2117,8 +2201,8 @@ class InvoiceController extends DooController {
 		if ($receivablesPrice > $detail ['invoicePrice']) {
 			$price = $receivablesPrice - $detail ['invoicePrice'];
 			$priceStatus = 1;
-		}elseif($receivablesPrice < $detail ['invoicePrice']){
-			$price = $detail ['invoicePrice']-$receivablesPrice;
+		} elseif ($receivablesPrice < $detail ['invoicePrice']) {
+			$price = $detail ['invoicePrice'] - $receivablesPrice;
 			$priceStatus = 2;
 		}
 		
@@ -2175,8 +2259,8 @@ class InvoiceController extends DooController {
 					</script>
 				',
 				'price' => $price,
-				'priceStatus' => $priceStatus ,
-				'isReceivables'=>$isReceivables
+				'priceStatus' => $priceStatus,
+				'isReceivables' => $isReceivables 
 		) );
 	}
 	
@@ -2342,10 +2426,11 @@ class InvoiceController extends DooController {
 		}
 		
 		$price = 0;
-		$priceStatus = 0;$isReceivables=0;
+		$priceStatus = 0;
+		$isReceivables = 0;
 		$list = $invoiceReceivables->getInvoiceReceivablesInIridString ( $detail ['irid'] );
-		if (!empty($list))
-			$isReceivables=1;
+		if (! empty ( $list ))
+			$isReceivables = 1;
 		$receivablesPrice = 0;
 		foreach ( $list as $key => $value ) {
 			$receivablesPrice += $value ['receivablesPrice'];
@@ -2353,8 +2438,8 @@ class InvoiceController extends DooController {
 		if ($receivablesPrice > $detail ['invoicePrice']) {
 			$price = $receivablesPrice - $detail ['invoicePrice'];
 			$priceStatus = 1;
-		}elseif($receivablesPrice < $detail ['invoicePrice']){
-			$price = $detail ['invoicePrice']-$receivablesPrice;
+		} elseif ($receivablesPrice < $detail ['invoicePrice']) {
+			$price = $detail ['invoicePrice'] - $receivablesPrice;
 			$priceStatus = 2;
 		}
 		
@@ -2364,8 +2449,7 @@ class InvoiceController extends DooController {
 				'html2' => $html2,
 				'price' => $price,
 				'priceStatus' => $priceStatus,
-				'isReceivables'=>$isReceivables
-				
+				'isReceivables' => $isReceivables 
 		) );
 	}
 	function ajaxGetInvoiceInfoByType() {
@@ -2467,6 +2551,57 @@ class InvoiceController extends DooController {
 			die ();
 		}
 	}
+	function ajaxGetInvoiceReceivablesByStaff() {
+		$postData = $this->get_args ( 'postData' ) ? $this->get_args ( 'postData' ) : "";
+		
+		if (empty ( $postData )) {
+			echo json_encode ( array (
+					'status' => 2,
+					'msg' => 'illegal request' 
+			) );
+			die ();
+		}
+		
+		Doo::loadModel ( 'invoiceReceivables' );
+		$invoiceReceivables = new invoiceReceivables ();
+		
+		$detail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $postData );
+		if (empty ( $detail )) {
+			echo json_encode ( array (
+					'status' => 2,
+					'msg' => 'illegal request' 
+			) );
+			die ();
+		}
+		
+		Doo::loadModel ( 'L_category' );
+		$lCategory = new L_category ();
+		Doo::loadModel ( 'staff' );
+		$staff = new staff ();
+		
+		$staffList = $staff->getStaffByCid ( $detail ['cid'] );
+		$category = $lCategory->getCategory ();
+		
+		$categoryHtml = '<option post-data="PUBLIC" value="PUBLIC" >公共待认领款项</option>';
+		$staffHtml = '<option value="PUBLIC">办事处待认领款项</option>';
+		foreach ( $category as $key => $value ) {
+			$categoryHtml .= '<option  post-data="' . $value ['cid'] . '" value="' . $value ['cid'] . ':' . $value ['title'] . '" >' . $value ['title'] . '</option>';
+			if ($value ['cid'] == $detail ['cid'])
+				$categoryHtml .= '<option selected  post-data="' . $value ['cid'] . '" value="' . $value ['cid'] . ':' . $value ['title'] . '" >' . $value ['title'] . '</option>';
+		}
+		foreach ( $staffList as $key => $value ) {
+			$staffHtml .= '<option value="' . $value ['sid'] . '-' . $value ['username'] . '">' . $value ['category'] . '-' . $value ['username'] . '</option>';
+			if ($value ['sid'] == $detail ['sid'])
+				$staffHtml .= '<option selected value="' . $value ['sid'] . '-' . $value ['username'] . '">' . $value ['category'] . '-' . $value ['username'] . '</option>';
+		}
+		
+		echo json_encode ( array (
+				'status' => 1,
+				'categoryHtml' => $categoryHtml,
+				'staffHtml' => $staffHtml ,
+				'detail'=>$detail
+		) );
+	}
 	function _GetFileEXT($filename) {
 		$pics = explode ( '.', $filename );
 		$num = count ( $pics );
@@ -2526,33 +2661,30 @@ class InvoiceController extends DooController {
 		$page ['on_page'] = $on_page;
 		$total_count = $this->get_table_count ( $table, $condition );
 		$total = intval ( $total_count / $page_size );
-	
+		
 		$page ['total_page'] = ($total_count % $page_size) == 0 ? $total : $total + 1;
 		$page ['total_data'] = $total_count;
 		$page ['next'] = $on_page == $page ['total_page'] ? $page ['total_page'] : $on_page + 1;
-	
+		
 		$i = 1;
 		$page_max = 1;
-		$page_width=3;
-	
-	
+		$page_width = 3;
+		
 		if ($on_page >= $page_width) {
 			$page_max = intval ( $on_page / $page_width ) + 1;
 			$i = intval ( $on_page / $page_width ) * $page_width - 1;
 		}
-	
+		
 		for(; $i <= $page ['total_page']; $i ++) {
 			if ($i == $on_page)
 				$page_c .= '<li class="active"><a href="javascript:void(0)">' . $i . '</a></li>';
-				else
-					$page_c .= '<li><a href="/' . $action .'/'. $i . $get . '">' . $i . '</a></li>';
-						
-	
-	
-					if ($i == ($page_width * $page_max))
-						break;
+			else
+				$page_c .= '<li><a href="/' . $action . '/' . $i . $get . '">' . $i . '</a></li>';
+			
+			if ($i == ($page_width * $page_max))
+				break;
 		}
-	
+		
 		$page ['page'] = $page_c;
 		$page ['lower'] = (-- $on_page) * $page_size;
 		return $page;
@@ -2570,16 +2702,14 @@ class InvoiceController extends DooController {
 	 * @param unknown_type $condition
 	 */
 	public function get_table_count($table = "", $condition = "") {
-		//$sql = "select count(*) as count from " . $table . " where 1 " . $condition;
-	
+		// $sql = "select count(*) as count from " . $table . " where 1 " . $condition;
 		$sql = "select count(*) as count from " . $table . " where  " . $condition;
-	
-		//echo $sql;die;
+		
+		// echo $sql;die;
 		$query = Doo::db ()->query ( $sql );
 		$result = $query->fetch ();
 		return $result ['count'];
 	}
-	
 	function isInvoiceNew($type = "GLOBAL") {
 		Doo::loadModel ( 'invoice' );
 		$invoice = new invoice ();
@@ -2592,10 +2722,10 @@ class InvoiceController extends DooController {
 		
 		// 我的发票待处理
 		$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 
-			) );
+				'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",
@@ -2649,7 +2779,7 @@ class InvoiceController extends DooController {
 			$new ['print'] = TRUE;
 		if (! empty ( $untread ))
 			$new ['untread'] = TRUE;
-		return $new ;
+		return $new;
 	}
 }
 

protected/model/invoiceROLog.php

@@ -120,7 +120,7 @@ class invoiceROLog extends DooModel {
 		elseif (! empty ( $desc ))
 			$list = $this->getOne ( array (
 					'where' => 'irid=' . $irid,
-					$desc => 'irid',
+					$desc => 'iroId',
 					'asArray' => true 
 			) );
 		return $list;

protected/model/invoiceReceivables.php

@@ -179,21 +179,46 @@ class invoiceReceivables extends DooModel {
 			$list[0]['sumPrice']=$price;
 		return $list;
 	}
-	public function getInvoiceReceivablesByIrid($irid = "") {
+	/**
+	 * 根据收款ID获取一条相关数据
+	 * @param string $irid
+	 * @param string $con 附加获取收款条件 可以为空
+	 * @return unknown[]|mixed[]|string[]
+	 */
+	public function getInvoiceReceivablesByIrid($irid = "",$con="") {
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
 		$irid = $this->authcode ( $irid );
 		$detail = array ();
 		if (! empty ( $irid ) && is_numeric ( $irid ))
 			$detail = $this->getOne ( array (
-					'where' => " irid=" . $irid,
+					'where' => " irid=" . $irid.$con,
 					'asArray' => TRUE 
 			) );
 		
+		$detail ['cid'] = '';
+		$detail ['title'] = '';
+		if ($detail ['receivablesCategory']!="PUBLIC"){
+			$category = explode ( ":", $detail ['receivablesCategory'] );
+			$detail ['cid'] = $category [0];
+			$detail ['title'] = $category [1];
+		}
+		
+		$detail ['sid'] = '';
+		$detail ['username'] = '';
+		if ($detail ['receivablesStaff']!="PUBLIC"){
+			$staff = explode ( "-", $detail ['receivablesStaff'] );
+			$detail ['sid'] = $staff [0];
+			$detail ['username'] = $staff [1];
+		}
+		
 		$detail ['iridKey'] = $XDeode->encode ( $detail ['irid'] );
 		$detail ['iridEn'] = $this->authcode ( $detail ['irid'], '' );
 		return $detail;
 	}
+	
+	
+	
 	public function getInvoiceReceivablesByIrsid($irid = "", $sid = "") {
 		Doo::loadClass ( 'XDeode' );
 		$XDeode = new XDeode ( 5 );
@@ -288,6 +313,7 @@ class invoiceReceivables extends DooModel {
 			
 			foreach ( $list as $key => $value ) {
 				$list [$key] ['iridKeyK'] = $XDeode->encode ( $value ['irid'] );
+				$list [$key] ['iridKey'] = $this->authcode ( $value ['irid'],'' );
 				if (isset($value ['iid'])&&!empty($value ['iid'])){
 					
 					$list [$key] ['iidKeyK'] = $XDeode->encode ( $value ['iid'] );

protected/view/admin/invoiceReceivablesAS.html

@@ -1,4 +1,8 @@
 <!-- include 'header' -->
+<link rel=stylesheet href="<?= WEB_SITE_GLOBAL ?>css/jquery.validator.css">
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/jquery.validator.min.js"></script>
+<script type="text/javascript" src="<?= WEB_SITE_GLOBAL ?>js/zh-CN.js"></script>
+<script src="<?= WEB_SITE_GLOBAL ?>js/invoice.validator.js"></script>
 <script src="<?= WEB_SITE_GLOBAL ?>js/invoice.js"></script>
 <body>
 	<div class="mainLayout">
@@ -67,52 +71,25 @@
 						<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>
+						<!-- if {{list' value.receivablesStaff}}!='PUBLIC' -->
+						{{list' value.irolg.operation}}<br/>{{list' value.confirmTime}}
+						<!-- endif -->
+						</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>
+						<td>
+						<!-- if {{list' value.receivablesStaff}}=='PUBLIC' -->
+							<a href="#billeidt" data-isKey="{{list' value.iridKey}}" node-irUpdate  data-toggle="modal">修改</a> <a  href="#billdel" data-toggle="modal">删除</a>
+						<!-- elseif {{list' value.receivablesStaff}}!='PUBLIC'&&{{list' value.iid}}==0  -->
+							<a href="#receive" data-isKey="{{list' value.iridKey}}" node-alter data-toggle="modal">变更</a>
+						<!-- endif -->
+						</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>
 		  						<!--翻页-->
@@ -161,36 +138,46 @@
 
 	<!--弹出变更-->
 <div class="modal hide fade" id="receive">
+<form action="/invoiceReceivablesUpdateClaim" method="post" class="form-horizontal">
 	<div class="modal-dialog">
 		<div class="modal-content">
     <div class="modal-header">
     <h3>变更认领人</h3>
     </div>
     <div class="modal-body">
-    	<form class="form-horizontal">
+    	
+    		<input type="hidden" name="claimKey" value >
+    		<div loading-msg='categoryStaff'></div>
 			<div class="control-group">
 				<label class="control-label"><span class="colRed">*</span>办事处</label>
 				<div class="controls">
-					<select><option>公共待认领收款</option><option>广西办</option></select>
+					<select name="receivablesCategory" html-category>
+					
+					</select>
 				</div>
 			</div>
 			<div class="control-group">
 				<label class="control-label"></label>
 				<div class="controls">
-					<select><option>办事处待认领收款</option><option>姜栋</option></select>
+					<select name="receivablesStaff" html-staff>
+					
+					</select>
 				</div>
 			</div>
-		</form>
+		
     </div>
 	<div class="modal-footer">
-	    <a href="#" class="button">确定</a>
+		<input type="submit" class="button" value="确定">
 	    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 	</div>
 			</div></div>
+			</form>
 </div>
     <!--弹出变更-->
 	<!--弹出修改-->
 <div class="modal hide fade" id="billeidt">
+<form action="/invoicesDo" method="post" name="receivablesInvoice">
+<input type="hidden" name="claimuKey" value >
 	<div class="modal-dialog">
 		<div class="modal-content">
     <div class="modal-header">
@@ -198,46 +185,50 @@
     </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>
+						<tbody>
+						<tr>
+							<th class="taC" colspan="4">收款信息填写</th>
+						</tr>
+						<tr>
+							<th class="taC">收款金额</th>
+							<td>
+							<input value="" name="receivablesPrice" placeholder="输入收款金额" pattern="[0-9]" min="0" step="0.01" type="number">
+							</td>
+						</tr>
+						<tr>
+							<th class="taC" >收款信息</th>
+							<td>
+							<input name="receivablesMessage" type="text">
+							</td>
+						</tr>
+						<tr>
+							<th class="taC">收款银行</th><td>
+							<select name="receivablesBank">
+								<option>广发银行珠海分行柠溪支行</option>
+							</select></td>
+						</tr>
+						<tr>
+							<th class="taC">银行到帐时间</th>
+							<td><input name="receivablesDate" type="date"></td>
+						</tr>
+						<tr>
+							<th class="taC">认领收款</th><td colspan="3">
+							<select name="receivablesCategory" html-rcategory>
+								
+							</select>
 
-						<select>
-							<option>办事处待认领款项</option>
-							<option>广东办-刘飞</option>
-						</select></td>
-					</tr>
-					</tbody></table>
+							<select name="receivablesStaff" html-rstaff>
+							
+							</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>
+			</form>
 </div>
     <!--弹出修改-->   
 	<!--弹出删除-->
@@ -257,56 +248,7 @@
 			</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/invoiceUntread.html

@@ -50,7 +50,7 @@
                                     <td>{{invoiceList' value.categoryName}}{{invoiceList' value.userName}} {{invoiceList' value.date}}</td>
                                     <td>{{invoiceList' value.untreadCompany}}:
                                     <a href="#shipping" title="{{invoiceList' value.untreadItems}}" node-express="untread" data-toggle="modal">{{invoiceList' value.untreadNumber}}</a> 
-                                    <a target="_blank" href="http://www.kuaidi100.com/chaxun?com={{invoiceList' value.untreadCom}}&nu={{invoiceList' value.untreadNumber}}">点击查询快递信息</a> </td>
+                                    <a target="_blank" href="http://www.kuaidi100.com/chaxun?com={{invoiceList' value.untreadCom}}&nu={{invoiceList' value.untreadNumber}}">查询快递</a> </td>
                                     <td><a class="button btn-block" diss-data="{{pendingInvoice' value.iidKey}}" node-invoice="untreadInvoice"  href="#return" data-toggle="modal">确认退票</a></td>
                                 </tr>
                                 <!-- endloop -->
@@ -88,7 +88,7 @@
                                     <td>{{invoiceList' value.categoryName}}{{invoiceList' value.userName}} {{invoiceList' value.date}}</td>
                                     <td>{{invoiceList' value.untreadCompany}}:
                                     <a href="#shipping" title="{{invoiceList' value.untreadItems}}" node-express="untread" data-toggle="modal">{{invoiceList' value.untreadNumber}}</a> 
-                                    <a target="_blank" href="http://www.kuaidi100.com/chaxun?com={{invoiceList' value.untreadCom}}&nu={{invoiceList' value.untreadNumber}}">点击查询快递信息</a> </td>
+                                    <a target="_blank" href="http://www.kuaidi100.com/chaxun?com={{invoiceList' value.untreadCom}}&nu={{invoiceList' value.untreadNumber}}">查询快递</a> </td>
                                     <td>
                                     {{establishedInvoice' value.OperationLog.username}} {{establishedInvoice' value.OperationLog.date}}
                                     </td>