caipin před 7 roky
rodič
revize
c514b4cb63

+ 27 - 9
global/css/global.css

@@ -130,17 +130,18 @@ a.disenable{color:#ccc}
 }
 @font-face {
   font-family: 'ZHcldSystem';
-  src:url('fonts/ZHcldSystem.eot');
-  src:url('fonts/ZHcldSystem.eot?#iefix') format('embedded-opentype'),
-    url('fonts/ZHcldSystem.ttf') format('truetype'),
-    url('fonts/ZHcldSystem.woff') format('woff'),
-    url('fonts/ZHcldSystem.svg#ZHcldSystem') format('svg');
+  src:  url('fonts/ZHcldSystem.eot?ox6e11');
+  src:  url('fonts/ZHcldSystem.eot?ox6e11#iefix') format('embedded-opentype'),
+    url('fonts/ZHcldSystem.ttf?ox6e11') format('truetype'),
+    url('fonts/ZHcldSystem.woff?ox6e11') format('woff'),
+    url('fonts/ZHcldSystem.svg?ox6e11#ZHcldSystem') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
-[class*="icon-"] {
-  font-family: 'ZHcldSystem';
+[class^="icon-"], [class*=" icon-"] {
+  /* use !important to prevent issues with browser extensions that change fonts */
+  font-family: 'ZHcldSystem' !important;
   speak: none;
   font-style: normal;
   font-weight: normal;
@@ -1444,6 +1445,10 @@ border-color: #d6e9c6;
 .lockRecord .toolItem form{
   margin:10px
 }
+.contactTableHead .buildingUl{
+  background: #F7F7F7 url(headerbg.png) repeat;
+  color:#BABABA;
+}
 .modal-body .contactsTag{
   color:#fff
 }
@@ -2021,6 +2026,14 @@ table .taC{
 .saeaList .entry table th .repMark .rmUdone{
   color:#F89406;
 }
+.saeaList td sup {
+  color:#fff;
+  vertical-align: top;
+  margin-left: 5px;
+  background: #f00;
+  padding:0 3px;
+  font-size: 10px
+}
 .saeaList .entry .seal {
   width:186px;
   height:96px;
@@ -3783,8 +3796,13 @@ td div.dlLev3{
 .btn-undone:active{
   background:#2a4f00;
 }
-
-
+.copy{
+  margin-bottom: 5px;
+  background:#fff;
+  color:#333;
+  padding:2px 10px;
+  border:1px solid #ccc;
+}
 
 
 .search-dataTablestran{

+ 7 - 1
global/js/global.js

@@ -1,9 +1,15 @@
-function setSearchLo(className){
+function setSearchLo(className,left){
 	$('#example_filter').addClass("search-dataTables"+className);
+	
+	$('#example_filter').css({'left':left});
+	
 	$('#example_filter label').addClass("dataTables-label");
 	$('#example_filter input').addClass("dataTables-input");
 }
 
+
+
+
 function autoFlashHeight(){
   var infoHeight = $(".contactInfo").height();
   var headerHeight = $(".header").height();

+ 6 - 3
global/js/invoice.js

@@ -131,6 +131,9 @@ $(function() {
 	$('select[node-invoiceTrain]').change(function() {
 		 $('#iaa').submit();
 	});
+	$('select[node-invoiceTrainName]').change(function() {
+		 $('#iaa').submit();
+	});
 	/**
 	 * 废弃方法
 	$('button[node-irmMebSea]').click(function() {
@@ -154,11 +157,11 @@ $(function() {
 		
 		 var irmMebSea=$('input[data-irmMebSea]').val();
 		 
-		 var action = $('#ira').attr("action");
+		 var action = $('#iaa').attr("action");
 		 action=encodeURI(action+"/"+irmMebSea);
 		 
-		 $('#ira').attr("action",action);
-		 $('#ira').submit();
+		 $('#iaa').attr("action",action);
+		 $('#iaa').submit();
 	});
 	
 	$('a[node-rtm]').click(function() {

+ 33 - 14
protected/cache/staffCollect/staffCollect_2015_.htmls

@@ -27,7 +27,7 @@
 
 <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="/invoice" class="icon- ">D</a></li>
  
  <li data-placement="right" data-toggle="ctooltip" data-original-title="邮件推广">  
 <a href="/eMailTask" class="icon- ">Z</a></li>
@@ -51,7 +51,7 @@
 	<li><a href="/personalCollect"  >费用汇总</a></li>
 						
 							
-	<li  class="topLine  news  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
+	<li  class="topLine  "><a  href="/approvalExpenses/pendApproval">费用审批</a></li>
 						
 		<li  class="news"  ><a  href="/hisImplement">费用执行</a></li>			
 					
@@ -136,6 +136,25 @@
 <option  value="2016">2016</option>
 <option  value="2017">2017</option>
 <option  value="2018">2018</option>	  					</select> 
+	  					
+	  					
+	  					<select onchange="javascript:location.href=this.value;">
+	<option value="/staffCollect">全年</option>
+	<option value="/staffCollectMonthDetail/2015/1">1月</option>
+	<option value="/staffCollectMonthDetail/2015/2">2月</option>
+	<option value="/staffCollectMonthDetail/2015/3">3月</option>
+	<option value="/staffCollectMonthDetail/2015/4">4月</option>
+	<option value="/staffCollectMonthDetail/2015/5">5月</option>
+	<option value="/staffCollectMonthDetail/2015/6">6月</option>
+	<option value="/staffCollectMonthDetail/2015/7">7月</option>
+	<option value="/staffCollectMonthDetail/2015/8">8月</option>
+	<option value="/staffCollectMonthDetail/2015/9">9月</option>
+	<option value="/staffCollectMonthDetail/2015/10">10月</option>
+	<option value="/staffCollectMonthDetail/2015/11">11月</option>
+	<option value="/staffCollectMonthDetail/2015/12">12月</option>
+	</select>
+	  					
+	  					
 	  </li>
 
 	<li>报销总计:¥0</li>
@@ -151,18 +170,18 @@
 	  						<tr>
 	  						<th  class="taC"></th>
 	  						<th width="110" class="taC">员工/月</th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/1">1月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/2">2月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/3">3月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/4">4月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/5">5月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/6">6月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/7">7月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/8">8月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/9">9月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/10">10月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/11">11月</a></th>
-	  						<th class="taC" width="80"><a href="/staffCollectMonthDetail/2015/12">12月</a></th>
+	  						<th class="taC" width="80">1月</th>
+	  						<th class="taC" width="80">2月</th>
+	  						<th class="taC" width="80">3月</th>
+	  						<th class="taC" width="80">4月</th>
+	  						<th class="taC" width="80">5月</th>
+	  						<th class="taC" width="80">6月</th>
+	  						<th class="taC" width="80">7月</th>
+	  						<th class="taC" width="80">8月</th>
+	  						<th class="taC" width="80">9月</th>
+	  						<th class="taC" width="80">10月</th>
+	  						<th class="taC" width="80">11月</th>
+	  						<th class="taC" width="80">12月</th>
 	  						<th class="taC" width="110">总计</th>
 	  						</tr>
 	  							  						<tr>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 100 - 33
protected/controller/InvoiceController.php


+ 2 - 2
protected/controller/ReceiptController.php

@@ -12011,9 +12011,9 @@ class ReceiptController extends DooController {
 			
 			$num = $num / 10;
 			// echo $num.'</br>';
-			// $num = (int)$num;
+			 $num = (int)$num;
 			// $num =floor($num);
-			$num = round ( $num, 0, PHP_ROUND_HALF_DOWN );
+			 //$num = round ( $num, 0, PHP_ROUND_HALF_DOWN );
 			// echo $num.'</br>';
 			// 结束循环
 			if ($num == 0) {

+ 37 - 21
protected/model/invoiceTraining.php

@@ -54,15 +54,14 @@ class invoiceTraining extends DooModel {
 		}
 		return $itid;
 	}
-	function getInvoiceTrainStatistics($itid=0) {
-		
-		$itidCondition=' and trainId=NULL ';
-		if (!empty($itid))
-			$itidCondition=' and trainId in ('.$itid.') ';
+	function getInvoiceTrainStatistics($itid = 0) {
+		$itidCondition = ' and trainId=NULL ';
+		if (! empty ( $itid ))
+			$itidCondition = ' and trainId in (' . $itid . ') ';
 		
 		$sql = 'select sum(invoicePrice) as invoicePrice ,trainId
 				from CLD_invoice
-				where status=2 and printStatus=1 and (untreadStatus =0 or untreadStatus=3) '.$itidCondition.'
+				where status=2 and printStatus=1 and (untreadStatus =0 or untreadStatus=3) ' . $itidCondition . '
 				GROUP BY status';
 		$query = Doo::db ()->query ( $sql );
 		$result = $query->fetchAll ();
@@ -76,18 +75,16 @@ class invoiceTraining extends DooModel {
 					'invoicePrice' => 0 
 			);
 			// print_r($result);
-		$itidCondition=' and a.trainId=NULL ';
-		if (!empty($itid))
-			$itidCondition=' and a.trainId in ('.$itid.') ';
+		$itidCondition = ' and a.trainId=NULL ';
+		if (! empty ( $itid ))
+			$itidCondition = ' and a.trainId in (' . $itid . ') ';
 		$sql = 'select sum(b.receivablesPrice) as receivablesPrice ,a.trainId,count(*) as count
 				from CLD_invoice as a left join CLD_invoiceReceivables as b on find_in_set(b.irid,a.irid)
-				where  a.status=2 and a.printStatus=1 and (a.untreadStatus =0 or a.untreadStatus=3) and a.irid!="" '.$itidCondition.'
+				where  a.status=2 and a.printStatus=1 and (a.untreadStatus =0 or a.untreadStatus=3) and a.irid!="" ' . $itidCondition . '
 				GROUP BY a.status';
 		$query = Doo::db ()->query ( $sql );
 		$result = $query->fetchAll ();
 		
-		
-		
 		if (! empty ( $result )) {
 			$detail += array (
 					'receivablesPrice' => $result [0] ['receivablesPrice'] 
@@ -105,14 +102,14 @@ class invoiceTraining extends DooModel {
 		}
 		return $detail;
 	}
-	function getInvoiceTrainingByTodo($select = "", $cid = 0,$sid=0) {
+	function getInvoiceTrainingByTodo($select = "", $cid = 0, $sid = 0) {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
 		Doo::loadModel ( 'L_category' );
 		$lCategory = new L_category ();
 		
 		$condition = array (
-				'where' => "(status= 0 or status=1) and ( cid=" . $cid." or creator=".$sid." )",
+				'where' => "(status= 0 or status=1) and ( cid=" . $cid . " or creator=" . $sid . " )",
 				'limit' => 8,
 				'asArray' => TRUE 
 		);
@@ -139,7 +136,7 @@ class invoiceTraining extends DooModel {
 		Doo::loadModel ( 'invoice' );
 		$invoice = new invoice ();
 		
-		$invoiceList=$invoiceRecelvablesList=array();
+		$invoiceList = $invoiceRecelvablesList = array ();
 		if (! empty ( $itid )) {
 			$itidSql = implode ( ',', $itid );
 			$invoiceList = $invoice->sumOfinvoiceTrain ( $itidSql );
@@ -198,14 +195,14 @@ class invoiceTraining extends DooModel {
 	 * 根据状态获取培训班
 	 * @param number $status
 	 */
-	function getInvoiceTrainingByStatus($status = 0, $select = "", $cid = 0,$sid=0) {
+	function getInvoiceTrainingByStatus($status = 0, $select = "", $cid = 0, $sid = 0) {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
 		Doo::loadModel ( 'L_category' );
 		$lCategory = new L_category ();
 		
 		$condition = array (
-				'where' => "status= '" . $status . "' and  (cid=" . $cid." or creator=".$sid." )",
+				'where' => "status= '" . $status . "' and  (cid=" . $cid . " or creator=" . $sid . " )",
 				'limit' => 8,
 				'asArray' => TRUE 
 		);
@@ -261,14 +258,33 @@ class invoiceTraining extends DooModel {
 			$this->delete ( array (
 					'where' => 'itid=' . $itid 
 			) );
-		//删除培训班下的发票
+			// 删除培训班下的发票
 		Doo::loadModel ( 'invoiceStore' );
 		$invoiceStore = new invoiceStore ();
 		
-		$invoiceStore->delete(array (
-				'where' => 'trainId=' . $itid
-		));
+		$invoiceStore->delete ( array (
+				'where' => 'trainId=' . $itid 
+		) );
+	}
+	
+	/**
+	 * 获得所有培训班
+	 */
+	function getInvoiceTrainingBySubmitStatus() {
+		$condition = array (
+				'where' => "submitStatus=1",
+				'asArray' => TRUE 
+		);
+		
+		$list = $this->find ( $condition );
 		
+		Doo::loadClass ( 'XDeode' );
+		$XDeode = new XDeode ( 5 );
+		foreach ( $list as $key => $value ) {
+			$list[$key] ['itidKey'] = $XDeode->encode ( $value ['itid'] );
+		}
+		
+		return $list;
 	}
 }
 

+ 1 - 1
protected/model/receipt.php

@@ -76,7 +76,7 @@ class receipt extends DooModel {
     		return array();
     	$sql = 'select a.*
 				from ' . $this->_table . ' as a left join CLD_receiptDetail as b on b.rid=a.rid
-				where b.staff =' . $sid . ' and Month(b.date)=' . $month . ' and Year(b.date)=' . $year.' and b.status=1
+				where b.staff =' . $sid . ' and Month(b.pastDate)=' . $month . ' and Year(b.pastDate)=' . $year.' and b.status=1
 				GROUP BY b.rid';
     	
     	$query = Doo::db ()->query ( $sql );

+ 20 - 4
protected/view/admin/invoiceApprovalAchieve.html

@@ -44,11 +44,24 @@
 							</select>
 						</li>
 						<li>
-							<select name="invoiceTrain" node-invoiceTrain >
+							<select name="invoiceTrain" node-invoiceTrain id="sel">
+								<option <!-- if {{invoiceTrain}}=='ALL' --> selected <!-- endif --> value="ALL">所有</option>
 								<option <!-- if {{invoiceTrain}}=='ORDINARY' --> selected <!-- endif --> value="ORDINARY">个人发票</option>
 								<option <!-- if {{invoiceTrain}}=='TRAIN' --> selected <!-- endif --> value="TRAIN">培训班发票</option>
 							</select>
 						</li>
+						<!-- if {{invoiceTrain}}=='TRAIN' -->
+						<li>
+						<select name="invoiceTrainName" node-invoiceTrainName style="width:150px;">
+								<option <!-- if {{invoiceTrainName}}=='ALL' --> selected <!-- endif --> value="ALL"">所有</option>
+								<!-- loop trainList -->
+								<option <!-- if {{invoiceTrainName}}=={{trainList' value.itidKey}} --> selected <!-- endif --> value="{{trainList' value.itidKey}}">{{trainList' value.trainName}}</option>
+								<!-- endloop -->
+								
+							</select>
+							
+						</li>
+						<!-- endif -->
 						<li>
 						<div class="search">
 								<div class="input-append">
@@ -152,6 +165,7 @@ $(document).ready( function () {
                    "status": '{{status}}',
                    'invoiceType':'{{invoiceType}}',
                    'invoiceTrain':'{{invoiceTrain}}',
+                   'invoiceTrainName':'{{invoiceTrainName}}',
                    'date':'{{dateString}}',
                  } );
                }
@@ -159,9 +173,11 @@ $(document).ready( function () {
 
     });
 	
-	
-	 setSearchLo('approval');
-	
+	<!-- if {{invoiceTrain}}=='TRAIN' -->
+	 setSearchLo('approval','850px');
+	<!-- else -->
+	setSearchLo('approval');
+	<!-- endif -->
 } );
 
 function nodeInvoiceApproval(iidKey){

+ 37 - 2
protected/view/admin/invoicePostAchieve.html

@@ -22,21 +22,56 @@
 					已邮寄发票
 				</legend>
 				<div class="demandCate">
+				<form action="/invoicePostAchieve/1/{{date}}" id="iaa" method="get" >
+				
 					<ul class="cateList">
 						<li><a <!-- if {{date}}=='MONTHO' --> class="now" <!-- endif --> href="/invoicePostAchieve/1/MONTHO/{{MebSea}}">最近一个月</a>
 	  					<a <!-- if {{date}}=='MONTHT' --> class="now" <!-- endif --> href="/invoicePostAchieve/1/MONTHT/{{MebSea}}">最近三个月</a>
 	  					<a <!-- if {{date}}=='MONTHY' --> class="now" <!-- endif --> href="/invoicePostAchieve/1/MONTHY/{{MebSea}}" >今年</a>
 	  					<a <!-- if {{date}}=='MONTHA' --> class="now" <!-- endif --> href="/invoicePostAchieve/1/MONTHA/{{MebSea}}" >更旧</a></li>
+	  					
+	  					
+	  					
+	  					<li>
+							<select name="invoiceType" node-invoiceType >
+								<option <!-- if {{invoiceType}}=='ALL' --> selected <!-- endif --> value="ALL">类型</option>
+								<option <!-- if {{invoiceType}}=='ORDINARY' --> selected <!-- endif --> value="ORDINARY">普通发票</option>
+								<option <!-- if {{invoiceType}}=='SPECIAL' --> selected <!-- endif --> value="SPECIAL">专用发票</option>
+							</select>
+						</li>
+						<li>
+							<select name="invoiceTrain" node-invoiceTrain >
+								<option <!-- if {{invoiceTrain}}=='ALL' --> selected <!-- endif --> value="ALL">所有</option>
+								<option <!-- if {{invoiceTrain}}=='ORDINARY' --> selected <!-- endif --> value="ORDINARY">个人发票</option>
+								<option <!-- if {{invoiceTrain}}=='TRAIN' --> selected <!-- endif --> value="TRAIN">培训班发票</option>
+							</select>
+						</li>
+						<!-- if {{invoiceTrain}}=='TRAIN' -->
+						<li>
+						<select name="invoiceTrainName" node-invoiceTrainName >
+								<option <!-- if {{invoiceTrainName}}=='ALL' --> selected <!-- endif --> value="ALL"">所有</option>
+								<!-- loop trainList -->
+								<option <!-- if {{invoiceTrainName}}=={{trainList' value.itidKey}} --> selected <!-- endif --> value="{{trainList' value.itidKey}}">{{trainList' value.trainName}}</option>
+								<!-- endloop -->
+								
+							</select>
+							
+						</li>
+						<!-- endif -->
+	  					
+	  					
 						<li>
 							<div class="search">
 								<div class="input-append">
-									<form action="/invoicePostAchieve/1/{{date}}" id="ira" method="get" >
+									
 								<input class="span3" type="text"  data-irmMebSea value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
 								<button class="btn btn-small" node-iramMebSea type="button">搜索</button>
-								</form>
+								
 								</div>
 							</div></li>
 					</ul>
+					
+					</form>
 				</div>
 				<div class="saeaList">
 					<table class="table table-hover">

+ 1 - 1
protected/view/admin/invoicePrintAchieve.html

@@ -30,7 +30,7 @@
 						<li>
 							<div class="search">
 								<div class="input-append">
-									<form action="/invoicePrintAchieve/1/{{date}}" id="ira" method="get" >
+									<form action="/invoicePrintAchieve/1/{{date}}" id="iaa" method="get" >
 								<input class="span3" type="text"  data-irmMebSea value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
 								<button class="btn btn-small" node-iramMebSea type="button">搜索</button>
 								</form>

+ 31 - 1
protected/view/admin/invoicePrintStayAchieve.html

@@ -28,7 +28,7 @@
 					已打印发票
 				</legend>
 				<div class="demandCate">
-				<form action="/invoicePrintStayAchieve/1/{{status}}"  method="get" >
+				<form action="/invoicePrintStayAchieve/1/{{status}}"  id="iaa" method="get" >
 				
 				
 					<ul class="cateList">
@@ -37,6 +37,36 @@
 	  					<a <!-- if {{status}}=='PRINTED' --> class="now" <!-- endif --> href="/invoicePrintStayAchieve/1/PRINTED" >已打印</a></li>
 	  					
 	  					
+	  					
+	  					<li>
+							<select name="invoiceType" node-invoiceType >
+								<option <!-- if {{invoiceType}}=='ALL' --> selected <!-- endif --> value="ALL">类型</option>
+								<option <!-- if {{invoiceType}}=='ORDINARY' --> selected <!-- endif --> value="ORDINARY">普通发票</option>
+								<option <!-- if {{invoiceType}}=='SPECIAL' --> selected <!-- endif --> value="SPECIAL">专用发票</option>
+							</select>
+						</li>
+						<li>
+							<select name="invoiceTrain" node-invoiceTrain >
+								<option <!-- if {{invoiceTrain}}=='ALL' --> selected <!-- endif --> value="ALL">所有</option>
+								<option <!-- if {{invoiceTrain}}=='ORDINARY' --> selected <!-- endif --> value="ORDINARY">个人发票</option>
+								<option <!-- if {{invoiceTrain}}=='TRAIN' --> selected <!-- endif --> value="TRAIN">培训班发票</option>
+							</select>
+						</li>
+						<!-- if {{invoiceTrain}}=='TRAIN' -->
+						<li>
+						<select name="invoiceTrainName" node-invoiceTrainName style="width:150px;">
+								<option <!-- if {{invoiceTrainName}}=='ALL' --> selected <!-- endif --> value="ALL"">所有</option>
+								<!-- loop trainList -->
+								<option <!-- if {{invoiceTrainName}}=={{trainList' value.itidKey}} --> selected <!-- endif --> value="{{trainList' value.itidKey}}">{{trainList' value.trainName}}</option>
+								<!-- endloop -->
+								
+							</select>
+							
+						</li>
+						<!-- endif -->
+	  					
+	  					
+	  					
 	  					<li>
 							<div class="search">
 								<div class="input-append">

+ 1 - 1
protected/view/admin/invoiceUntreadAchieve.html

@@ -30,7 +30,7 @@
 						<li>
 							<div class="search">
 								<div class="input-append">
-									<form action="/invoiceUntreadAchieve/1/{{date}}" id="ira" method="get" >
+									<form action="/invoiceUntreadAchieve/1/{{date}}" id="iaa" method="get" >
 								<input class="span3" type="text"  data-irmMebSea value="{{MebSeaEn}}" placeholder="发票抬头、开票金额">
 								<button class="btn btn-small" node-iramMebSea type="button">搜索</button>
 								</form>

+ 1 - 1
protected/view/admin/receiptStatisticsStaffDetail.html

@@ -28,7 +28,7 @@
 				<legend><div class="fL"><a class="icon- crumb" href="/staffCollectMonthDetail/{{year}}/{{month}}" title="返回上级">b</a></div>{{usernameEN}} {{month}}月费用列表</legend>
 				<div class="demandCate">
 					<ul class="cateList">
-	  					<li><a href="saea-dlist-category-month-detail.html">办事处</a><a href="#" class="now">员工</a></li>
+	  					<li><a href="/companyCategoryCollect">办事处</a><a href="#" class="now">员工</a></li>
 	  					<li><select name="year" id="Y" onchange="receiptYear();">
 	  					<!-- include 'year' -->
 	  					</select> 

+ 2 - 2
protected/view/admin/staffCollectMonthDetail.html

@@ -109,10 +109,10 @@
 							</tr>
 	  				</thead>
 	  					<tbody>
-	  					
+	  						
 	  						<!-- loop list -->
 	  						<tr>
-	  						<th><a href="/receiptStatisticsStaffDetail?&username={{list' value.usernameEn}}&year={{year}}&month={{month}}">{{list' key}}</a></th>
+	  						<th><a href="/receiptStatisticsStaffDetail?&username={{list' value.usernameEn}}&year={{year}}&month={{month}}"  >{{list' key}}</a></th>
 	  						
 	  						<!-- loop list' value -->
 	  						<!-- if {{list' value' key}}=='monthStaffPrice' -->