首頁 探索 說明
登入
caipin
/
cld
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

报销单修改相关

caipin 7 年之前
父節點
953db12af8
當前提交
380af6f1c7
共有 35 個文件被更改，包括 820 次插入 和 310 次删除
分割檢視 顯示文件統計
  1. 二進制
      global/avatar/avatar_50_1.jpg
  2. 二進制
      global/avatar/avatar_50_2.jpg
  3. 11 15
      global/css/global.css
  4. 2 2
      global/js/global.js
  5. 13 1
      global/js/receipt.js
  6. 108 33
      protected/cache/staffCollect/staffCollect_2015_.htmls
  7. 3 3
      protected/class/invoice.func.php
  8. 5 2
      protected/class/receipt.func.php
  9. 2 1
      protected/config/acl.conf.php
  10. 1 1
      protected/config/execute/invoice.ini
  11. 1 1
      protected/config/invoice/invoice.ini
  12. 8 0
      protected/config/routes.conf.php
  13. 273 20
      protected/controller/InvoiceController.php
  14. 25 18
      protected/controller/ReceiptController.php
  15. 40 20
      protected/model/staff.php
  16. 5 5
      protected/view/admin/admin_myinfo.html
  17. 3 1
      protected/view/admin/approvalExpenses.html
  18. 24 24
      protected/view/admin/expensesCollect.html
  19. 120 0
      protected/view/admin/expensesDoc.html
  20. 12 12
      protected/view/admin/expensesEdi.html
  21. 11 8
      protected/view/admin/hisImplement.html
  22. 24 24
      protected/view/admin/implement.html
  23. 10 10
      protected/view/admin/invoiceAggregateCategoryDetail.html
  24. 0 11
      protected/view/admin/invoiceApprovalAchieve.html
  25. 13 1
      protected/view/admin/invoicePrintDetail.html
  26. 12 12
      protected/view/admin/receiptburEdi.html
  27. 11 11
      protected/view/admin/remitAdd.html
  28. 6 6
      protected/view/admin/remitApproval.html
  29. 10 10
      protected/view/admin/remitEdit.html
  30. 10 10
      protected/view/admin/saeaLoanAdd.html
  31. 10 10
      protected/view/admin/saeaLoanAddReceipt.html
  32. 10 10
      protected/view/admin/saeaLoanEdi.html
  33. 10 10
      protected/view/admin/saeaLoanEdiReceipt.html
  34. 10 10
      protected/view/admin/saea_create.html
  35. 17 8
      protected/view/admin/saea_edit.html

二進制
global/avatar/avatar_50_1.jpg
查看文件


二進制
global/avatar/avatar_50_2.jpg
查看文件


+ 11 - 15
global/css/global.css
查看文件 

