Browse Source

特工更改的3个页面

likeku 8 years ago
parent
commit
a78dab2c23

+ 13 - 13
protected/view/admin/expensesEdi.html

@@ -164,6 +164,19 @@
 		  					<div class="title">
 		  					<div class="title">
 		  					{{receiptDetail' value.receiptOrder}}
 		  					{{receiptDetail' value.receiptOrder}}
 		  					</div>
 		  					</div>
+		  					
+		  					<div class="reportButton clearfix">
+		  					
+		  					
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
+		  						<a href="/expensesRetreats/{{receiptList' value.rid}}" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
+	  						
+		  						<!-- endif -->
+		  					</div>
 		  					<div class="censorList clearfix censorHeight">
 		  					<div class="censorList clearfix censorHeight">
 		  					<ul>
 		  					<ul>
 		  					
 		  					
@@ -214,19 +227,6 @@
 		  						
 		  						
 		  					</ul>
 		  					</ul>
 		  					</div>
 		  					</div>
-		  					
-		  					<div class="reportButton">
-		  					
-		  					
-		  					
-		  						<!-- if {{receiptDetail' value.button}}==4 -->
-		  						
-		  						<a href="/expensesRetreats/{{receiptList' value.rid}}" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
-	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
-	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
-	  						
-		  						<!-- endif -->
-		  					</div>
 	  					</form>
 	  					</form>
 	  				</div>
 	  				</div>
 	  				<!--<div class="seReport">
 	  				<!--<div class="seReport">

+ 15 - 16
protected/view/admin/receiptburEdi.html

@@ -212,6 +212,20 @@
 	  						
 	  						
 		  					<div class="title">
 		  					<div class="title">
 		  					{{receiptDetail' value.receiptOrder}}
 		  					{{receiptDetail' value.receiptOrder}}
+		  					</div>		  					
+		  					<div class="reportButton clearfix" style="display:" >
+		  					
+		  					
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						
+		  						<a href="/approvalChe/{{receiptList' value.rid}}" class="buttonBack <!-- if {{receiptList' value.Rtype}}==1 --> buttonBlock  <!-- endif -->" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
+	  							<!-- if {{receiptList' value.Rtype}}!=1 -->
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
+	  							<!-- endif -->
+	  						
+		  						<!-- endif -->
 		  					</div>
 		  					</div>
 		  					<div class="censorList clearfix censorHeight">
 		  					<div class="censorList clearfix censorHeight">
 		  					<ul>
 		  					<ul>
@@ -263,22 +277,7 @@
 		  						
 		  						
 		  					</ul>
 		  					</ul>
 		  					</div>
 		  					</div>
-		  					
-		  					<div class="reportButton" style="display:" >
-		  					
-		  					
-		  					
-		  						<!-- if {{receiptDetail' value.button}}==4 -->
-		  						
-		  						<a href="/approvalChe/{{receiptList' value.rid}}" class="buttonBack <!-- if {{receiptList' value.Rtype}}==1 --> buttonBlock  <!-- endif -->" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
-	  							<!-- if {{receiptList' value.Rtype}}!=1 -->
-	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
-	  							<!-- endif -->
-	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
-	  						
-	  						
-		  						<!-- endif -->
-		  					</div>
+
 	  					</form>
 	  					</form>
 	  				</div>
 	  				</div>
 	  				
 	  				

+ 16 - 16
protected/view/admin/remitApproval.html

@@ -106,6 +106,22 @@
 		  					<div class="title">
 		  					<div class="title">
 		  					{{receiptDetail' value.receiptOrder}}
 		  					{{receiptDetail' value.receiptOrder}}
 		  					</div>
 		  					</div>
+		  					
+		  					<div class="reportButton clearfix">
+		  					
+		  					
+		  					
+		  						<!-- if {{receiptDetail' value.button}}==4 -->
+		  						
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
+		  						<a href="/approvalChe/{{receiptList' value.rid}}" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
+	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
+	  						
+	  						
+		  						<a href="javascript:void(0)" style="display:none" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone">同意支付</a>
+		  						<a href="javascript:void(0)" style="display:none" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone">退回</a>
+		  						<!-- endif -->
+		  					</div>
 		  					<div class="censorList clearfix censorHeight">
 		  					<div class="censorList clearfix censorHeight">
 		  					<ul>
 		  					<ul>
 		  						<!-- if {{empty(receiptDetail' value.rlList)}} -->
 		  						<!-- if {{empty(receiptDetail' value.rlList)}} -->
@@ -152,22 +168,6 @@
 		  						
 		  						
 		  					</ul>
 		  					</ul>
 		  					</div>
 		  					</div>
-		  					
-		  					<div class="reportButton">
-		  					
-		  					
-		  					
-		  						<!-- if {{receiptDetail' value.button}}==4 -->
-		  						
-		  						<a href="/approvalChe/{{receiptList' value.rid}}" class="buttonBack" data-placement="top" data-toggle="ctooltip" data-original-title="上报人修改后由你继续审批">撤回</a>
-	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone" data-placement="top" data-toggle="ctooltip" data-original-title="终止报销单">终止</a>
-	  							<a href="javascript:void(0)" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone buttonBlock">同意支付</a>
-	  						
-	  						
-		  						<a href="javascript:void(0)" style="display:none" onClick="updateApprovalReceipt(3,{{receiptList' value.rid}})" class="buttonUndone">退回</a>
-		  						<a href="javascript:void(0)" style="display:none" onClick="updateApprovalReceipt(1,{{receiptList' value.rid}})" class="buttonDone">同意支付</a>
-		  						<!-- endif -->
-		  					</div>
 	  					</form>
 	  					</form>
 	  				</div>
 	  				</div>
 	  				<!--<div class="seReport">
 	  				<!--<div class="seReport">