优化

application/index/view/officeBuilding/account_statement_shop.html

@@ -1264,6 +1264,20 @@
 							</div>
 						</div>
 					</div>
+					<div class="col-xs-12 beChargedPartyHide">
+						<div class="col-xs-6">
+							<div class="form-group">
+								<strong><span class="col-xs-3 ld-Marheight">被收取方::</span></strong>
+								<span id="beChargedParty" class="col-xs-6 ld-Marheight"></span>
+							</div>
+						</div>
+						<div class="col-xs-6">
+							<div class="form-group">
+								<!--<strong><span class="col-xs-3 ld-Marheight">状态:</span></strong>
+								<span id="status" class=" col-xs-6 ld-Marheight">正常</span>-->
+							</div>
+						</div>
+					</div>
 				</form>
 			</div>
 			<div class="modal-footer pic-con2">

public/resource/js/costCheck.js

@@ -16,6 +16,9 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 		vaules:[],
 		batchCheckUrl:'',
 		batchCheckHide:0,
+		batchCheckUrlXZ:0,
+		batchCheckUrlYs:0,
+		batchCheckUrlEs:0,
 		init: function() {
 
 			//初始化dot
@@ -26,6 +29,9 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 				$('.choose_btn1').show();
 				$(".batchCheckHide").show();
                 cost.batchCheckHide = 1;
+                cost.batchCheckUrlXZ = 1;//行政
+                
+                
 			}else{
 				$('.choose_btn1').hide();
 				$(".batchCheckHide").hide();
@@ -36,6 +42,9 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 				$('.choose_btn2').show();
 				$(".batchCheckHide").show();
                 cost.batchCheckHide = 1;
+                cost.batchCheckUrlYs = 1;//一审
+                
+                
 			}else{
 				$('.choose_btn2').hide();
 				$(".batchCheckHide").hide();
@@ -46,6 +55,8 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 				$('.choose_btn3').show();
 				$(".batchCheckHide").show();
                 cost.batchCheckHide = 1;
+                cost.batchCheckUrlEs = 1;//二审
+                
 			}else{
 				$('.choose_btn3').hide();
 				$(".batchCheckHide").hide();
@@ -75,7 +86,14 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 			}else{
 				$('.choose_btn7').hide();
 			};
-			
+			//批量审核标识
+			if(cost.batchCheckUrlXZ){//行政批量审核
+                cost.batchCheckUrl = '/index/checkCostSix/5';
+			}else if((cost.batchCheckUrlXZ==0)&&cost.batchCheckUrlYs){//一审
+				cost.batchCheckUrl = '/index/checkCostThree/2';
+			}else if((cost.batchCheckUrlXZ==0)&&(cost.batchCheckUrlYs==0)&&cost.batchCheckUrlEs){//二审
+                cost.batchCheckUrl = '/index/checkCostFour/3';
+			};
 			cost.url=$('.btn-group .choose_btn:nth-of-type(1)').attr('data-value');
 			cost.getList(1);
 			cost.event();
@@ -903,6 +921,7 @@ define(['doT', 'text!temp/cost_check_template_tpl.html', 'css!style/home.css', '
 						}else{
 							$('.checkCost').html('审核');
 						}
+						
 						/*分页代码*/
 						add_page(data.data.total, no, that.pageSize, that.getList);
 					} else {

public/resource/js/getCollectionShop.js

@@ -1330,6 +1330,8 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			$.post('/index/collectingBill',params,function( data ){
 				if(data.code == 200) {
 					$('#modal-linetime').modal('hide');
+                	alert(data.msg);
+					receiv.getList(receiv.pageNo);
                 } else {
                 	alert(data.msg);
                 }

public/resource/js/reportListShop.js

@@ -2667,6 +2667,8 @@ define(['doT', 'text!temp/reportList_shop_template_tpl.html', 'css!style/home.cs
 				$("#comes").text('调整');
 				doc.find("#status").text("被调整");
 			}
+			//收取方
+			doc.find("#beChargedParty").text((data.be_charged_party*1 == 2)?'房东':'客户');
 //	 		doc.find("#status").text(data.source_id);
 	 		doc.find("#lastTime").val(data.last_transfer_time);
 	 		doc.find("#shoutiao").val(data.receipt_number);
@@ -2684,6 +2686,9 @@ define(['doT', 'text!temp/reportList_shop_template_tpl.html', 'css!style/home.cs
  			}
  			if ( data.type == 91 ){
 				$('.zjcon').show();
+				$(".beChargedPartyHide").show();//显示隐藏  收取方
+			}else{
+				$(".beChargedPartyHide").hide();
 			}
 		},
 		//获取收款图片

public/resource/template/cost_check_template_tpl.html

@@ -30,16 +30,18 @@
         
         <td>[%= it[item]['purpose'] %]</td>
         [% if(it[item]['status'] == 1) { %]
-         	<td>总监通过</td>
+         	<td>行政审核</td>
         [% }else if (it[item]['status'] == 2) { %]	
-         	<td>一审通过</td>
+         	<td>财务二审</td>
         [% }else if (it[item]['status'] == 3) { %]	
-         	<td>二审通过</td>
+         	<td>出纳审核</td>
         [% }else if (it[item]['status'] == 4) { %]	
-         	<td>三审通过</td>
+         	<td>已出款</td>
         [% }else if (it[item]['status'] == 0) { %]	
-         	<td>申请中</td>
-        [% } else { %]
+         	<td>总监审核</td>
+        [% }else if(it[item]['status'] == 5){ %]
+         	<td>财务一审</td>
+        [%} else { %]
         	<td>--</td>
         [% } %]