caipin před 8 roky
rodič
revize
4b0001bbba

+ 28 - 0
protected/controller/ReceiptController.php

@@ -2478,6 +2478,19 @@ class ReceiptController extends DooController {
 			$receiptList [$key] ['relustCN'] = $this->num_to_rmb ( abs($relust) );
 		}
 		
+		Doo::loadModel ( 'enclosur' );
+		$enclosur = new enclosur ();
+		$enclosurList = $enclosur->find ( array (
+				'where' => 'rid=' . $rid,
+				'asArray' => true
+		) );
+		$enclosurHtml = '';
+		foreach ( $enclosurList as $value ) {
+			$enclosurHtml .= '<a href="/upload/swfupload/' . $value ['name'] . '" class="sFile" target="_blank">' . $value ['name'] . '</a>';
+		}
+		
+		$data ['enclosurHtml'] = $enclosurHtml;
+		
 		// print_r($receiptList);
 		
 		$data ['receiptList'] = $receiptList;
@@ -2709,6 +2722,8 @@ class ReceiptController extends DooController {
 		Doo::loadModel ( 'staff' );
 		$staff = new staff ();
 		
+		
+		
 		Doo::loadModel ( 'loanReceipt' );
 		$loanReceipt = new loanReceipt ();
 		
@@ -3139,6 +3154,19 @@ class ReceiptController extends DooController {
 			) );
 		}
 		
+		Doo::loadModel ( 'enclosur' );
+		$enclosur = new enclosur ();
+		$enclosurList = $enclosur->find ( array (
+				'where' => 'rid=' . $rid,
+				'asArray' => true
+		) );
+		$enclosurHtml = '';
+		foreach ( $enclosurList as $value ) {
+			$enclosurHtml .= '<a href="/upload/swfupload/' . $value ['name'] . '" class="sFile" target="_blank">' . $value ['name'] . '</a>';
+		}
+		
+		$data ['enclosurHtml'] = $enclosurHtml;
+		
 		$receiptList [0] ['rlList'] = $rlList;
 		
 		$data ['receiptList'] = $receiptList;

+ 24 - 25
protected/view/admin/expensesCollect.html

@@ -98,6 +98,14 @@
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
 	  						<tr class="warning">
 	  						<td class="taR"><b>本次借款</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">¥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
@@ -164,9 +172,6 @@
 		  							
 		  						</li>
 		  						
-		  						
-		  						
-		  						
 		  						<!-- loop receiptDetail' value.verifyList -->
 		  						
 		  						
