caipin 5 yıl önce
ebeveyn
işleme
d13e1ffbb3

Dosya farkı çok büyük olduğundan ihmal edildi
+ 882 - 862
protected/controller/ReceiptController.php


+ 42 - 23
protected/view/receipt/receiptFee.html

@@ -268,49 +268,68 @@
                 </div>
                 <div class="modal-body saeaList">
                 	<div style="margin-bottom: 20px">
-						<label class="radio inline"><input type="radio" name="receipt-type">办事处相关费用</label>
+						<label class="radio inline"><input type="radio" checked name="receipt-type">办事处相关费用</label>
 						<label class="radio inline"><input type="radio" name="receipt-type">差旅相关费用</label>
 						<label class="radio inline"><input type="radio" name="receipt-type">内部培训费用</label>
 					</div>
 					<div>
 						<!--办事处相关费用-->
-						<table class="table table-bordered table-condensed">
+						<table class="table table-bordered table-condensed" >
 							<tr><th class="taC" colspan="3">日常相关费用</th></tr>
-							<tr><td>市内交通费</td><td>办事处房租</td><td>电话费</td></tr>
-							<tr><td>水费</td><td>电费</td><td>办公费用</td></tr>
-							<tr><td>邮寄费</td><td>其他费用</td><td>车辆费用</td></tr>
-							<tr><td>广告费</td><td>团队建设费</td><td>物业管理费</td></tr>
-							<tr><td>宽带费</td><td>社保费</td><td>人员薪酬</td></tr>
-							<tr><td>公积金</td><td>社保</td><td>邮寄费</td></tr>
+							<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
+		  						<tr <!-- if {{acItem' value.name}}=='市内出租费' --> style="display:none" <!-- endif -->>
+		  							<td>{{acItem' value.name}}</td>
+		  						</tr>
+		  						<!-- endif -->
+	  						<!-- endloop -->
 							<tr><th class="taC" colspan="3">其他</th></tr>
-							<tr><td>公关费</td><td>可自加费用</td><td>广告费</td></tr>
-							<tr><td>体检</td><td></td><td></td></tr>
+							<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="其他" -->
+		  						<tr>
+		  							<td>{{acItem' value.name}}</td>
+		  						</tr>
+		  						<!-- endif -->
+	  						<!-- endloop -->
 						</table>
 						<!--差旅相关费用-->
-						<!-- <table class="table table-bordered table-condensed">
+						<table class="table table-bordered table-condensed" style="display:none">
 							<tr><th class="taC" colspan="3">差旅相关费用</th></tr>
-							<tr><td>往来交通费</td><td>市内交通费</td><td>出差住宿费</td></tr>
-							<tr><td>出差补助</td><td>其他费用</td><td></td></tr>
-						</table> -->
+							<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+		  						<tr>
+		  							<td>{{acItem' value.name}}</td>
+		  						</tr>
+		  						<!-- endif -->
+	  						<!-- endloop -->
+							
+						</table>
 						<!--内部培训费用-->
-						<!-- <table class="table table-bordered table-condensed">
+						<table class="table table-bordered table-condensed" style="display:none">
 							<tr><th class="taC" colspan="3">内部培训费用</th></tr>
-							<tr><td>场租费</td><td>办公费</td><td>住宿费</td></tr>
-							<tr><td>交通费</td><td>餐饮费</td><td>餐费补助</td></tr>
-							<tr><td>其他</td><td></td><td></td></tr>
-						</table> -->
+							<!-- loop acItem -->
+		  						<!-- if {{acItem' value.category}} =="差旅相关费用" -->
+		  						<tr>
+		  							<td>{{acItem' value.name}}</td>
+		  						</tr>
+		  						<!-- endif -->
+	  						<!-- endloop -->
+							
+						</table>
 					</div>
                 </div>
                 <div class="modal-footer">
-                	<a href="saea-receipt-add1.html" class="button" target="_blank">确认(办事处相关费用)</a>
-                	<a href="saea-receipt-add2.html" class="button" target="_blank">确认(差旅相关费用)</a>
-                	<a href="saea-receipt-add1.html" class="button" target="_blank">确认(内部培训费用)</a>
+                	<a href="saea-receipt-add1.html" class="button" target="_blank">确认</a>
                     <a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a>
                 </div>
             </div>
         </div>
     </div>	
-<script type="text/javascript">autoFlashHeight();</script>		
+<script type="text/javascript">
+
+
+autoFlashHeight();
+</script>		
 			<!--<script type="text/javascript">$('#welcome').modal('show')</script>-->
 
 </body>