更新收款功能

global/css/global.css

@@ -1136,12 +1136,6 @@ border-color: #d6e9c6;
   left:1px;
   top:1px;
 }
-.centerRecord .mostList li.select{
-  padding:0
-}
-.centerRecord .mostList li.select select{
-  margin:10px 0 0 20px
-}
 .infoCenter .dateList {
   overflow: hidden;
   overflow-y:auto;
@@ -1929,7 +1923,7 @@ a.new-ribbon:before{
   min-height:400px
 }
 .saeaList .seTable{
-  margin:0 0 0 25.1%;
+  margin:0 25% 0 0;
 }
 .saeaList .seTable .sFile{
   margin: 0 5px 5px 0;
@@ -2039,7 +2033,7 @@ table .taC{
 }
 .saeaList .seCensor {
   position: absolute;
-  right:left;
+  right:0;
   top:0;
   width:25%;
   height:100%;
@@ -2275,7 +2269,9 @@ table .taC{
 }
 .seCensor .reportButton {
   width:100%;
-  margin:2px 0;
+  position: absolute;
+  bottom: 0;
+  right:0;
 }
 .seCensor .reportButton button{
   border:none;
@@ -2290,8 +2286,6 @@ table .taC{
 }
 .reportButton a.buttonDone,.reportButton button.buttonDone{
   background:#7ea85c;
-  font-size: 16px;
-  margin-bottom: 2px
 }
 .reportButton a.buttonDone:hover,.reportButton button.buttonDone:hover{
   background:#4f8e08
@@ -2301,7 +2295,6 @@ table .taC{
 }
 .reportButton a.buttonUndone{
   background:#ce5e5e;
-  padding: 3px 0
 }
 .reportButton a.buttonUndone:hover{
   background:#c01010;
@@ -2311,7 +2304,6 @@ table .taC{
 }
 .reportButton a.buttonBack{
   background:#ffa132;
-  padding: 3px 0
 }
 .reportButton a.buttonBack:hover{
   background:#ff8a00;

global/js/invoice.js

@@ -177,6 +177,7 @@ $(function() {
 		$("input[name='key']").val(postData);
 		$("input[name='invoiceKey']").val("");
 		$("p[node-msg='true']").hide();
+		$("p[node-loading='true']").hide();
 		$('tbody[data-invoice="myReceivables"]').html("");
 		
 		var url = "/ajaxGetReceivalblesByStaff";

protected/config/routes.conf.php

@@ -376,6 +376,9 @@ $route['get']['/invoiceMyReceivables'] = array('InvoiceController', 'invoiceMyRe
 $route['post']['/invoiceBindReceivables'] = array('InvoiceController', 'invoiceBindReceivables');
 $route['post']['/invoiceEnterReceivables'] = array('InvoiceController', 'invoiceEnterReceivables');
 
+$route['get']['/invoiceAggregate'] = array('InvoiceController', 'invoiceAggregate');
+
+
 $route['post']['/ajaxGetInvoicePostDetail'] = array('InvoiceController', 'ajaxGetInvoicePostDetail');
 $route['post']['/ajaxGetStaffByCategory'] = array('InvoiceController', 'ajaxGetStaffByCategory');
 $route['post']['/ajaxGetInvoiceReceivables'] = array('InvoiceController', 'ajaxGetInvoiceReceivables');
@@ -383,6 +386,7 @@ $route['post']['/ajaxGetInvoiceByStaff'] = array('InvoiceController', 'ajaxGetIn
 $route['post']['/ajaxCompareClaimPrice'] = array('InvoiceController', 'ajaxCompareClaimPrice');
 $route['post']['/ajaxCompareInvoicePrice'] = array('InvoiceController', 'ajaxCompareInvoicePrice');
 $route['post']['/ajaxGetReceivalblesByStaff'] = array('InvoiceController', 'ajaxGetReceivalblesByStaff');
+$route['post']['/ajaxReceivablesRemove'] = array('InvoiceController', 'ajaxReceivablesRemove');
 
 
 //假期管理

protected/model/invoiceROLog.php

@@ -0,0 +1,165 @@
+<?php
+Doo::loadCore ( 'db/DooModel' );
+
+/**
+ * 开票操作日志 业务逻辑
+ *
+ * @author CP.
+ * @version 1.0
+ * @namespace invoice
+ * @package invoiceModel
+ */
+class invoiceROLog extends DooModel {
+	
+	/**
+	 *
+	 * @var integer $lid 操作日志ID
+	 */
+	public $iroId;
+	/**
+	 *
+	 * @var string $username 操作员相关：名称
+	 */
+	public $username;
+	/**
+	 *
+	 * @var string $category 办事处
+	 */
+	public $category;
+	/**
+	 *
+	 * @var string $img 操作员相关：头像
+	 */
+	public $img;
+	/**
+	 *
+	 * @var integer $uid 用户ID
+	 */
+	public $uid;
+	/**
+	 * 操作时间
+	 * @var datetime
+	 */
+	public $date;
+	/**
+	 * 操作动作
+	 * @var string
+	 */
+	public $operation;
+	
+	/**
+	 * 开票ID
+	 * @var integer
+	 */
+	public $irid;
+	/**
+	 * 发票操作时的状态
+	 * @var integer
+	 */
+	public $status;
+	/**
+	 * 表名
+	 * @var string
+	 */
+	public $_table = 'CLD_invoiceROLog';
+	/**
+	 * 表主键
+	 * @var string
+	 */
+	public $_primarykey = 'iroId';
+	/**
+	 * 表字段
+	 * @var array
+	 */
+	public $_fields = array (
+			'iroId',
+			'username',
+			'uid',
+			'category',
+			'date',
+			'operation',
+			'img',
+			'irid',
+			'status' 
+	);
+	public function __construct() {
+		parent::setupModel ( __CLASS__ );
+	}
+	
+	/**
+	 * 添加相关收款操作日志
+	 *
+	 * @param array $item 要记录的相关收款操作数据
+	 * @return integer|0 返回操作ID
+	 */
+	public function setInvoiceROLog($item = array()) {
+		$lid = 0;
+		if (is_array ( $item ) && ! empty ( $item )) {
+			foreach ( $item as $key => $value ) {
+				$this->$key = $value;
+			}
+			$iroId = $this->insert ();
+		}
+		return $iroId;
+	}
+	
+	/**
+	 * 根据发票ID获取操作日志数据
+	 *
+	 * @param integer $iid 发票ID
+	 * @param integer $desc 获得一条操作日志最新或者最旧
+	 * @return array|array() 发票审批操作日志数据集
+	 */
+	public function getInvoiceROLogByIrid($irid = 0, $desc = '') {
+		$list = array ();
+		if (! empty ( $iid ) && is_numeric ( $irid ) && empty ( $desc ))
+			$list = $this->find ( array (
+					'where' => ' irid=' . $irid,
+					'asArray' => true 
+			) );
+		elseif (! empty ( $desc ))
+			$list = $this->getOne ( array (
+					'where' => 'irid=' . $irid,
+					$desc => 'irid',
+					'asArray' => true 
+			) );
+		return $list;
+	}
+	
+	
+	
+	
+	/**
+	 * 获得一条最新的退回操作记录
+	 * @param number $iid
+	 * @param string $desc
+	 * @return unknown
+	 */
+	public function getInvoiceOperationByDropped($iid = 0,$desc = 'desc') {
+		$list = $this->getOne ( array (
+				'where' => ' iid=' . $iid.' and status=3',
+				$desc => 'lid',
+				'asArray' => true 
+		) );
+		return $list;
+	}
+	
+	/**
+	 * 根据状态和发票ID获得一条最新的操作日志
+	 * @param number $iid
+	 * @param number $status
+	 * @param string $desc
+	 * @return unknown
+	 */
+	public function getInvoiceOperationByStatus($iid = 0,$status = 0,$desc = 'desc') {
+		$list = $this->getOne ( array (
+				'where' => 'iid=' . $iid.' and status='.$status,
+				$desc => 'lid',
+				'asArray' => true
+		) );
+		return $list;
+	}
+	
+}
+
+?>

protected/model/invoiceReceivables.php

@@ -24,7 +24,6 @@ class invoiceReceivables extends DooModel {
 	public $date;
 	public $confirmTime;
 	public $bindDate;
-	
 	public $_table = 'CLD_invoiceReceivables';
 	public $_primarykey = 'irid';
 	public $_fields = array (
@@ -42,34 +41,51 @@ class invoiceReceivables extends DooModel {
 			'source',
 			'date',
 			'confirmTime',
-			'bindDate'
+			'bindDate' 
 	);
-
-	public function getInvoiceReceivablesByClaim($cid=0,$sid=0){
-		if (empty($sid)){
-			$list['csClaim'] = $this->find ( array (
+	/**
+	 * 获取最新几条收款包括最新的一条操作日志
+	 * @param number $limit
+	 * @return unknown
+	 */
+	public function getInvoiceReceivablesByNew($limit = 4) {
+		$list  = $this->find ( array (
+				'desc' => 'irid',
+				'limit'=>$limit,
+				'asArray' => TRUE
+		) );
+		Doo::loadModel ( 'invoiceROLog' );
+		$invoiceROLog = new invoiceROLog ();
+		foreach ($list as $key=>$value){
+			$list[$key]['invoiceROLog']=$invoiceROLog->getInvoiceROLogByIrid($value['irid'],'desc');
+		}
+		return $list;
+	}
+	public function getInvoiceReceivablesByClaim($cid = 0, $sid = 0) {
+		if (empty ( $sid )) {
+			$list ['csClaim'] = $this->find ( array (
 					'where' => "receivablesCategory='public' and receivablesStaff='public'  and bindStatus=0",
 					'desc' => 'irid',
-					'asArray' => TRUE
+					'asArray' => TRUE 
 			) );
 			foreach ( $list ['csClaim'] as $key => $value ) {
 				$list ['csClaim'] [$key] ['iidKey'] = $this->authcode ( $value ['irid'], '' );
-				//$list ['csClaim'] [$key] ['iidKeyUrl'] = $XDeode->encode ( $value ['iid'] );
+				// $list ['csClaim'] [$key] ['iidKeyUrl'] = $XDeode->encode ( $value ['iid'] );
 			}
 			
-			$list['sClaim'] = $this->find ( array (
-					'where' => "receivablesCategory!='public' and receivablesStaff='public' and receivablesCategory like '".$cid.":%' and bindStatus=0",
+			$list ['sClaim'] = $this->find ( array (
+					'where' => "receivablesCategory!='public' and receivablesStaff='public' and receivablesCategory like '" . $cid . ":%' and bindStatus=0",
 					'desc' => 'irid',
-					'asArray' => TRUE
+					'asArray' => TRUE 
 			) );
 			foreach ( $list ['sClaim'] as $key => $value ) {
 				$list ['sClaim'] [$key] ['iidKey'] = $this->authcode ( $value ['irid'], '' );
 			}
 			
-			$list['arClaim'] = $this->find ( array (
-					'where' => "receivablesCategory!='public' and receivablesStaff!='public' and receivablesCategory like '".$cid.":%' and bindStatus=0",
+			$list ['arClaim'] = $this->find ( array (
+					'where' => "receivablesCategory!='public' and receivablesStaff!='public' and receivablesCategory like '" . $cid . ":%' and bindStatus=0",
 					'desc' => 'irid',
-					'asArray' => TRUE
+					'asArray' => TRUE 
 			) );
 			foreach ( $list ['arClaim'] as $key => $value ) {
 				$staff = explode ( "-", $value ['receivablesStaff'] );
@@ -77,12 +93,12 @@ class invoiceReceivables extends DooModel {
 				$list ['arClaim'] [$key] ['username'] = $staff [1];
 			}
 		}
-		if (!empty($cid)&&!empty($sid)){
+		if (! empty ( $cid ) && ! empty ( $sid )) {
 			
-			$list['myClaim'] = $this->find ( array (
-					'where' => " receivablesStaff like '".$sid."-%' and receivablesCategory like '".$cid.":%' and bindStatus=0",
+			$list ['myClaim'] = $this->find ( array (
+					'where' => " receivablesStaff like '" . $sid . "-%' and receivablesCategory like '" . $cid . ":%' and bindStatus=0",
 					'desc' => 'irid',
-					'asArray' => TRUE
+					'asArray' => TRUE 
 			) );
 			foreach ( $list ['myClaim'] as $key => $value ) {
 				$list ['myClaim'] [$key] ['iidKey'] = $this->authcode ( $value ['irid'], '' );
@@ -91,16 +107,16 @@ class invoiceReceivables extends DooModel {
 				$list ['myClaim'] [$key] ['username'] = $staff [1];
 			}
 			
-			$list['bindClaim'] = $this->find ( array (
+			$list ['bindClaim'] = $this->find ( array (
 					'where' => " bindStatus=1 ",
 					'desc' => 'irid',
-					'limit'=>3,
-					'asArray' => TRUE
+					'limit' => 3,
+					'asArray' => TRUE 
 			) );
 			Doo::loadModel ( 'invoice' );
 			$invoice = new invoice ();
 			foreach ( $list ['bindClaim'] as $key => $value ) {
-				$list ['bindClaim'] [$key] ['invoice']=$invoice->getInvoiceByIid($value['iid'],'iid,invoicePrice,invoiceSerial');
+				$list ['bindClaim'] [$key] ['invoice'] = $invoice->getInvoiceByIid ( $value ['iid'] );
 			}
 		}
 		
@@ -113,18 +129,20 @@ class invoiceReceivables extends DooModel {
 	 * @param string $bindStatus
 	 * @return mixed
 	 */
-	public function getInvoiceReceivablesByIid($iid="",$bindStatus="All"){
-		$iid=$this->authcode ($iid );
-		$list=array();
-		if (!empty($iid)&&is_numeric($iid)){
-			$sql='';
-			if ($bindStatus==1)
-				$sql=" and bindStatus=1";
-			elseif ($bindStatus==0)
-				$sql=" and bindStatus=0";
+	public function getInvoiceReceivablesByIid($iid = "", $bindStatus = "All") {
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		$iid = $this->authcode ( $iid );
+		$list = array ();
+		if (! empty ( $iid ) && is_numeric ( $iid )) {
+			$sql = '';
+			if ($bindStatus == 1)
+				$sql = " and bindStatus=1";
+			elseif ($bindStatus == 0)
+				$sql = " and bindStatus=0";
 			$list = $this->find ( array (
-					'where' => " iid=" . $iid.$sql,
-					'asArray' => TRUE
+					'where' => " iid=" . $iid . $sql,
+					'asArray' => TRUE 
 			) );
 		}
 		foreach ( $list as $key => $value ) {
@@ -132,29 +150,32 @@ class invoiceReceivables extends DooModel {
 			$staff = explode ( "-", $value ['receivablesStaff'] );
 			$list [$key] ['sid'] = $staff [0];
 			$list [$key] ['username'] = $staff [1];
+			$list [$key] ['iridKey'] = $XDeode->encode ( $value ['irid'] );
 		}
 		return $list;
 	}
-	
-	public function getInvoiceReceivablesInIridString($iridString=""){
-		$list=array();
-		if (!empty($iridString))
-		$list = $this->find ( array (
-				'where' => " irid in(" . $iridString.")",
-				'asArray' => TRUE
-		) );
+	public function getInvoiceReceivablesInIridString($iridString = "") {
+		$list = array ();
+		if (! empty ( $iridString ))
+			$list = $this->find ( array (
+					'where' => " irid in(" . $iridString . ")",
+					'asArray' => TRUE 
+			) );
 		return $list;
 	}
-	
-	public function getInvoiceReceivablesByIrid($irid=""){
-		$irid=$this->authcode ($irid );
-		$detail=array();
-		if (!empty($irid)&&is_numeric($irid))
+	public function getInvoiceReceivablesByIrid($irid = "") {
+		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,
-				'asArray' => TRUE
-		) );
+					'where' => " irid=" . $irid,
+					'asArray' => TRUE 
+			) );
 		
+		$detail ['iridKey'] = $XDeode->encode ( $detail ['irid'] );
+		$detail ['iridEn'] = $this->authcode ( $detail ['irid'], '' );
 		return $detail;
 	}
 	
@@ -189,7 +210,7 @@ class invoiceReceivables extends DooModel {
 		}
 		return $lid;
 	}
-
+	
 	/**
 	 * 加密或解密指定字符串
 	 *
@@ -208,28 +229,28 @@ class invoiceReceivables extends DooModel {
 		$keya = md5 ( substr ( $key, 0, 16 ) );
 		$keyb = md5 ( substr ( $key, 16, 16 ) );
 		$keyc = $ckey_length ? ($operation == 'DECODE' ? substr ( $string, 0, $ckey_length ) : substr ( md5 ( microtime () ), - $ckey_length )) : '';
-	
+		
 		$cryptkey = $keya . md5 ( $keya . $keyc );
 		$key_length = strlen ( $cryptkey );
-	
+		
 		$string = $operation == 'DECODE' ? base64_decode ( substr ( $string, $ckey_length ) ) : sprintf ( '%010d', $expiry ? $expiry + time () : 0 ) . substr ( md5 ( $string . $keyb ), 0, 16 ) . $string;
 		$string_length = strlen ( $string );
-	
+		
 		$result = '';
 		$box = range ( 0, 255 );
-	
+		
 		$rndkey = array ();
 		for($i = 0; $i <= 255; $i ++) {
 			$rndkey [$i] = ord ( $cryptkey [$i % $key_length] );
 		}
-	
+		
 		for($j = $i = 0; $i < 256; $i ++) {
 			$j = ($j + $box [$i] + $rndkey [$i]) % 256;
 			$tmp = $box [$i];
 			$box [$i] = $box [$j];
 			$box [$j] = $tmp;
 		}
-	
+		
 		for($a = $j = $i = 0; $i < $string_length; $i ++) {
 			$a = ($a + 1) % 256;
 			$j = ($j + $box [$a]) % 256;
@@ -238,7 +259,7 @@ class invoiceReceivables extends DooModel {
 			$box [$j] = $tmp;
 			$result .= chr ( ord ( $string [$i] ) ^ ($box [($box [$a] + $box [$j]) % 256]) );
 		}
-	
+		
 		if ($operation == 'DECODE') {
 			if ((substr ( $result, 0, 10 ) == 0 || substr ( $result, 0, 10 ) - time () > 0) && substr ( $result, 10, 16 ) == substr ( md5 ( substr ( $result, 26 ) . $keyb ), 0, 16 )) {
 				return substr ( $result, 26 );
@@ -249,7 +270,6 @@ class invoiceReceivables extends DooModel {
 			return $keyc . str_replace ( '=', '', base64_encode ( $result ) );
 		}
 	}
-	
 }
 
 ?>

protected/view/admin/invoice.html

@@ -149,37 +149,41 @@
 								<!-- endif -->
 							</div>
 							<div class="clearfix">
-								<legend><div class="fR"><a href="invoice-pall.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>
-									<tr>
-										<td>珠海XXXX公司</td>
-										<td><b>￥3000.00</b></td>
-										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
-										<td><b>￥3000.00</b></td>
-										<td><a href="#billing" data-toggle="modal">#SK20160316001</a></td>
-										<td>张少珊 2016-03-03 11:30:03</td>
-									</tr>
-									<tr>
-										<td>珠海XXXX公司</td>
-										<td><b>￥3000.00</b><sup>专</sup></td>
-										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
-										<td><b>￥3000.00</b></td>
-										<td><a href="#billing" data-toggle="modal">#SK20160316001</a></td>
-										<td>张少珊 2016-03-03 11:30:03</td>
-									</tr>
-									<tr>
-										<td>珠海XXXX公司</td>
-										<td><b>￥3000.00</b></td>
-										<td><a href="#invdetail" data-toggle="modal">#F20160316001</a></td>
-										<td><b>￥3000.00</b></td>
-										<td><a href="#billing" data-toggle="modal">#SK20160316001</a></td>
-										<td>张少珊 2016-03-03 11:30:03</td>
+							
+							
+							<!-- if !empty({{receivablesList.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>
+								<!-- loop receivablesList.bindClaim -->
+								<tr>
+										<td>
+										<!-- if !empty({{receivablesList' value.invoice.invoiceType}}) -->
+	                                   	{{receivablesList' value.invoice.invoiceCompany}}
+	                                    <!-- else -->
+	                                    {{receivablesList' value.invoice.invoiceTitle}}
+	                                    <!-- endif --></td>
+										<td>
+										<!-- if !empty({{pendingInvoice' value.invoiceType}}) -->
+	                                    <b>￥{{receivablesList' value.invoice.invoicePrice}}</b><sup>专</sup>
+	                                    <!-- else -->
+	                                    <b>￥{{receivablesList' value.invoice.invoicePrice}}</b>
+	                                    <!-- endif -->
+										</td>
+										<td><a href="#invdetail" data-toggle="modal">{{receivablesList' value.invoice.invoiceSerial}}</a></td>
+										<td><b>￥{{receivablesList' value.receivablesPrice}}</b></td>
+										<td><a href="#billing" data-toggle="modal">{{receivablesList' value.receivablesSerial}}</a></td>
+										<td>{{receivablesList' value.invoice.userName}} {{receivablesList' value.invoice.updateTime}}</td>
 									</tr>
-									</tbody>
-								</table>
-								<blockquote><p class="colGray">暂时没有入账完成的发票 </p></blockquote>
+								<!-- endloop -->
+								
+								</tbody>
+							</table>
+							<!-- else -->
+							<blockquote><p class="colGray">暂时没有入账完成的收款</p></blockquote>
+							<!-- endif -->
+							
 							</div>
 						</div>
 					</div>

protected/view/admin/invoiceMenu.html

@@ -32,5 +32,5 @@
 <!-- if isInvoiceMoldShow({{staff.0.sid}},'发票退票') -->
 	<li><a <!-- if {{receiptMemu}}=="invoiceUntread" --> class="selected" <!-- endif --> href="/invoiceUntread">发票退票</a></li>
 <!-- endif -->	
-	<li><a href="invoice-dlist-category-year.html">公司汇总</a></li>
+	<li><a <!-- if {{receiptMemu}}=="invoiceAggregate" --> class="selected" <!-- endif --> href="/invoiceAggregate">公司汇总</a></li>
 </ul>

protected/view/admin/invoiceReceivables.html

@@ -28,41 +28,26 @@
 				<div class="borad-news">
 					<div class="saeaList">
 						<div class="clearfix">
+							<!-- if !empty({{receivablesList}}) -->
 							<legend><div class="fR"><a href="invoice-input-billing-all.html">查看更多</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>
+								<!-- loop receivablesList -->
 								<tr>
-									<td><b>￥3000.00</b></td>
-									<td>张宇</td>
-									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
-									<td>张少珊 2016-03-03</td>
-									<td>陈特 认领 2016-03-03</td>
-								</tr>
-								<tr>
-									<td><b>￥3000.00</b></td>
-									<td>张宇</td>
-									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
-									<td>张少珊 2016-03-03</td>
-									<td>张少珊 转入 公共待认领款项 2016-03-03</td>
-								</tr>
-								<tr>
-									<td><b>￥3000.00</b></td>
-									<td>张宇</td>
-									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
-									<td>张少珊 2016-03-03</td>
-									<td>张少珊 转入 办事处待认领款项 2016-03-03</td>
-								</tr>
-								<tr>
-									<td><b>￥3000.00</b></td>
-									<td>张宇</td>
-									<td>广发银行珠海分行柠溪支行 2016-03-03</td>
-									<td>张少珊 2016-03-03</td>
-									<td>张少珊 转入 刘飞 2016-03-03</td>
+									<td><b>￥{{receivablesList' value.receivablesPrice}}</b></td>
+									<td>{{receivablesList' value.receivablesMessage}}</td>
+									<td>{{receivablesList' value.receivablesBank}} {{receivablesList' value.receivablesDate}}</td>
+									<td>{{receivablesList' value.inputStaff}} {{receivablesList' value.date}}</td>
+									<td>{{receivablesList' value.invoiceROLog.operation}} {{receivablesList' value.invoiceROLog.date}}</td>
 								</tr>
+								<!-- endloop -->
+								
 								</tbody>
 							</table>
+							<!-- else -->
 							<blockquote><p class="colGray">暂时没有已认领的收款</p></blockquote>
+							<!-- endif -->
 						</div>
 					</div>
 				</div>