caipin 8 gadi atpakaļ
vecāks
revīzija
6d8bbd9c4c

+ 2 - 2
protected/controller/ReceiptController.php

@@ -296,7 +296,7 @@ class ReceiptController extends DooController {
 			// $receiptDetail=$receipt->getOne(array('where'=>'staff='.$this->staff[0]['sid'].' and status=4','asArray'=>true));
 			
 			$aItem = $accountItem->find ( array (
-					'where' => 'name like "办公费用" or name like "其他费用"',
+					'where' => 'name like "办公费用" or name like "其他费用" or name like "公积金" or name like "社保"',
 					'asArray' => true 
 			) );
 			$accountJson [$this->AGENCY] = $accountJson [$this->TRAVEL] = $accountJson [$this->TRAIN] = $accountJson [$this->OTHER] = array ();
@@ -495,7 +495,7 @@ class ReceiptController extends DooController {
 				return "/saeaBorad";
 			
 			$aItem = $accountItem->find ( array (
-					'where' => 'name like "办公费用" or name like "其他费用"',
+					'where' => 'name like "办公费用" or name like "其他费用" or name like "公积金" or name like "社保"',
 					'asArray' => true 
 			) );
 			$accountJson [$this->AGENCY] = $accountJson [$this->TRAVEL] = $accountJson [$this->TRAIN] = $accountJson [$this->OTHER] = array ();

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

@@ -87,7 +87,7 @@
 	  						<tr><th colspan="2" class="taC">办事处相关费用</th></tr>
 	  						<!-- loop acItem -->
 		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
-			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" -->
+			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" || {{acItem' value.name}}=="公积金" || {{acItem' value.name}}=="社保" -->
 			  						<tr>
 			  						<th>{{acItem' value.name}}</th>
 			  						<td  width="200" class="taR">¥<input type="number" id="agency_{{acItem' value.aid}}" name="agency[]" value="0" placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2">

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

@@ -36,7 +36,7 @@
 	  						
 	  						<!-- loop acItem -->
 		  						<!-- if {{acItem' value.category}} =="日常相关费用" -->
-			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" -->
+			  						<!-- if {{acItem' value.name}}=="办公费用" || {{acItem' value.name}}=="其他费用" || {{acItem' value.name}}=="公积金" || {{acItem' value.name}}=="社保" -->
 			  						<tr>
 			  						<th>{{acItem' value.name}}</th>
 			  						<td  width="200" class="taR">¥<input type="number" id="agency_{{acItem' value.aid}}" name="agency[]" <!-- if !empty({{acItem' value.price}}) --> value="{{acItem' value.price}}" <!-- else --> value="0" <!-- endif --> placeholder="输入{{acItem' value.name}}" pattern="[0-9]" step="0.01" min="0" class="span2">

+ 0 - 1
protected/view/admin/saea_create.html

@@ -139,7 +139,6 @@
 								<option value="{{veList' value.vid}}" >{{veList' value.description}}(
 								{{veList' value.staff}}
 								
-								
 								)</option>
 								<!-- endloop -->
 								</select>