收款编辑单位信息

global/js/invoice.js

@@ -84,6 +84,11 @@ function submitForm(){
 $(function() {
 	
 	
+	
+	
+	
+	
+	
 	$('select[node-itSChange]').change(function() {
 		 var itsStatus=$(this).val();
 		
@@ -144,6 +149,11 @@ $(function() {
 		 $('#ira').submit();
 	});
 	
+	$('a[node-rtm]').click(function() {
+		$("#iridKey").val($(this).attr("data-key"));
+		$("#recepitTitleMark").val($(this).attr("data-title"));
+	});
+	
 	$('a[node-express="untread"]').click(function() {
 		$('td[node-express="msg"]').html($(this).attr('title'));
 	});

protected/config/acl.conf.php

@@ -57,7 +57,7 @@ $acl ['ordinary'] ['allow'] = array (
 				'invoiceStoreBatchApproval',
 				'ajaxGetMailItemByIstore',
 				'invoiceExpress',
-				
+				'invoiceReceivablesTitleMarkSet',
 				
 				
 				//办事处汇总查询权限--现加入普通权限中->另外在做权限判定

protected/config/routes.conf.php

@@ -1,7 +1,5 @@
 <?php
 
-
-
 $route['*']['/emailtext'] = array('ErrorController', 'emailtext');
 
 $route['*']['/statistics'] = array('MainController', 'keyStatistics');
@@ -384,6 +382,7 @@ $route['get']['/invoiceMyReceivables'] = array('InvoiceController', 'invoiceMyRe
 
 $route['get']['/invoiceReceivablesClaim'] = array('InvoiceController', 'invoiceReceivablesClaim');
 
+$route['post']['/invoiceReceivablesTitleMarkSet'] = array('InvoiceController', 'invoiceReceivablesTitleMarkSet');
 
 $route['post']['/invoiceReceivablesAscription'] = array('InvoiceController', 'invoiceReceivablesAscription');
 $route['post']['/invoiceBindReceivables'] = array('InvoiceController', 'invoiceBindReceivables');

protected/controller/InvoiceController.php

@@ -3087,6 +3087,30 @@ class InvoiceController extends DooController {
 		$this->render ( "/admin/invoiceReceivablesClaim", $this->data );
 	}
 	
+	function invoiceReceivablesTitleMarkSet(){
+		$iridKey = $this->get_args ( 'iridKey' ) ? $this->get_args ( 'iridKey' ) : "";
+		$recepitTitleMark = $this->get_args ( 'recepitTitleMark' ) ? $this->get_args ( 'recepitTitleMark' ) : "";
+		
+		if(empty($iridKey)||empty($recepitTitleMark))
+			die ( 'illegal request' );
+		
+		Doo::loadModel ( 'invoiceReceivables' );
+		$invoiceReceivables = new invoiceReceivables ();
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		
+		$irid=$XDeode->decode($iridKey);
+		
+		if (!is_numeric($irid))
+			die ( 'illegal request' );
+		
+		$invoiceReceivables->recepitTitleMark=$recepitTitleMark;
+		$invoiceReceivables->update ( array (
+						'where' => 'irid = ' . $irid
+				) );
+		return '/invoiceReceivablesClaim';
+	}
+	
 	/**
 	 * 更新收款相关数据
 	 */
@@ -3939,7 +3963,7 @@ class InvoiceController extends DooController {
 		$sid = $XDeode->decode ( $_COOKIE ["staff"] );
 		$MebSea = isset ( $this->params ['MebSea'] ) ? urldecode ( $this->params ['MebSea'] ) : '';
 		
-		$page_size = 1;
+		$page_size = 12;
 		$page = isset ( $this->params ['page'] ) && is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
 		$date = isset ( $this->params ['date'] ) ? $this->params ['date'] : 'MONTHO';
 		

protected/model/invoiceReceivables.php

@@ -160,6 +160,10 @@ class invoiceReceivables extends DooModel {
 		return $list;
 	}
 	public function getInvoiceReceivablesByClaim($cid = 0, $sid = 0) {
+		
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		
 		if (! empty ( $cid )) {
 			$list ['csClaim'] = $this->find ( array (
 					'where' => "receivablesCategory='public' and receivablesStaff='public'  and bindStatus=0",
@@ -192,6 +196,7 @@ class invoiceReceivables extends DooModel {
 				$staff = explode ( "-", $value ['receivablesStaff'] );
 				$list ['arClaim'] [$key] ['sid'] = $staff [0];
 				$list ['arClaim'] [$key] ['username'] = $staff [1];
+				$list ['arClaim'] [$key]['iridKey']=$XDeode->encode ( $value ['irid'] );
 			}
 			
 			$list ['myClaim'] = $this->find ( array (

protected/view/admin/invoiceApproval.html

@@ -26,7 +26,7 @@
                     <div class="saeaList">
                         <div class="clearfix">
                         	
-                            <legend><div class="fR"></div>待审批开票</legend>
+                            <legend><div class="fR"><a href="/invoiceApprovalAchieve">查看更多</a></div>待审批开票</legend>
                             <!-- if !empty({{invoiceList}}) -->
                             <table class="table table-bordered table-condensed">
                                 <tbody>

protected/view/admin/invoiceReceivablesClaim.html

@@ -77,7 +77,9 @@
 <!-- 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>
+								<tr><th class="taC" width="70">收款金额</th><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>
 								<!-- loop receivablesList.arClaim -->
 								<tr>
 									<td><b>￥{{csClaim' value.receivablesPrice}}</b></td>
@@ -85,6 +87,8 @@
 									<td>{{csClaim' value.receivablesBank}} {{csClaim' value.receivablesDate}}</td>
 									<td>{{csClaim' value.inputStaff}} {{csClaim' value.date}}</td>
 									<td>{{csClaim' value.username}} {{csClaim' value.confirmTime}}</td>
+									<td>{{csClaim' value.recepitTitleMark}}</td>
+									<td><a data-toggle="modal" node-rtm data-key="{{csClaim' value.iridKey}}" data-title="{{csClaim' value.recepitTitleMark}}" href="#company-edit">编辑</a></td>
 								</tr>
 								<!-- endloop -->
 								
@@ -100,6 +104,34 @@
 		</div>
 	</div>
 
+
+<div class="modal hide fade" id="company-edit">
+<form action="/invoiceReceivablesTitleMarkSet" name="receivablesAscription" method="post" >
+<input type="hidden" id="iridKey" name="iridKey" value="">
+	<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">单位名称</th>
+						<td><input type="text" name="recepitTitleMark" id="recepitTitleMark" value="" aria-required="true" aria-invalid="true"></td>
+					</tr>
+					</tbody>
+				</table>
+			</div>
+	<div class="modal-footer">
+		<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="receive">
 <form action="/invoiceReceivablesAscription" name="receivablesAscription" method="post" >