费用修改

protected/view/admin/approvalExpenses.html

@@ -27,20 +27,23 @@
 				</legend>
 				
 				<div class="demandCate">
-				<form action="/approvalExpenses" id="up" method="post">
-				<input type="hidden" name="status" value="{{status}}"></input>
+				<form action="/approvalExpenses/{{status}}" id="up" method="get">
+				
 					
 	  				
-	  				<ul class="cateList">
+	  				<ul class="   cateList  " >
 	  					<li>
-	  					<a <!-- if {{status}}==0 --> class="now" <!-- endif --> href="/approvalExpenses/0">全部</a>
-	  					<a  <!-- if {{status}}==2 --> class="now" <!-- endif --> href="/approvalExpenses/2">需要我审</a>
-	  					<a <!-- if {{status}}==5 --> class="now" <!-- endif --> href="/approvalExpenses/5">审批中</a>
-	  					<a <!-- if {{status}}==1 --> class="now" <!-- endif --> href="/approvalExpenses/1">执行中</a>
-	  					<a  <!-- if {{status}}==8 --> class="now" <!-- endif --> href="/approvalExpenses/8">费用完成</a>
-	  					<a <!-- if {{status}}==4 --> class="now" <!-- endif --> href="/approvalExpenses/4" >撤回</a>
-	  					<a <!-- if {{status}}==3 --> class="now" <!-- endif --> href="/approvalExpenses/3">终止</a>
+	  					
+	  					<a <!-- if {{status}}=='pendApproval' --> class="now" <!-- endif --> href="/approvalExpenses/pendApproval">待审批</a>
+	  					<a <!-- if {{status}}=='ongoing' --> class="now" <!-- endif --> href="/approvalExpenses/ongoing">进行中</a>
+	  					<a  <!-- if {{status}}=='done' --> class="now" <!-- endif --> href="/approvalExpenses/done">费用完成</a>
+	  					<a <!-- if {{status}}=='termination' --> class="now" <!-- endif --> href="/approvalExpenses/termination">终止</a>
+	  					
+	  					
+	  					
 	  					</li>
+	  					
+	  					<!-- if {{status}}=='done' || {{status}}=='termination' --> 
 	  					<li>
 						<select name="year" id="Y" onChange="receiptYear();">
 	  					
@@ -51,6 +54,7 @@
 	  					{{mothHtml}}
 	  					</select>
 						</li>
+						
 	  					<li>
 	  						<select name="cid" onChange="receiptYear();">
 	  						<option value="">办事处</option>
@@ -65,6 +69,7 @@
 	  						<!-- endloop -->
 	  						</select>
 	  					</li>
+	  					<!-- endif -->
 	  				</ul>
 	  				
 	  				
@@ -109,6 +114,8 @@
 	  							执行中
 	  							<!-- elseif {{receiptDetail' value.status}}==8 or {{receiptDetail' value.status}}==9 --> 
 	  							 费用完成
+	  							 <p class="colGray">{{receiptDetail' value.pastDate}}</p>
+	  							 
 	  							 <!-- elseif {{receiptDetail' value.status}}==4 --> 
 	  							 撤回
 	  							  <!-- elseif {{receiptDetail' value.status}}==3 --> 
@@ -138,23 +145,23 @@
 	  					</tbody>
 	  				
 	  				</table>
-	  			<!-- if {{status}}==0 --> 
+	  			<!-- if {{status}}=='done' || {{status}}=='termination' --> 
 	  				<ul class="pagination fR">
 	  							<!-- if {{page.previous}}==0 -->
 								<li><a href="javascript:void(0)" title="上一页">&lt;</a></li>
 								<!-- else -->
-								<li><a href="/approvalExpenses/0/{{page.previous}}" title="上一页">&lt;</a></li>
+								<li><a href="/approvalExpenses/{{status}}/{{page.previous}}" title="上一页">&lt;</a></li>
 								<!-- endif -->	
 	  							<!-- if {{page.on_page}}>=3 -->
-	  							<li><a href="/approvalExpenses/0/1" title="上一页">1</a></li>
+	  							<li><a href="/approvalExpenses/{{status}}/1" title="上一页">1</a></li>
 	  							<li class="point"><span>...</span></li>
 	  							<!-- endif -->
 	  							
 	  							{{page.page}}
 	  							
 	  							<!-- if {{page.on_page}}<3 && {{page.total_page}}>5 -->
-	  							<li><a href="/approvalExpenses/0/4" >4</a></li>
-	  							<li><a href="/approvalExpenses/0/5" >5</a></li>
+	  							<li><a href="/approvalExpenses/{{status}}/4" >4</a></li>
+	  							<li><a href="/approvalExpenses/{{status}}/5" >5</a></li>
 	  							<!-- endif -->
 	  							
 	  							<!-- if {{page.total_page}}>3 -->
@@ -164,7 +171,7 @@
 			  					<!-- if {{page.next}}=={{page.on_page}} -->
 								<li><a href="javascript:void(0)" title="下一页">&gt;</a></li>
 								<!-- else -->
-								<li><a href="/approvalExpenses/0/{{page.next}}" title="下一页">&gt;</a></li>
+								<li><a href="/approvalExpenses/{{status}}/{{page.next}}" title="下一页">&gt;</a></li>
 								<!-- endif -->
 			  					
 			  		</ul>

protected/view/admin/receipt_menu.html

@@ -6,7 +6,7 @@
 						
 	<!-- if inarray({{staff.0.sid}},{{verifyId}}) || inarray({{staff.0.sid}},{{executeId}}) -->
 						
-	<li  class="topLine <!-- if  getGlobals('NEW') !=0 --> news <!-- endif --> "><a <!-- if {{receiptMemu}}=="approvalExpenses" --> class="selected" <!-- endif --> href="/approvalExpenses">费用审批</a></li>
+	<li  class="topLine <!-- if  getGlobals('NEW') !=0 --> news <!-- endif --> "><a <!-- if {{receiptMemu}}=="approvalExpenses" --> class="selected" <!-- endif --> href="/approvalExpenses/pendApproval">费用审批</a></li>
 						
 	<!-- if inarray({{staff.0.sid}},{{executeId}}) -->
 	<li <!-- if  getGlobals('NEW2') !=0 --> class="news" <!-- endif --> ><a <!-- if {{receiptMemu}}=="implement" --> class="selected" <!-- endif --> href="/hisImplement">费用执行</a></li>