@@ -230,12 +235,19 @@
 	  						<!-- endloop -->
 	  						<tr><th class="taR">合计</th><td class="colGreen taR">¥{{receiptList' value.accountItem.cSum.agencySum}}</td></tr>
 	  						
-	  						
-	  						
 	  						<tr><th class="taC" colspan="2">产生费用所在办事处</th></tr>
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
 	  						<tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次报销费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">¥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
 	  					
@@ -250,8 +262,6 @@
 						</table>
 	  				</div>
 	  				
-	  				
-	  				
 	  				<div class="seCensor public-censor">
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
@@ -268,12 +278,9 @@
 		  						</li>
 		  						
 		  						
-		  						
-		  						
 		  						<!-- loop receiptDetail' value.verifyList -->
 		  						
 		  						
-		  						
 			  						<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
 			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
 			  							
@@ -361,6 +368,13 @@
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						{{enclosurHtml}}
+	  						</td></tr>
+	  						
 	  						<tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次报销费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">¥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
 	  					
@@ -376,7 +390,6 @@
 	  				</div>
 	  				
 	  				
-	  				
 	  				<div class="seCensor receipt-censor">
 	  					<div class="title">
 	  					{{receiptDetail' value.receiptOrder}}
@@ -393,12 +406,8 @@
 		  						</li>
 		  						
 		  						
-		  						
-		  						
 		  						<!-- loop receiptDetail' value.verifyList -->
 		  						
-		  						
-		  						
 			  						<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
 			  							<div class="avtra"><img src="{{receiptDetail' value' value.2}}_2.jpg" width="32"></div>
 			  							
@@ -409,7 +418,6 @@
 			  							
 			  						</li>
 		  						
-		  						
 		  						<!-- endloop -->
 		  						<!-- loop receiptDetail' value.executeCopy -->
 	  							<li <!-- if {{receiptDetail' value' value.status}}==1 --> class="done" <!-- elseif {{receiptDetail' value' value.status}}==3 --> class="undone"  <!-- endif -->>
@@ -432,22 +440,13 @@
 	  					</div>
 	  				</div>
 	  				
-	  				
 	  				</div>
 	  				<!-- endif -->
 	  				
-	  				
-	  				
-	  			
 	  			<!-- endloop -->
 	  			
 			</div>
 				
-				
-				
-	  		
-				
-				
 			</div>
 		</div>
 	</div>

+ 27 - 0
protected/view/admin/expensesDoc.html

@@ -109,6 +109,15 @@
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
 	  						
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
 	  						<tr class="warning">
 	  						<td class="taR"><b>本次借款</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">¥{{receiptDetail' value.loanSum}}</b><br>{{receiptDetail' value.loanSumCN}}</td>
@@ -260,6 +269,15 @@
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
 	  						<tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次报销费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">¥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
 	  					
@@ -399,6 +417,15 @@
 	  						<tr><th style="text-align:center" colspan="2">{{receiptDetail' value.category}}</th></tr>
 	  						<tr><th class="taC" colspan="2">报销说明</th></tr>
 	  						<tr><td colspan="2">{{receiptDetail' value.explanation}}</td></tr>
+	  						
+	  						<tr><th class="taC" colspan="2">附件</th>
+	  						</tr>
+	  						<tr><td colspan="2">
+	  						
+	  						{{enclosurHtml}}
+	  						
+	  						</td></tr>
+	  						
 	  						<tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次报销费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">¥{{receiptDetail' value.sum}}</b><br>{{receiptDetail' value.sumCN}}</td></tr>
 	  					

+ 5 - 15
protected/view/admin/remitApproval.html

@@ -41,9 +41,6 @@
 	  			<div id="{{receiptList' value.Locate}}"  class="entry public-list">
 	  			
 	  			
-	  			
-	  			
-	  			
 	  				<div class="seTable reportTable">
 	  					
 	  					<table class="table table-bordered table-condensed table-hover">
@@ -87,7 +84,6 @@
 	  						
 	  						</td></tr>
 	  						
-	  						
 	  						<tr class="warning"><td class="taR"><b>({{receiptDetail' value.receiptOrder}})本次报销费用合计</b></td>
 	  						<td class="colGreed taR"><b style="font-size:24px">¥{{receiptDetail' value.sum}}</b><br/>{{receiptDetail' value.BIGsum}}</td></tr>
 
@@ -96,11 +92,11 @@
 	  					
 	  					<br/>
 	  				<table class="table table-bordered table-condensed table-hover">
-							<tbody>
-								<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
-								<tr><th>汇款金额(用于生成汇款单)</th><td class="taR" width="200">¥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
-							</tbody>
-						</table>
+						<tbody>
+							<tr><th colspan="2" class="taC">确认汇款金额</th></tr>
+							<tr><th>汇款金额(用于生成汇款单)</th><td class="taR" width="200">¥<input placeholder="输入汇款金额" pattern="[0-9]" id="amount" step="1" min="0" value="{{receiptList' value.amount}}" class="span2" type="number"></td></tr>
+						</tbody>
+					</table>
 	  				</div>
 	  				
 	  				
@@ -187,12 +183,6 @@
 	  		<!-- endloop -->
 	  		
 	  		
-	  		
-	  		
-	  			
-	  			
-	  			
-	  			
 	  			
 	  		</div>
 			</div>