@@ -3789,34 +3789,30 @@ td div.dlLev3{
 
 
 .search-dataTablestran{
 
   position: absolute ;
 
-  top:-45px;
 
+  top:-46px;
 
   left:450px;
 
 }
 
-.dataTables-labeltran{
 
+.dataTables-label{
 
   height:26px;
 
   line-height: 26px;
 
 }
 
-.dataTables-inputtran{
 
+.dataTables-input{
 
   width:250px;
 
   border:1px solid #ccc;
 
   border-radius: 4px;
 
   height:26px !important;
 
   padding:2px !important;
 
+  margin-bottom: 2px !important;
 
 }
 
 
 .search-dataTablesapproval{
 
   position: absolute ;
 
-  top:-45px;
 
+  top:-46px;
 
   left:675px;
 
 }
 
-.dataTables-labelapproval{
 
-  height:26px;
 
-  line-height: 26px;
 
-}
 
-.dataTables-inputapproval{
 
-  width:250px;
 
-  border:1px solid #ccc;
 
-  border-radius: 4px;
 
-  height:26px !important;
 
-  padding:2px !important;
 
-}
 
+
 
+.search-dataTablesinvoicepaper{
 
+  position: absolute ;
 
+  top:-46px;
 
+  left:585px;
 
+}

+ 2 - 2
global/js/global.js
查看文件 

@@ -1,7 +1,7 @@
 
 function setSearchLo(className){
 
 	$('#example_filter').addClass("search-dataTables"+className);
 
-	$('#example_filter label').addClass("dataTables-label"+className);
 
-	$('#example_filter input').addClass("dataTables-input"+className);
 
+	$('#example_filter label').addClass("dataTables-label");
 
+	$('#example_filter input').addClass("dataTables-input");
 
 }
 
 
 function autoFlashHeight(){

+ 13 - 1
global/js/receipt.js
查看文件 

@@ -118,13 +118,25 @@ function showOpinion(receiptOrder){
 
 
 $(function() {
 
 
+	$('select[node-implement]').change(function(){
 
+		//$item=$(this).attr('value');
 
+		
+//		var action = $('#up').attr("action");
 
+//		action=encodeURI(action+'/'+$item);
 
+//		$('#up').attr("action",action);
 
+		$('#up').submit();
 
+		
+		
+		
+		console.log();
 
+	});
 
+	
 	$('button[node-qmk="tm"]').click(function(){
 
 		var id=$(this).attr('data');
 
 		$('#'+id).attr('value',$('#'+id).attr('data-tm'));
 
 
 	});
 
 	
-	
 	$('a[node-ReceiptBack="true"]').click(function(){
 
 		var rid=$(this).attr("p-d");
 
 		var opinion=$('#opinion_'+rid).val();

+ 108 - 33
protected/cache/staffCollect/staffCollect_2015_.htmls
查看文件 

@@ -3,8 +3,8 @@
 
 <head>
 
 	<meta charset=utf-8> 
 	<title>CLD.System</title> 
-	<meta name=description content=电子版晴雨表，在线晴雨表，网页晴雨表> 
-	<link rel="shortcut icon" href="images/favicon.ico"> 
+	
+	<link rel="shortcut icon" href="http://cld.com/global/images/favicon.ico"> 
 	<meta name=copyright content=smartcost.com.cn> 
 	<link rel=stylesheet href="http://cld.com/global/css/global.css"> 
 	<script src="http://cld.com/global/js/jquery-1.7.1.min.js"></script> 
@@ -17,22 +17,27 @@
 
 			<div class="menuItem">
 
 				<a href="#" class="mLogo">CLD</a>
 
 				<ul>
 
-					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="/" class="icon- " >B</a></li>
 
-<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="/contacts" class="icon-">A</a></li>
 
-<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库"><a href="/keyonline" class="icon- ">C</a></li>
 
+					<li data-placement="right" data-toggle="ctooltip" data-original-title="信息中心" class="topLine"><a href="/" class="icon-  ">B</a></li>
 
+<li data-placement="right" data-toggle="ctooltip" data-original-title="通讯录"><a href="/contacts" class="icon- ">A</a></li>
 
+<li data-placement="right" data-toggle="ctooltip" data-original-title="在线锁库">
 
+<a href="/keyonline" class="icon- ">C</a></li>
 
+
 
+<li class="hide"><a href="#">E</a></li>
 
+<li class="hide"><a href="#">D</a></li> 
+
 
+<li data-placement="right" class="topLine  news  " data-toggle="ctooltip" data-original-title="费用管理" ><a href="/saeaBorad" class="icon-  selected " >U</a></li>  
+ 
+<li data-placement="right" data-toggle="ctooltip"  class="news"  data-original-title="发票申请"><a href="/invoice" class="icon- ">D</a></li>
 
+ 
+ <li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
+<a href="/eMailTask" class="icon- ">Z</a></li>
 
+<li data-placement="right" data-toggle="ctooltip" data-original-title="假期管理">
 
+ <a href="/myList" class="icon- ">X</a></li>
 
 <li data-placement="right" data-toggle="ctooltip" data-original-title="APP" class="topLine">
 
 <a href="/app" class="icon- ">Y</a></li>
 
-<li class="hide"><a href="#" class="icon-">E</a></li>
 
-<li class="hide"><a href="#" class="icon-">D</a></li>
 
-<li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">
 
-<a href="/eMailTask" class="icon- ">Z</a></li>
 
-<li data-placement="right" data-toggle="ctooltip" data-original-title="报销单"    ><a href="/myReceipt" class="icon-  selected ">U</a></li> 
-
 
-<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminlock" class="icon- ">F</a></li>
 
+<li data-placement="right" data-toggle="ctooltip" data-original-title="个人设置" ><a href="/adminmyinfo" class="icon- " >F</a></li> 
 <li data-placement="right" data-toggle="ctooltip" data-original-title="退出系统"><a href="/out" class="icon-">G</a></li>
 
-
 
-
 
-				</ul>
 
+									</ul>
 
 			</div>
 
 		</div>
 
 		<div class="warpContent">
 
@@ -40,15 +45,82 @@
 
 				<div class="menuItem">
 
 					<ul>
 
 						<ul>
 
-						<li class="saeaTitle">报销单</li>
 
-						<li><a  href="/myReceipt">我的报销单</a></li>
 
-						<li><a href="/personalCollect" >个人汇总</a></li>
 
-						<li><a href="/referReceipt" >创建报销单</a></li>
 
+<li class="saeaTitle">费用管理</li>
 
+	<li><a   href="/saeaBorad" >公布板</a></li>
 
+	<li><a  href="/expenses">我的费用</a></li>
 
+	<li><a href="/personalCollect"  >费用汇总</a></li>
 
+						
+							
+	<li  class="topLine  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
 
+						
+		<li  class="news"  ><a  href="/hisImplement">费用执行</a></li>			
+					
+	<li><a  href="/remittanceHky">费用汇款</a></li>			
 						
-								
-				<li class="topLine "><a   href="/approval">报销单审批</a></li>
 
-								<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>
 
-												</ul>					</ul>
 
+		<li><a href="/companyCategoryCollect"  class="selected"  >公司汇总</a></li>			
+				
+						
+		<li class="topLine"><a href="#welcome" data-toggle="modal">使用帮助</a></li>
 
+
 
+	</ul>
 
+						<!--弹出邮寄-->
 
+<div class="modal fade" id="welcome">
 
+	<div class="modal-dialog">
 
+		<div class="modal-content">
 
+		    <div class="modal-header">
 
+		    <h3>欢迎使用费用管理（原报销单）</h3>
 
+		    </div>
 
+		    <div class="modal-body saeaList">
 
+		    	<p style="font-size:18px">请查阅以下文档，了解新的费用管理</p>
 
+		    	<br>
 
+				<table class="table table-bordered table-condensed">
 
+					<tbody>
 
+					<tr>
 
+						<th class="taC colRed" width="100">费用管理简介<br>（必读）</th>
 
+						<td class="taC">
 
+						<a target="_Blank" href="http://cld.com/global/handbook/CLD费用管理简介.pdf">在线查阅《CLD费用管理简介》</a>
 
+						
+						</td>
 
+						<td class="taC"><a href="http://cld.com/global/handbook/CLD费用管理简介.docx">点击下载《CLD费用管理简介》</a></td>
 
+					</tr>
 
+					</tbody>
 
+				</table>
 
+				<table class="table table-bordered table-condensed">
 
+					<tbody>
 
+					<tr>
 
+						<th class="taC" width="100">费用申请人</th>
 
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用申请人使用教程.pdf">在线查阅《费用申请人使用手册》</a></td>
 
+						<td class="taC"><a href="http://cld.com/global/handbook/费用申请人使用教程.docx">点击下载《费用申请人使用手册》</a></td>
 
+					</tr>
 
+					</tbody>
 
+				</table>
 
+				<table class="table table-bordered table-condensed">
 
+					<tbody>
 
+					<tr>
 
+						<th class="taC" width="100">费用审批人</th>
 
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用审批人使用教程.pdf">在线查阅《费用审批人使用手册》</a></td>
 
+						<td class="taC"><a href="http://cld.com/global/handbook/费用审批人使用教程.docx">点击下载《费用审批人使用手册》</a></td>
 
+					</tr>
 
+					</tbody>
 
+				</table>
 
+				<table class="table table-bordered table-condensed">
 
+					<tbody>
 
+					<tr>
 
+						<th class="taC" width="100">费用执行人</th>
 
+						<td class="taC"><a target="_Blank" href="http://cld.com/global/handbook/费用执行人使用教程.pdf">在线查阅《费用执行人使用手册》</a></td>
 
+						<td class="taC"><a href="http://cld.com/global/handbook/费用执行人使用教程.docx">点击下载《费用执行人使用手册》</a></td>
 
+					</tr>
 
+					</tbody>
 
+				</table>
 
+		    </div>
 
+			<div class="modal-footer">
 
+			    <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
 
+			</div>
 
+		</div>
 
+	</div>
 
+</div>
 
+    <!--邮寄-->	
+											</ul>
 
 				</div>
 
 			</div>
 
 			<div class="adminContent autoHeight" style="height: 821px;">
 
@@ -62,12 +134,13 @@
 
 	  					<option  value="2014"  >2014</option>
 
 <option  selected  value="2015">2015</option>
 
 <option  value="2016">2016</option>
 
-<option  value="2017">2017</option>	  					</select> 
+<option  value="2017">2017</option>
 
+<option  value="2018">2018</option>	  					</select> 
 	  </li>
 
 
-	<li>报销总计：￥52600.00</li>
 
-	<li>同意支付：<span class="colGreen">￥50000.00</span></li>
 
-	<li>审批中：￥2600</li>
 
+	<li>报销总计：￥0</li>
 
+	<li>同意支付：<span class="colGreen">￥0</span></li>
 
+	<li>审批中：￥0</li>
 
 </ul>
 
 </form>
 
 	  		</div>
 
@@ -185,7 +258,7 @@
 
 				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
 
 				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
 
 	  							  						<tr>
 
-	  						<th rowspan="18">总部</th><td><a href="/staffCollectDetail/谭玉堂">谭玉堂</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
+	  						<th rowspan="19">总部</th><td><a href="/staffCollectDetail/谭玉堂">谭玉堂</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
 	  							  						<tr>
 
 	  						<td><a href="/staffCollectDetail/何银龄">何银龄</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
 	  							  						<tr>
 
@@ -205,7 +278,7 @@
 
 	  							  						<tr>
 
 	  						<td><a href="/staffCollectDetail/任杰">任杰</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
 	  							  						<tr>
 
-	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥50000.00</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥50000</b></td>	  						</tr>
 
+	  						<td><a href="/staffCollectDetail/蔡频">蔡频</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
 	  							  						<tr>
 
 	  						<td><a href="/staffCollectDetail/王晶">王晶</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
 	  							  						<tr>
 
@@ -219,14 +292,16 @@
 
 	  							  						<tr>
 
 	  						<td><a href="/staffCollectDetail/王丰">王丰</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
 	  							  						<tr>
 
-	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥50000</td><td class="taR">￥0</td>
 
+	  						<td><a href="/staffCollectDetail/欧桃珍">欧桃珍</a></td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen"><b>￥0</b></td>	  						</tr>
 
+	  							  						<tr>
 
+	  						<th class="taR">小计</th><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
 
 				<td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td><td class="taR">￥0</td>
 
-				<td class="taR">￥0</td><td class="taR">￥50000</td>	  						</tr>
 
+				<td class="taR">￥0</td><td class="taR">￥0</td>	  						</tr>
 
 	  							  						
 	  						<tr><th></th>
 
 	  						<td class="taR">合计</td>
 
-	  						<td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">￥50000</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen">￥50000</td>							</tr>
 
-	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥50000</b></td></tr>
 
+	  						<td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR">-</td><td class="taR colGreen">￥0</td>							</tr>
 
+	  						<tr class="warning"><th></th><td class="taR"><b>全年费用合计</b></td><td colspan="13" class="colGreed taR"><b style="font-size:24px">￥0</b></td></tr>
 
 	  						</tbody>
 
 	  					</table>
 
 	  			</div>

+ 3 - 3
protected/class/invoice.func.php
查看文件 

@@ -39,13 +39,13 @@ function formatExcelToArrayBank($file_url = ""){
 
 				if ($val instanceof PHPExcel_RichText)
 
 					$val = $val->__toString ();
 
 				
-					if ($currentColumn == 'A') {
 
+					if ($currentColumn == 'E') {
 
 						$excel_column ['receivablesPrice'] = $val;
 
 					} elseif ($currentColumn == 'B')
 
 					$excel_column ['receivablesMessage'] = $val;
 
-					elseif ($currentColumn == 'C') {
 
+					elseif ($currentColumn == 'D') {
 
 						$excel_column ['receivablesBank'] = $val;
 
-					} elseif ($currentColumn == 'D') {
 
+					} elseif ($currentColumn == 'A') {
 
 						$excel_column ['receivablesDate'] = excelTime ( $val );
 
 					} 
 			}

+ 5 - 2
protected/class/receipt.func.php
查看文件 

@@ -33,14 +33,16 @@ function exportExcel($title=array(), $data=array(), $fileName='', $savePath='./'
 
 		}
 
 		$_row++;
 
 	}
 
-
 
+	;
 
+	//html_entity_decode("&iuml;&raquo;&iquest;".$value['order_id']);
 
+	
 	//填写数据
 
 	if($data){
 
 		$i = 0;
 
 		foreach($data AS $_v){
 
 			$j = 0;
 
 			foreach($_v AS $_cell){
 
-				$obj->getActiveSheet(0)->setCellValue($cellName[$j] . ($i+$_row), $_cell);
 
+				$obj->getActiveSheet(0)->setCellValueExplicit($cellName[$j] . ($i+$_row), $_cell,PHPExcel_Cell_DataType::TYPE_STRING);
 
 				$j++;
 
 			}
 
 			$i++;
 
@@ -57,6 +59,7 @@ function exportExcel($title=array(), $data=array(), $fileName='', $savePath='./'
 
 	if($isDown){   //网页下载
 
 		header('pragma:public');
 
 		header("Content-Disposition:attachment;filename=$fileName.xls");
 
+		header('Content-Type:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
 
 		$objWrite->save('php://output');exit;
 
 	}

+ 2 - 1
protected/config/acl.conf.php
查看文件 

@@ -61,7 +61,8 @@ $acl ['ordinary'] ['allow'] = array (
 
 				
 				//办事处汇总查询权限--现加入普通权限中->另外在做权限判定
 
 				'invoiceAggregateCategoryDetail',
 
-				
+				'invoiceAggregateStaffDetail',
 
+				'invoiceAggregateStaffReceivablesDetail',

+ 1 - 1
protected/config/execute/invoice.ini
查看文件 

@@ -1 +1 @@
 
-,41,58
 
+,41,58,50,41,58

+ 1 - 1
protected/config/invoice/invoice.ini
查看文件 

@@ -1 +1 @@
 
-{"\u53d1\u7968\u5ba1\u6279":"41,58"}
 
+{"\u53d1\u7968\u5ba1\u6279":"41,58,50"}

+ 8 - 0
protected/config/routes.conf.php
查看文件 

@@ -561,6 +561,14 @@ $route['*']['/invoiceAggregateCategory/:cid'] = array('InvoiceController', 'invo
 
 
 //办事处汇总
 
 $route['*']['/invoiceAggregateCategoryDetail'] = array('InvoiceController', 'invoiceAggregateCategoryDetail');
 
+
 
+$route['*']['/invoiceAggregateStaffDetail'] = array('InvoiceController', 'invoiceAggregateStaffDetail');
 
+$route['*']['/invoiceAggregateStaffDetail/:page/:status'] = array('InvoiceController', 'invoiceAggregateStaffDetail');
 
+$route['*']['/invoiceAggregateStaffReceivablesDetail'] = array('InvoiceController', 'invoiceAggregateStaffReceivablesDetail');
 
+$route['*']['/invoiceAggregateStaffReceivablesDetail/:page/:status'] = array('InvoiceController', 'invoiceAggregateStaffReceivablesDetail');
 
+
 
+
 
+
 
 //纸票管理
 
 $route['*']['/invoicePaper'] = array('InvoiceController', 'invoicePaper');
 
 $route['*']['/invoicePaperAdd'] = array('InvoiceController', 'invoicePaperAdd');

+ 273 - 20
protected/controller/InvoiceController.php
查看文件 

@@ -65,8 +65,8 @@ class InvoiceController extends DooController {
 
 		 * Doo::acl()->isAllowed($uGroups['groups'], $resource, $action);
 
 		 */
 
 		// var_dump($flag) ;
 
-		// 单独判断办事处汇总的访问权限 invoiceAggregateCategoryDetail
 
-		if ($action == 'invoiceAggregateCategoryDetail') {
 
+		// 单独判断办事处汇总的访问权限 invoiceAggregateCategoryDetail,invoiceAggregateStaffDetail
 
+		if ($action == 'invoiceAggregateCategoryDetail' || $action == 'invoiceAggregateStaffDetail') {
 
 			Doo::loadModel ( "invoiceCategoryManage" );
 
 			$invoiceCategoryManage = new invoiceCategoryManage ();
 
 			
@@ -2201,13 +2201,17 @@ class InvoiceController extends DooController {
 
 		$invoice = new invoice ();
 
 		Doo::loadModel ( 'invoiceOperationLog' );
 
 		$invoiceOperationLog = new invoiceOperationLog ();
 
+		Doo::loadModel ( 'invoicePaper' );
 
+		$invoicePaper = new invoicePaper ();
 
 		
 		$invoiceDetail = $invoice->getPrintInvoiceByManage ( $this->staff [0] ['sid'], 0, $iid );
 
 		if (empty ( $invoiceDetail ))
 
 			die ( 'illegal request' );
 
 		
+		$invoicePaperList = $invoicePaper->getInvoicePaperByInvoiceType ( $invoiceDetail ['invoiceType'] );
 
 		$invoiceOperationLogList = $invoiceOperationLog->getInvoiceOperationLogByIid ( $iid );
 
 		
+		$this->data ['invoicePaperList'] = $invoicePaperList;
 
 		$this->data ['invoiceDetail'] = $invoiceDetail;
 
 		$this->data ['invoiceOperationLogList'] = $invoiceOperationLogList;
 
 		$this->data ['INVOICEKEY'] = $invoice->authcode ( $invoiceDetail ['iid'], '' );
 
@@ -2322,11 +2326,25 @@ class InvoiceController extends DooController {
 
 			$invoiceOperationLog = new invoiceOperationLog ();
 
 			Doo::loadModel ( 'invoiceStatistics' );
 
 			$invoiceStatistics = new invoiceStatistics ();
 
-			// $info=$invoice->getOne(array('where'=>"invoiceNo = '".$invoiceNo."'",'asArray' => TRUE));
 
+			$XDeode = new XDeode ( 5 );
 
+			Doo::loadModel ( 'invoicePaper' );
 
+			$invoicePaper = new invoicePaper ();
 
 			
 			$invoicePrintDetail = $invoice->getInvoiceByPrint ( $iid );
 
 			if (empty ( $invoicePrintDetail ))
 
 				die ( 'illegal request' );
 
+				
+				//
 
+			$ipid = $XDeode->decode ( $invoiceNo );
 
+			$paperDetail = $invoicePaper->getInvoicePaperByIpid ( $ipid );
 
+			if (empty ( $paperDetail ))
 
+				die ( 'illegal request' );
 
+			$invoicePaper = new invoicePaper ();
 
+			$item = array (
 
+					'iid' => $iid,
 
+					'ipid' => $ipid 
+			);
 
+			$invoicePaper->setInvoicePaperByCondition ( $item );
 
 			
 			$item = array (
 
 					'iid' => $iid,
 
@@ -2334,12 +2352,12 @@ class InvoiceController extends DooController {
 
 					'updateTime' => date ( "Y-m-d H:i:s" ),
 
 					'printer' => $this->staff [0] ['username'],
 
 					'printTime' => date ( "Y-m-d H:i:s" ),
 
-					'invoiceNo' => $invoiceNo 
+					'invoiceNo' => $paperDetail ['invoiceNo'] 
 			);
 
 			$invoice->setInvoiceByCondition ( $item );
 
 			$item = array (
 
 					'date' => date ( "Y-m-d H:i:s" ),
 
-					'operation' => '打印发票号：' . $invoiceNo,
 
+					'operation' => '打印发票号：' . $paperDetail ['invoiceNo'],
 
 					'status' => 5,
 
 					'img' => $this->staff [0] ['avatar'],
 
 					'username' => $this->staff [0] ['username'],
 
@@ -2802,15 +2820,16 @@ class InvoiceController extends DooController {
 
 			
 			Doo::db ()->beginTransaction ();
 
 			// 批量存储收款--由于必须获得收款ID，
 
-			$sql = 'INSERT INTO CLD_invoiceReceivables (receivablesPrice, receivablesMessage,receivablesSerial,receivablesBank,receivablesDate,inputStaff,date,receivablesCategory,receivablesStaff,bankBatchNumber)
 
+			$sql = 'INSERT INTO CLD_invoiceReceivables (receivablesPrice, receivablesMessage,receivablesSerial,receivablesBank,receivablesDate,inputStaff,date,receivablesCategory,receivablesStaff,bankBatchNumber,recepitTitleMark)
 
 				  VALUES ';
 
 			$date = date ( "Y-m-d" );
 
 			$receivablesList = array ();
 
 			foreach ( $exlArray as $key => $value ) {
 
-				$receivablesSql = '(' . $value ["receivablesPrice"] . ',"' . $value ["receivablesMessage"] . '",' . '"#SK' . date ( "Ymd" ) . mt_rand ( 1000, 9999 ) . '","' . $value ["receivablesBank"] . '","' . $value ["receivablesDate"] . '","' . $this->staff [0] ['username'] . '","' . $date . '","PUBLIC","PUBLIC","' . $bankBatchNumber . '")';
 
+				$receivablesSql = '(' . $value ["receivablesPrice"] . ',"' . $value ["receivablesMessage"] . '",' . '"#SK' . date ( "Ymd" ) . mt_rand ( 1000, 9999 ) . '","' . $value ["receivablesBank"] . '","' . $value ["receivablesDate"] . '","' . $this->staff [0] ['username'] . '","' . $date . '","PUBLIC","PUBLIC","' . $bankBatchNumber . '","' . $value ["receivablesMessage"] . '")';
 
 				array_push ( $receivablesList, $receivablesSql );
 
 			}
 
 			$sql = $sql . implode ( ',', $receivablesList );
 
+			//echo $sql;
 
 			Doo::db ()->query ( $sql );
 
 			
 			// 批量存储收款统计
 
@@ -2827,7 +2846,7 @@ class InvoiceController extends DooController {
 
 				  VALUES ';
 
 			$statisticsList = array ();
 
 			foreach ( $iridList as $value ) {
 
-				$statisticsSql = '("' . $value ['receivablesDate'] . '",2,' . $value ['irid'] . ',' . $value ["receivablesPrice"] . ')';
 
+				$statisticsSql = '("' . $date . '",2,' . $value ['irid'] . ',' . $value ["receivablesPrice"] . ')';
 
 				array_push ( $statisticsList, $statisticsSql );
 
 			}
 
 			$sql = $sql . implode ( ',', $statisticsList );
 
@@ -3511,7 +3530,7 @@ class InvoiceController extends DooController {
 
 			$con .= ' and a.invoiceType=0 ';
 
 		elseif ($invoiceType == 'SPECIAL')
 
 			$con .= ' and a.invoiceType=1 ';
 
-
 
+		
 		$dateArr = explode ( ':', $date );
 
 		$D1 = $dateString = '';
 
 		$D2 = '';
 
@@ -3530,7 +3549,7 @@ class InvoiceController extends DooController {
 
 		
 		if (! empty ( $MebSea ))
 
 			$con .= ' and ( b.invoiceTitle like "%' . $MebSea . '%" or b.invoiceCompany like "%' . $MebSea . '%" or a.invoiceNo like "%' . $MebSea . '%"  )';
 
-			
+		
 		$invoiceTotal = $invoicePaper->getInvoicePaperCount ();
 
 		
 		$sql = '  ' . $con;
 
@@ -3540,9 +3559,9 @@ class InvoiceController extends DooController {
 
 		$paperList = array ();
 
 		foreach ( $list as $key => $value ) {
 
 			$irDetail = array ();
 
-			if($value ['iid']==0)
 
+			if ($value ['iid'] == 0)
 
 				array_push ( $irDetail, '<a href="javascript:if(window.confirm(\'确认删除?\'))window.location=\'/invoicePaperDel/' . $value ['ipidKey'] . '\'" >删除</a>' );
 
-			else 
+			else
 
 				array_push ( $irDetail, '' );
 
 			array_push ( $irDetail, $value ['invoiceCode'] );
 
 			array_push ( $irDetail, $value ['invoiceNo'] );
 
@@ -3559,8 +3578,6 @@ class InvoiceController extends DooController {
 
 			array_push ( $irDetail, $value ['categoryName'] . '-' . $value ['userName'] );
 
 			array_push ( $irDetail, $value ['printTime'] );
 
 			
-			
-			
 			array_push ( $paperList, $irDetail );
 
 		}
 
 		// $approvalListJson = json_encode ( $approvalList );
 
@@ -3574,8 +3591,7 @@ class InvoiceController extends DooController {
 
 				"data" => $paperList 
 		), JSON_UNESCAPED_UNICODE );
 
 	}
 
-	
-	function invoicePaperDel(){
 
+	function invoicePaperDel() {
 
 		$ipidKey = isset ( $this->params ['ipidKey'] ) ? $this->params ['ipidKey'] : "";
 
 		
 		$XDeode = new XDeode ( 5 );
 
@@ -3587,8 +3603,8 @@ class InvoiceController extends DooController {
 
 		Doo::loadModel ( 'invoicePaper' );
 
 		$invoicePaper = new invoicePaper ();
 
 		$invoicePaper->delete ( array (
 
-				'where' => 'ipid=' . $ipid.' and iid!=0',
 
-				'limit' => 1
 
+				'where' => 'ipid=' . $ipid . ' and iid=0',
 
+				'limit' => 1 
 		) );
 
 		
 		return '/invoicePaper';
 
@@ -3615,7 +3631,7 @@ class InvoiceController extends DooController {
 
 			$sql = 'INSERT INTO CLD_invoicePaper (invoiceType, invoiceCode,invoiceNo,date)
 
 				  VALUES ';
 
 			$paperList = array ();
 
-			for($invoiceNoStart; $invoiceNoStart <= $sum; $invoiceNoStart ++) {
 
+			for($invoiceNoStart; $invoiceNoStart <= $sum - 1; $invoiceNoStart ++) {
 
 				$paperSql = '(' . $invoiceType . ',"' . $invoiceCode . '","' . $invoiceNoStart . '","' . $date . '")';
 
 				array_push ( $paperList, $paperSql );
 
 			}
 
@@ -4081,6 +4097,10 @@ class InvoiceController extends DooController {
 
 		$this->data ['receiptMemu'] = 'invoiceAggregate';
 
 		$this->render ( "/admin/invoiceAggregateCategory", $this->data );
 
 	}
 
+	
+	/**
 
+	 * 办事处汇总信息
 
+	 */
 
 	function invoiceAggregateCategoryDetail() {
 
 		$cidKey = $this->get_args ( 'cidKey' ) ? $this->get_args ( 'cidKey' ) : '';
 
 		
@@ -4192,6 +4212,230 @@ class InvoiceController extends DooController {
 
 		$this->data ['receiptMemu'] = 'invoiceAggregateCategoryDetail';
 
 		$this->render ( "/admin/invoiceAggregateCategoryDetail", $this->data );
 
 	}
 
+	
+	/**
 
+	 * 办事处人员汇总详情
 
+	 */
 
+	function invoiceAggregateStaffDetail() {
 
+		$sidKey = $this->get_args ( 'sidKey' ) ? $this->get_args ( 'sidKey' ) : '';
 
+		// $sidKey = isset ( $this->params ['sidKey'] ) ? $this->params ['sidKey'] : '';
 
+		
+		Doo::loadClass ( 'XDeode' );
 
+		$XDeode = new XDeode ( 5 );
 
+		Doo::loadModel ( 'invoice' );
 
+		$invoice = new invoice ();
 
+		Doo::loadModel ( 'staff' );
 
+		$staff = new staff ();
 
+		Doo::loadModel ( "invoiceCategoryManage" );
 
+		$invoiceCategoryManage = new invoiceCategoryManage ();
 
+		
+		$sid = $XDeode->decode ( $sidKey );
 
+		
+		$imcStaff = $invoiceCategoryManage->getInvoiceCMByStaff ( $this->staff [0] ['sid'] );
 
+		$cidList = array ();
 
+		foreach ( $imcStaff as $key => $value ) {
 
+			array_push ( $cidList, $value ['cid'] );
 
+			if (empty ( $cidKey ))
 
+				$cidKey = $XDeode->encode ( $value ['cid'] );
 
+		}
 
+		
+		$cidString = implode ( ',', $cidList );
 
+		$staffList = $staff->getStaffInCid ( $cidString );
 
+		$staffDetail = $staff->getStaffBySid ( $sid );
 
+		
+		$MebSea = $this->get_args ( 'MebSea' ) ? $this->get_args ( 'MebSea' ) : "";
 
+		
+		$page_size = 18;
 
+		$page = isset ( $this->params ['page'] ) && is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
 
+		$status = isset ( $this->params ['status'] ) ? $this->params ['status'] : 'All';
 
+		
+		$BeginDate = date ( 'Y-m-01', strtotime ( date ( "Y-m-d" ) ) );
 
+		$endDate = date ( 'Y-m-d', strtotime ( "$BeginDate +1 month -1 day" ) );
 
+		
+		$date = $this->get_args ( 'date' ) ? $this->get_args ( 'date' ) : $BeginDate . " : " . $endDate;
 
+		$dateArr = explode ( ':', $date );
 
+		$D1 = '';
 
+		$D2 = '';
 
+		if (! empty ( $date )) {
 
+			$D1 = $dateArr [0] . " 00:00:00 ";
 
+			if (isset ( $dateArr [1] ))
 
+				$D2 = $dateArr [1] . " 23:59:59 ";
 
+			else
 
+				$D2 = $dateArr [0] . " 23:59:59 "; // date ( "Y-m-d" );
 
+					                                   // $D2 = $dateArr [1];
 
+		}
 
+		
+		$con = ' status=2  ';
 
+		if (! empty ( $D1 ) && ! empty ( $D2 ))
 
+			$con .= ' and printTime BETWEEN "' . $D1 . '" AND "' . $D2 . '" ';
 
+		
+		if ($status == 'UNRECORD')
 
+			$con .= ' and printStatus=1 and untreadStatus=0';
 
+		elseif ($status == 'RECORD')
 
+			$con .= ' and printStatus=1 and untreadStatus=3';
 
+		elseif ($status == 'BOUNCED')
 
+			$con .= ' and untreadStatus=2';
 
+		elseif ($status == 'PARTRECORD')
 
+			$con .= ' and untreadStatus=0 and printStatus=1 and irid!=""';
 
+		elseif ($status == 'All') {
 
+			$con .= ' and ( untreadStatus=2 or untreadStatus=0 or untreadStatus=3 )';
 
+		}
 
+		
+		$con.=' and sid='.$sid;
 
+		
+		$get = "/" . $status . "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea ) . "&sidKey=" . urlencode ( $sidKey );
 
+		
+		if (! empty ( $MebSea )) {
 
+			$con .= ' and ( invoiceTitle like "%' . $MebSea . '%"  or invoiceCompany like "%' . $MebSea . '%" )';
 
+		}
 
+		$pageinfo ['page'] = array (
 
+				'previous' => '' 
+		);
 
+		$pageinfo = $this->get_page ( "CLD_invoice", $con, $page, $page_size, "invoiceAS", $get, "" );
 
+		$limit = $pageinfo ['lower'] . ',' . $page_size;
 
+		
+		$list = $invoice->getInvoiceByUntreadStatusPage ( $limit, $con );
 
+		
+		$this->data ['staffDetail'] = $staffDetail;
 
+		$this->data ['staffList'] = $staffList;
 
+		$this->data ['MebSeaEn'] = $MebSea;
 
+		$this->data ['MebSea'] = urlencode ( $MebSea );
 
+		$this->data ['date'] = $date;
 
+		$this->data ['page'] = $pageinfo;
 
+		$this->data ['get'] = $get;
 
+		$this->data ['list'] = $list;
 
+		$this->data ['status'] = $status;
 
+		$this->data ['sidKey'] = $sidKey;
 
+		
+		$this->data ['memu'] = "invoice";
 
+		$this->data ['staff'] = $this->staff;
 
+		$this->data ['receiptMemu'] = 'invoiceAggregateCategoryDetail';
 
+		
+		$this->render ( "/admin/invoiceAggregateStaffDetail", $this->data );
 
+	}
 
+	
+	/**
 
+	 * 办事处人员汇总收款情
 
+	 */
 
+	function invoiceAggregateStaffReceivablesDetail() {
 
+		$sidKey = $this->get_args ( 'sidKey' ) ? $this->get_args ( 'sidKey' ) : '';
 
+		//include Doo::conf ()->BASE_PATH . 'diagnostic/debug.php';
 
+		Doo::loadModel ( 'invoiceReceivables' );
 
+		$invoiceReceivables = new invoiceReceivables ();
 
+		Doo::loadModel ( 'staff' );
 
+		$staff = new staff ();
 
+		Doo::loadModel ( "invoiceCategoryManage" );
 
+		$invoiceCategoryManage = new invoiceCategoryManage ();
 
+		
+		Doo::loadClass ( 'XDeode' );
 
+		$XDeode = new XDeode ( 5 );
 
+		
+		$sid = $XDeode->decode ( $sidKey );
 
+		$staffDetail = $staff->getStaffBySid ( $sid );
 
+		
+		$imcStaff = $invoiceCategoryManage->getInvoiceCMByStaff ( $this->staff [0] ['sid'] );
 
+		$cidList = array ();
 
+		foreach ( $imcStaff as $key => $value ) {
 
+			array_push ( $cidList, $value ['cid'] );
 
+			if (empty ( $cidKey ))
 
+				$cidKey = $XDeode->encode ( $value ['cid'] );
 
+		}
 
+		
+		$cidString = implode ( ',', $cidList );
 
+		$staffList = $staff->getStaffInCid ( $cidString );
 
+		
+		$MebSea = $this->get_args ( 'MebSea' ) ? $this->get_args ( 'MebSea' ) : "";
 
+		
+		$timeType = $this->get_args ( 'timeType' ) ? $this->get_args ( 'timeType' ) : "CREATE";
 
+		
+		$page_size = 10;
 
+		$page = isset ( $this->params ['page'] ) && is_numeric ( $this->params ['page'] ) ? $this->params ['page'] : 1;
 
+		$status = isset ( $this->params ['status'] ) ? $this->params ['status'] : 'All';
 
+		
+		
+		if($timeType=="BINDOTP"){
 
+			$status='Credited';
 
+		}
 
+		
+		$BeginDate = date ( 'Y-m-01', strtotime ( date ( "Y-m-d" ) ) );
 
+		$endDate = date ( 'Y-m-d', strtotime ( "$BeginDate +1 month -1 day" ) );
 
+		
+		$date = $this->get_args ( 'date' ) ? $this->get_args ( 'date' ) : $BeginDate . " : " . $endDate;
 
+		$dateArr = explode ( ':', $date );
 
+		$D1 = '';
 
+		$D2 = '';
 
+		if (! empty ( $date )) {
 
+			$D1 = $dateArr [0] ." 00:00:00 ";
 
+			if (isset ( $dateArr [1] ))
 
+				$D2 = $dateArr [1] ." 23:59:59 ";
 
+			else
 
+				$D2 = $dateArr [0] ." 23:59:59 ";//date ( "Y-m-d" );
 
+		}
 
+		
+		$con = ' a.receivablesStaff like "%'.$staffDetail['username'].'%" ';
 
+		
+		$descField = 'a.bindDate';
 
+		if ($timeType == 'CREATE')
 
+			$descField = 'a.date';
 
+		
+		if (! empty ( $D1 ) && ! empty ( $D2 ))
 
+			$con .= ' and '.$descField.' BETWEEN "' . $D1 . '" AND "' . $D2 . '" ';
 
+		elseif (! empty ( $D1 ) && empty ( $D2 ))
 
+			$con .= ' and '.$descField.' like "%' . $D1 . '%"  ';
 
+		
+		if ($status == 'Unclaimed')
 
+			$con .= ' and a.bindStatus=0';
 
+		elseif ($status == 'Credited')
 
+			$con .= ' and a.bindStatus=1';
 
+		elseif ($status == 'Claim')
 
+			$con .= ' and a.bindStatus=0 and a.receivablesStaff="PUBLIC"';
 
+		elseif ($status == 'BBN')
 
+			$con .= ' and a.bindPrice>a.receivablesPrice';
 
+		
+		$get = "/" . $status . "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea ). "&sidKey=" . urlencode ( $sidKey );
 
+		
+		if (! empty ( $MebSea )) {
 
+			$con .= ' and ( a.receivablesMessage like "%' . $MebSea . '%"  or a.receivablesPrice like "%' . $MebSea . '%" )';
 
+		}
 
+		$pageinfo ['page'] = array (
 
+				'previous' => '' 
+		);
 
+		
+		$sql = 'select group_concat(b.invoiceSerial) as invoiceSerial ,group_concat(b.iid) as invoiceId
 
+				from CLD_invoiceReceivables as a left join CLD_invoice as b on
 
+				   find_in_set(b.iid,a.iidExtend) or a.iid=b.iid
 
+				where ' . $con . ' group by a.irid  ';
 
+		
+		$pageinfo = $this->getPageBySql ( $sql, $page, $page_size, "invoiceAggregateStaffReceivablesDetail", $get, "" );
 
+		$limit = $pageinfo ['lower'] . ',' . $page_size;
 
+		$list = $invoiceReceivables->getInvoiceReceivablesByConditionPage ( $limit, $con, 'desc', 'printTime' );
 
+		foreach ( $list as $key => $value ) {
 
+			$list [$key] ['category'] = '';
 
+			if ($value ['receivablesCategory'] != 'PUBLIC') {
 
+				$receivablesCategory = explode ( ":", $value ['receivablesCategory'] );
 
+				$list [$key] ['category'] = $receivablesCategory [1];
 
+			}
 
+		}
 
+		// print_r($list);
 
+		
+		$this->data ['staffDetail'] = $staffDetail;
 
+		$this->data ['sidKey'] = $sidKey;
 
+		$this->data ['staffList'] = $staffList;
 
+		
+		$this->data ['timeType'] = $timeType;
 
+		
+		$this->data ['MebSeaEn'] = $MebSea;
 
+		$this->data ['MebSea'] = urlencode ( $MebSea );
 
+		$this->data ['date'] = $date;
 
+		$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'] = 'invoiceAggregateCategoryDetail';
 
+		$this->render ( "/admin/invoiceAggregateStaffReceivablesDetail", $this->data );
 
+	}
 
 	function invoiceAchieve() {
 
 		Doo::loadModel ( 'invoice' );
 
 		$invoice = new invoice ();
 
@@ -5934,8 +6178,17 @@ class InvoiceController extends DooController {
 
 		$invoice = new invoice ();
 
 		
 		if (! empty ( $invoiceNo )) {
 
+			
+			Doo::loadModel ( 'invoicePaper' );
 
+			$invoicePaper = new invoicePaper ();
 
+			Doo::loadClass ( 'XDeode' );
 
+			$XDeode = new XDeode ( 5 );
 
+			
+			$ipid = $XDeode->decode ( $invoiceNo );
 
+			$paperDetail = $invoicePaper->getInvoicePaperByIpid ( $ipid );
 
+			
 			$info = $invoice->getOne ( array (
 
-					'where' => "invoiceNo = '" . $invoiceNo . "'",
 
+					'where' => "invoiceNo = '" . $paperDetail['invoiceNo'] . "'",
 
 					'asArray' => TRUE 
 			) );
 
 			if (! empty ( $info )) {

+ 25 - 18
protected/controller/ReceiptController.php
查看文件 

@@ -2692,6 +2692,8 @@ class ReceiptController extends DooController {
 
 			}
 
 		}
 
 		
+		
+		
 		// date ( 'Y-m' )
 
 		if (! empty ( $rdate ) && $status == 'done')
 
 			$dateCondition = " and date_format(pastDate,'%Y-%m')='" . $rdate . "' ";
 
@@ -2729,6 +2731,9 @@ class ReceiptController extends DooController {
 
 		if ($status == 'termination') {
 
 			$approvalCondition = " and status=3";
 
 		}
 
+		if($status == 'finish'){
 
+			$approvalCondition = " and status=1";
 
+		}
 
 		
 		// $approvalCondition = " and status=" . $status;
 
 		// if ($status == 2) {
 
@@ -4096,7 +4101,7 @@ class ReceiptController extends DooController {
 
 				) );
 
 				
 				// 微信企业号通知
 
-				//$this->setWXMsg ( $rid, 1 );
 
+				$this->setWXMsg ( $rid, 1 );
 
 			}
 
 			
 			$receipt->amount = $amount;
 
@@ -5209,7 +5214,7 @@ class ReceiptController extends DooController {
 
 	function hisImplement() {
 
 		$item = isset ( $this->params ['item'] ) ? $this->params ['item'] : "";
 
 		if (empty ( $item ))
 
-			$item = $this->get_args ( 'item' ) ? $this->get_args ( 'item' ) : "pendImplement";
 
+			$item = $this->get_args ( 'item' ) ? $this->get_args ( 'item' ) : "expenses";
 
 		
 		$rdate = $this->get_args ( 'date' ) ? $this->get_args ( 'date' ) : "";
 
 		
@@ -5218,6 +5223,9 @@ class ReceiptController extends DooController {
 
 		$day = $this->get_args ( 'day' ) ? $this->get_args ( 'day' ) : 'DAY';
 
 		$sop = $this->get_args ( 'sop' ) ? $this->get_args ( 'sop' ) : 'SOP';
 
 		
+		$status = $this->get_args ( 'status' ) ? $this->get_args ( 'status' ) : 'pendImplement';
 
+		
+		
 		$cidKey = $this->get_args ( 'cidKey' ) ? $this->get_args ( 'cidKey' ) : 'ALL';
 
 		
 		Doo::loadClass ( 'XDeode' );
 
@@ -5238,16 +5246,14 @@ class ReceiptController extends DooController {
 
 		$cid = $XDeode->decode ( $cidKey );
 
 		
 		$condition = "";
 
+		
 		if ($item == "expenses")
 
 			$condition = " and Rtype=1 ";
 
 		elseif ($item == "receipts")
 
 			$condition = " and Rtype=0 ";
 
 		elseif ($item == "remits")
 
 			$condition = " and Rtype=2 ";
 
-		elseif ($item == "pendImplement") {
 
-			$condition = ' and (status=1 or status=6) and (executeCopy like "%[\"' . $this->staff [0] ['sid'] . '\"%" and executeStaff not like "%{\"' . $this->staff [0] ['sid'] . '\"%" ) ';
 
-		}
 
-		
+
 
 		$statusCon = '(status=8 or status=9 or status=1 or status=6 )';
 
 		$sopString =$cidString= "";
 
 		
@@ -5258,16 +5264,16 @@ class ReceiptController extends DooController {
 
 		else
 
 			$dateCondition = " and date_format(date,'%Y-%m-%d')='" . $rdate . "' ";
 
 		
-		if ($item == 'teipts') {
 
-			$statusCon = '(status=1 or status=6 )';
 
-			$dateCondition = " and date_format(pastDate,'%Y-%m-%d')='" . $rdate . "' ";
 
-		} elseif ($item == 'alerpts') {
 
+			
+		if($status=='pendImplement'){
 
+			$condition .= ' and (status=1 or status=6) and (executeCopy like "%[\"' . $this->staff [0] ['sid'] . '\"%" and executeStaff not like "%{\"' . $this->staff [0] ['sid'] . '\"%" ) ';
 
+		}elseif($status == 'alerpts'){
 
 			$statusCon = '(status=8 or status=9 )';
 
 			if (empty ( $rdate ))
 
-				$dateCondition = " and Year(date) =" . $year;
 
+				$dateCondition .= " and Year(date) =" . $year;
 
 			else
 
-				$dateCondition = " and date_format(executeDate,'%Y-%m-%d')='" . $rdate . "' ";
 
-		}
 
+				$dateCondition .= " and date_format(executeDate,'%Y-%m-%d')='" . $rdate . "' ";
 
+		}	
 		
 		if ($sop != 'SOP')
 
 			$sopString = " and staff=" . $sop;
 
@@ -5527,6 +5533,7 @@ class ReceiptController extends DooController {
 
 				$sopHtml .= '<option value="' . $key . '" >' . $value . '</option>';
 
 		}
 
 		
+		$data['status']=$status;
 
 		$data ['rdate'] = $rdate;
 
 		$data ['sopHtml'] = $sopHtml;
 
 		$data ['dayHtml'] = $dayHtml;
 
@@ -6197,11 +6204,11 @@ class ReceiptController extends DooController {
 
 	}
 
 	function editReceipt() {
 
 		// edit status 4
 
-		$rid = isset ( $this->params ['rid'] )  ? $this->params ['rid'] : '';
 
+		$ridKey = isset ( $this->params ['rid'] )  ? $this->params ['rid'] : '';
 
 		
 		Doo::loadClass ( 'XDeode' );
 
 		$XDeode = new XDeode ( 7 );
 
-		$rid = $XDeode->decode ( $rid );
 
+		$rid = $XDeode->decode ( $ridKey );
 
 		
 		if (empty ( $rid ))
 
 			die ( 'illegal request' );
 
@@ -6294,7 +6301,7 @@ class ReceiptController extends DooController {
 
 		$data ['verify'] = $receiptDetail ['verify'];
 
 		$data ['verifyId'] = $this->verifyId;
 
 		$data ['executeId'] = $this->executeId;
 
-		$data ['rid'] = $rid;
 
+		$data ['rid'] = $ridKey;
 
 		
 		$this->render ( "/admin/saea_edit", $data );
 
 	}
 
@@ -8587,7 +8594,7 @@ class ReceiptController extends DooController {
 
 				$receipt->pastDate = date ( "Y-m-d" );
 
 				
 				// 微信企业号通知
 
-				//$this->setWXMsg ( $rid, 1 );
 
+				$this->setWXMsg ( $rid, 1 );
 
 			}
 
 			$receipt->amount = $amount;
 
 			$receipt->update ( array (
 
@@ -11741,7 +11748,7 @@ class ReceiptController extends DooController {
 
 						break;
 
 				}
 
 				
-				$result = $client->SendMsg ( $user, $msg, 'text' );
 
+				//$result = $client->SendMsg ( $user, $msg, 'text' );
 
 			}
 
 		}
 
 	}

+ 40 - 20
protected/model/staff.php
查看文件 

@@ -53,7 +53,7 @@ class staff extends DooModel {
 
 			'bankName',
 
 			'bankNumber',
 
 			'remittanceBankType',
 
-			'coupletNumber'
 
+			'coupletNumber' 
 	);
 
 	public function checkUser($uid, $passwork) {
 
 		return $this->find ( array (
 
@@ -62,35 +62,56 @@ class staff extends DooModel {
 
 				'asArray' => TRUE 
 		) );
 
 	}
 
-	
-	public function getStaffByName($username=''){
 
+	public function getStaffByName($username = '') {
 
 		return $this->getOne ( array (
 
 				'asc' => 'sid',
 
 				'where' => "username= '" . $username . "'",
 
-				'asArray' => TRUE
 
+				'asArray' => TRUE 
 		) );
 
 	}
 
-	
 	public function getStaff() {
 
 		Doo::loadClass ( 'XDeode' );
 
 		$XDeode = new XDeode ( 5 );
 
 		
-		$list=$this->find ( array (
 
+		$list = $this->find ( array (
 
 				'desc' => 'sid',
 
-				'asArray' => TRUE
 
+				'asArray' => TRUE 
 		) );
 
-		foreach ($list as $key=>$value){
 
-			$list[$key] ['sidKey'] = $XDeode->encode ( $value ['sid'] );
 
+		foreach ( $list as $key => $value ) {
 
+			$list [$key] ['sidKey'] = $XDeode->encode ( $value ['sid'] );
 
+		}
 
+		
+		return $list;
 
+	}
 
+	public function getStaffInCid($cid = '') {
 
+		if (empty ( $cid ))
 
+			return array ();
 
+		$list = $this->find ( array (
 
+				'asc' => 'sid',
 
+				'where' => "cid in(" . $cid . ")",
 
+				'asArray' => TRUE 
+		) );
 
+		Doo::loadClass ( 'XDeode' );
 
+		$XDeode = new XDeode ( 5 );
 
+		foreach ( $list as $key => $value ) {
 
+			$list [$key] ['sidKey'] = $XDeode->encode ( $value ['sid'] );
 
 		}
 
 		
 		return $list;
 
 	}
 
 	public function getStaffByCid($cid = 0) {
 
-		return $this->find ( array (
 
+		$list = $this->find ( array (
 
 				'asc' => 'sid',
 
 				'where' => "cid= '" . $cid . "'",
 
 				'asArray' => TRUE 
 		) );
 
+		Doo::loadClass ( 'XDeode' );
 
+		$XDeode = new XDeode ( 5 );
 
+		foreach ( $list as $key => $value ) {
 
+			$list [$key] ['sidKey'] = $XDeode->encode ( $value ['sid'] );
 
+		}
 
+		
+		return $list;
 
 	}
 
 	public function getUserById($sid = 0) {
 
 		return $this->find ( array (
 
@@ -122,16 +143,15 @@ class staff extends DooModel {
 
 			) );
 
 		return $detail;
 
 	}
 
-	
-	public function getStaffByWxid($wxid=''){
 
-		//echo "wxid in ( " . $wxid . ")";
 
-		if (empty($wxid))
 
-			return array();
 
-			return $this->find ( array (
 
-					'select' =>'sid,wxid',
 
-					'where' => "wxid in ( " . $wxid . ")",
 
-					'asArray' => TRUE
 
-			) );
 
+	public function getStaffByWxid($wxid = '') {
 
+		// echo "wxid in ( " . $wxid . ")";
 
+		if (empty ( $wxid ))
 
+			return array ();
 
+		return $this->find ( array (
 
+				'select' => 'sid,wxid',
 
+				'where' => "wxid in ( " . $wxid . ")",
 
+				'asArray' => TRUE 
+		) );
 
 	}
 
 }

+ 5 - 5
protected/view/admin/admin_myinfo.html
查看文件 

@@ -171,27 +171,27 @@
 
 
 
 
-<legend>汇款信息</legend>
 
+<legend>收款信息</legend>
 
 					<div class="control-group">
 
-						<label class="control-label">汇款人户名</label>
 
+						<label class="control-label">收款人户名</label>
 
 						<div class="controls">
 
 							<input type="text" name="remittanceName" value="{{staff.0.remittanceName}}">
 
 						</div>
 
 					</div>
 
 					<div class="control-group">
 
-						<label class="control-label">汇款开户银行名称</label>
 
+						<label class="control-label">收款开户银行名称</label>
 
 						<div class="controls">
 
 							<input type="text" name="bankName" value="{{staff.0.bankName}}">
 
 						</div>
 
 					</div>
 
 					<div class="control-group">
 
-						<label class="control-label">汇款帐号</label>
 
+						<label class="control-label">收款账号</label>
 
 						<div class="controls">
 
 							<input type="text" name="bankNumber" value="{{staff.0.bankNumber}}">
 
 						</div>
 
 					</div>
 
 					<div class="control-group">
 
-						<label class="control-label">联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></label>
 
+						<label class="control-label">联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></label>
 
 						<div class="controls">
 
 							<input type="text" name="coupletNumber" value="{{staff.0.coupletNumber}}">
 
 						</div>

+ 3 - 1
protected/view/admin/approvalExpenses.html
查看文件 

@@ -37,6 +37,8 @@
 
 	  					<a  <!-- if {{status}}=='done' --> class="now" <!-- endif --> href="/approvalExpenses/done">费用完成</a>
 
 	  					<a <!-- if {{status}}=='termination' --> class="now" <!-- endif --> href="/approvalExpenses/termination">终止</a>
 
 	  					
+	  					<a <!-- if {{status}}=='finish' --> class="now" <!-- endif --> href="/approvalExpenses/finish" >审批完成</a>
 
+	  					
 	  					</li>
 
 	  					
 	  					<!-- if {{status}}=='pendApproval'  -->
 
@@ -56,7 +58,7 @@
 
 	  					
 	  					<!-- endif -->
 
 	  					
-	  					<!-- if {{status}}=='done' || {{status}}=='termination' --> 
+	  					<!-- if {{status}}=='done' || {{status}}=='termination'|| {{status}}=='finish' --> 
 	  					<li style="display:none" >
 
 	  					<input type="month" name="date" id="date" style="width:120px" onChange="receiptDate();" value="">
 
 	  					</li>

+ 24 - 24
protected/view/admin/expensesCollect.html
查看文件 

@@ -97,24 +97,24 @@
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -170,24 +170,24 @@
 
 							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 							
 							
-							<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+							<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -301,24 +301,24 @@
 
 	  						
 	  						
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -458,24 +458,24 @@
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->

+ 120 - 0
protected/view/admin/expensesDoc.html
查看文件 

@@ -106,6 +106,36 @@
 
 	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
+							<td>{{receiptDetail' value.remittanceName}}</td>
 
+							</tr>
 
+							<tr>
 
+							<th>收款银行</th>
 
+							<td>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
+							广发银行
 
+							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							其他
 
+							<!-- endif -->
 
+							</td>
 
+							</tr>
 
+							<tr><th>收款开户银行名称</th><td>
 
+							{{receiptDetail' value.bankName}}
 
+							</td></tr>
 
+							<tr><th>收款账号</th><td>
 
+							{{receiptDetail' value.bankNumber}}
 
+							</td></tr>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							<tr><th>联行号</th><td>
 
+							{{receiptDetail' value.coupletNumber}}
 
+							</td></tr>
 
+							<!-- endif -->
 
+	  						
+	  						
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 
 	  						
@@ -148,6 +178,36 @@
 
 							
 							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
+							
+							
+							
+							<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
+							<td>{{receiptDetail' value.remittanceName}}</td>
 
+							</tr>
 
+							<tr>
 
+							<th>收款银行</th>
 
+							<td>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
+							广发银行
 
+							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							其他
 
+							<!-- endif -->
 
+							</td>
 
+							</tr>
 
+							<tr><th>收款开户银行名称</th><td>
 
+							{{receiptDetail' value.bankName}}
 
+							</td></tr>
 
+							<tr><th>收款账号</th><td>
 
+							{{receiptDetail' value.bankNumber}}
 
+							</td></tr>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							<tr><th>联行号</th><td>
 
+							{{receiptDetail' value.coupletNumber}}
 
+							</td></tr>
 
+							<!-- endif -->
 
+							
+							
 							<tr><th class="taC" colspan="2">费用说明</th>
 
 							</tr><tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 
 							
@@ -267,6 +327,36 @@
 
 	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
+							<td>{{receiptDetail' value.remittanceName}}</td>
 
+							</tr>
 
+							<tr>
 
+							<th>收款银行</th>
 
+							<td>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
+							广发银行
 
+							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							其他
 
+							<!-- endif -->
 
+							</td>
 
+							</tr>
 
+							<tr><th>收款开户银行名称</th><td>
 
+							{{receiptDetail' value.bankName}}
 
+							</td></tr>
 
+							<tr><th>收款账号</th><td>
 
+							{{receiptDetail' value.bankNumber}}
 
+							</td></tr>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							<tr><th>联行号</th><td>
 
+							{{receiptDetail' value.coupletNumber}}
 
+							</td></tr>
 
+							<!-- endif -->
 
+	  						
+	  						
+	  						
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 
 	  						
@@ -415,6 +505,36 @@
 
 	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
+	  						
+	  						
+	  						
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
+							<td>{{receiptDetail' value.remittanceName}}</td>
 
+							</tr>
 
+							<tr>
 
+							<th>收款银行</th>
 
+							<td>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
+							广发银行
 
+							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							其他
 
+							<!-- endif -->
 
+							</td>
 
+							</tr>
 
+							<tr><th>收款开户银行名称</th><td>
 
+							{{receiptDetail' value.bankName}}
 
+							</td></tr>
 
+							<tr><th>收款账号</th><td>
 
+							{{receiptDetail' value.bankNumber}}
 
+							</td></tr>
 
+							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
+							<tr><th>联行号</th><td>
 
+							{{receiptDetail' value.coupletNumber}}
 
+							</td></tr>
 
+							<!-- endif -->
 
+	  						
+	  						
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>

+ 12 - 12
protected/view/admin/expensesEdi.html
查看文件 

@@ -72,24 +72,24 @@
 
 							
 							
 							
-							<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+							<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -167,24 +167,24 @@
 
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->

+ 11 - 8
protected/view/admin/hisImplement.html
查看文件 

@@ -31,15 +31,18 @@
 
 					
 					<ul class="cateList " style="display:inline;">
 
 						<li>
 
-							<a <!-- if {{item}}=="pendImplement"||{{item}}=="" --> class="now" <!-- endif -->  href="/hisImplement/pendImplement">待执行</a>
 
 							<a href="/hisImplement/expenses" <!-- if {{item}}=="expenses" --> class="now" <!-- endif --> >借款</a>
 
-						<a href="/hisImplement/receipts" <!-- if {{item}}=="receipts" --> class="now" <!-- endif --> >报销单</a>
 
-						<a href="/hisImplement/remits" <!-- if {{item}}=="remits" --> class="now" <!-- endif --> >对公汇款</a>
 
+							<a href="/hisImplement/receipts" <!-- if {{item}}=="receipts" --> class="now" <!-- endif --> >报销单</a>
 
+							<a href="/hisImplement/remits" <!-- if {{item}}=="remits" --> class="now" <!-- endif --> >对公汇款</a>
 
 						</li>
 
-						<li >
 
-	  					
-	  					<a href="/hisImplement/alerpts" <!-- if {{item}}=="alerpts" --> class="now" <!-- endif --> >已执行</a>
 
-	  					</li>
 
+						
+						<li>
 
+							<select name="status" node-implement>
 
+							<option <!-- if {{status}}=="pendImplement" --> selected <!-- endif --> value="pendImplement">待执行</option>
 
+							<option <!-- if {{status}}=="alerpts" --> selected <!-- endif --> value="alerpts">已执行</option>
 
+							</select>
 
+						</li>
 
+						
 						<li><input type="date" name="date" id="date" value="{{rdate}}" onChange="receiptDate();" style="width:120px"></li>
 
 						
 						<li>
 
@@ -61,7 +64,7 @@
 
 	  			<input type="hidden" name="remittanceInfo" value='{{remittanceList}}'  />
 
 	  			<ul class="cateList ">
 
 	  			<li>
 
-	  			<input type="submit" class="button" value="导出汇款信息">
 
+	  			<input type="submit" class="button" value="导出收款信息">
 
 	  			</ul>
 
 	  			</form>
 
 	  		</div>

+ 24 - 24
protected/view/admin/implement.html
查看文件 

@@ -102,24 +102,24 @@
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -162,24 +162,24 @@
 
 							<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 							<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 							
-							<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+							<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -319,24 +319,24 @@
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -506,24 +506,24 @@
 
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->

+ 10 - 10
protected/view/admin/invoiceAggregateCategoryDetail.html
查看文件 

@@ -46,23 +46,23 @@
 
 									<tbody>
 
 									<tr><th class="taC" width="55">姓名</th>
 
 									
-									<th class="taC">{{month}}月开票金额</th>
 
-									<th class="taC">{{month}}月收款金额</th>
 
-									<th class="taC">{{month}}月入账金额</th>
 
+									<th class="taC">{{month}}月开票</th>
 
+									<th class="taC">{{month}}月收款</th>
 
+									<th class="taC">{{month}}月入账</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><th class="taC" width="90">入账完成度</th></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><th class="taC" width="90">入账完成度</th></tr>
 
 									<!-- loop slist -->
 
 									<tr>
 
 										<td>{{slist' value.username}}</td>
 
 										<td>￥{{slist' value.invoiceMonthPrice}}</td>
 
 										<td>￥{{slist' value.receivablesMonthPrice}}</td>
 
 										<td>￥{{slist' value.accountMonthPrice}}</td>
 
-										<td><a href="javascript:void(0)">￥{{slist' value.invoicePrice}}</a></td>
 
-										<td><a href="javascript:void(0)">￥{{slist' value.receivablesPrice}}</a></td>
 
-										<td><a href="javascript:void(0)">￥{{slist' value.accountPrice}}</a></td>
 
+										<td><a href="/invoiceAggregateStaffDetail?&sidKey={{slist' value.sidKey}}">￥{{slist' value.invoicePrice}}</a></td>
 
+										<td><a href="/invoiceAggregateStaffReceivablesDetail?&sidKey={{slist' value.sidKey}}&timeType=CREATE">￥{{slist' value.receivablesPrice}}</a></td>
 
+										<td><a href="/invoiceAggregateStaffReceivablesDetail?&sidKey={{slist' value.sidKey}}&timeType=BINDOTP">￥{{slist' value.accountPrice}}</a></td>
 
 										<td>￥{{slist' value.invoiceAllPrice}}</td>
 
 										<td>￥{{slist' value.receivablesAllPrice}}</td>
 
 										<td>￥{{slist' value.accountAllPrice}}</td>

+ 0 - 11
protected/view/admin/invoiceApprovalAchieve.html
查看文件 

@@ -61,11 +61,6 @@
 
 					</ul>
 
 					</form>
 
 				
-				
-				
-				
-				
-					
 				</div>
 
 				<div class="saeaList">
 
 				
@@ -104,10 +99,6 @@
 
 					</table>
 
 				
 				
-				
-				
-				
-				
 					
 				</div>
 
 						  		
@@ -117,8 +108,6 @@
 
 	</div>
 
 	
 	
-	
-	
 <div loading-msg='true' style="position:absolute;  left:50%;  top:50%;  "></div>
 
 	<div class="modal  fade" id="approvalInvice">

+ 13 - 1
protected/view/admin/invoicePrintDetail.html
查看文件 

@@ -144,7 +144,19 @@
 
 									</blockquote>
 
 									<!-- endloop -->
 
 							</td><td>
 
-								<p><span class="colRed">*</span>No.<input name="invoiceNo" value="" type="text" placeholder="输入发票号"></p><br>
 
+								<p><span class="colRed">*</span>
 
+								<select name="invoiceNo" style="width:97%">
 
+								
+								<!-- loop invoicePaperList -->
 
+								<option value="{{invoicePaperList' value.ipidKey}}">No.{{invoicePaperList' value.invoiceNo}}</option>
 
+								<!-- endloop -->
 
+								</select>
 
+								
+								
+								
+								
+								
+								</p><br>
 
 								<div class="invoButton clearfix">
 
 									<input type="submit" class="buttonDone buttonBlock"  data-placement="top" data-toggle="ctooltip" data-original-title="完成后自动跳转下一张发票" value="完成打印">
 
 								</div></td></tr>

+ 12 - 12
protected/view/admin/receiptburEdi.html
查看文件 

@@ -120,24 +120,24 @@
 
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->
 
@@ -226,24 +226,24 @@
 
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->

+ 11 - 11
protected/view/admin/remitAdd.html
查看文件 

@@ -138,32 +138,32 @@
 
 							</tr>
 
 	  						
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
-							<td><input type="text" name="remittanceName" id="remittanceName"  value="" placeholder="请输入汇款人户名" ></td>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
+							<td><input type="text" name="remittanceName" id="remittanceName"  value="" placeholder="请输入收款人户名" ></td>
 
 							</tr>
 
 							
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<select node-rbt name="remittanceBankType">
 
-							<option value="0">公司广发</option>
 
+							<option value="0">广发银行</option>
 
 							<option value="1">其他</option>
 
 							</select>
 
 							</td>
 
 							</tr>
 
 							
-							<tr><th>汇款开户银行名称</th><td>
 
-							<input type="text" name="bankName" id="bankName" value="" placeholder="请输入汇款开户银行名称" >
 
+							<tr><th>收款开户银行名称</th><td>
 
+							<input type="text" name="bankName" id="bankName" value="" placeholder="请输入收款开户银行名称" >
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
-							<input type="text" placeholder="请输入汇款帐号" id="bankNumber" name="bankNumber" value="">
 
+							<tr><th>收款账号</th><td>
 
+							<input type="text" placeholder="请输入收款账号" id="bankNumber" name="bankNumber" value="">
 
 							</td></tr>
 
-							<tr node-cn style="display:none"><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是公司广发，务必填上银行联行号）</span></th><td>
 
+							<tr node-cn style="display:none"><th>联行号&nbsp;&nbsp;<span class="colRed">（如果不是广发银行，务必填上银行联行号）</span></th><td>
 
 							<input type="text" placeholder="请输入联行号" id="coupletNumber" name="coupletNumber" value="">
 
 							</td></tr>
 
 	  						
-	  						<tr><th colspan="2" class="taC">对公汇款说明</th></tr>
 
+	  						<tr><th colspan="2" class="taC">对公收款说明</th></tr>
 
 	  						<tr><th colspan="2">
 
 	  									<textarea name="explanation" id="explanation" required="" rows="8" style="width:99%;resize: vertical" placeholder="正确填写收款单位的名称、开户行、账号；详细填写费用用途。"></textarea>
 
 	  						</th></tr>

+ 6 - 6
protected/view/admin/remitApproval.html
查看文件 

@@ -75,24 +75,24 @@
 
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 
 	  						
 	  						
-	  						<tr><th colspan="2" class="taC">汇款信息</th></tr>
 
-							<tr><th>汇款人户名</th>
 
+	  						<tr><th colspan="2" class="taC">收款信息</th></tr>
 
+							<tr><th>收款人户名</th>
 
 							<td>{{receiptDetail' value.remittanceName}}</td>
 
 							</tr>
 
 							<tr>
 
-							<th>汇款银行</th>
 
+							<th>收款银行</th>
 
 							<td>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==0 -->
 
-							公司广发
 
+							广发银行
 
 							<!-- elseif {{receiptDetail' value.remittanceBankType}}==1 -->
 
 							其他
 
 							<!-- endif -->
 
 							</td>
 
 							</tr>
 
-							<tr><th>汇款开户银行名称</th><td>
 
+							<tr><th>收款开户银行名称</th><td>
 
 							{{receiptDetail' value.bankName}}
 
 							</td></tr>
 
-							<tr><th>汇款帐号</th><td>
 
+							<tr><th>收款账号</th><td>
 
 							{{receiptDetail' value.bankNumber}}
 
 							</td></tr>
 
 							<!-- if {{receiptDetail' value.remittanceBankType}}==1 -->

+ 10 - 10
protected/view/admin/remitEdit.html
查看文件 

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

+ 10 - 10
protected/view/admin/saeaLoanAdd.html
查看文件 

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

+ 10 - 10
protected/view/admin/saeaLoanAddReceipt.html
查看文件 

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

+ 10 - 10
protected/view/admin/saeaLoanEdi.html
查看文件 

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

+ 10 - 10
protected/view/admin/saeaLoanEdiReceipt.html
查看文件 

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

+ 10 - 10
protected/view/admin/saea_create.html
查看文件 

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

+ 17 - 8
protected/view/admin/saea_edit.html
查看文件 

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