1

application/index/view/finance/account_statement.html

@@ -1399,7 +1399,12 @@
 					<tr class="zhongjiefei">
 						<td>
 							<span class="span-width-90">是否开业：</span>
-							<span class="shop-is-open">是</span>
+							<!--<span class="shop-is-open">是</span>-->
+							<select class="shop-is-open">
+								<option value="3">请选择</option> 
+								<option value="1">是</option> 
+								<option value="0">否</option>
+							</select>
 						</td>
 						<td>
 							<span class="span-width-90">是否分红：</span>

application/index/view/finance/daily_details.html

@@ -264,7 +264,7 @@
 		text-align:center;
 		color:red;
 	}
-	.result-du>img,.result2-du>img{
+	.result-du>img,.result2-du>img,.result-du-l>img{
 		width: 120px;
 		height: 120px;
 		margin-top: 8px;

application/index/view/finance/getCollection.html

@@ -532,7 +532,7 @@
 							<div class="form-group">
 								<strong><span class="col-xs-2 ld-Marheight">成交报告ID:</span></strong>
 								<div class="col-xs-9" style="padding:0px 10px 0px 5px;">
-									<input class="form-control"  type="text" value="" id="report_id_change" data-status="200" autocomplete="off"  />
+									<input class="form-control"  type="text" value="" id="report_id_change" data-status="200" autocomplete="off" placeholder="请输入成交报告ID" />
 								 <ul class="reportArea" style="display:none" data-status="100" ></ul></div>
 							</div>
 						</div>

public/resource/js/financial_manager_daily_list.js

@@ -904,6 +904,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 								    $('#pay_h').html(data.data.total_info.other_bank);
 								    $('#pay_k').html(data.data.total_info.bank_card);
 								    $('#pay_m').html(data.data.total_info.bank_card_new);
+									$('#pay_lin').html(data.data.total_info.bank_card_lin);
 								}
 							
 							    $('#pay_i').html('');

public/resource/js/getCollection.js

@@ -1084,20 +1084,17 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				if ($('#change_time').val()){//最后转定时间
 					params.last_transfer_time = $('#change_time').val()
 				};	
+				
 			} else {
-				if ($('#change_fenhong').text()){//分红
+				if($('#change_fenhong').text()){//分红
 					params.is_dividend = $('#change_fenhong').val()
 				};
-				if ($('#change_fenhong').text()){//调整 是否开业
-					if($('#change_kaiye').val() == 3){
+				if($('#change_kaiye').val() == 3){//中介费 案场费
 						alert('请选择是否开业');
 						return;
-					}else{
+				}else{
 						params.is_open = $('#change_kaiye').val();
-					}
-					
-				};
-				
+				}
 				
 			}
 			
@@ -1145,10 +1142,13 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 		saveRecervables : function(){
 			var that = receiv;
 			var params = that.recervablesParams();
-			if(params.is_open == 3){
+			if ($('#intoType').val() == 92 || $('#intoType').val() == 91){
+				if(params.is_open == 3){
 				alert('请选择是否开业');
 				return;
+			   };
 			};
+			
 			$.post('/index/getCollectionEdit',params,function(data){
 				if(data.code == 200) {
 					$('#modal-addPic').modal('hide');//操作成功后 在隐藏弹窗
@@ -1541,7 +1541,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 	 		doc.find("#payType").val(data.pay_type);
 	 		doc.find("#payNo").val(data.transfer_name);
 //	 		doc.find("#running").text(data.is_open == 1 ? "是":"否");//收款页面 是否开业变成可编辑的
-	 		doc.find("#running").val(3);//收款页面 是否开业变成可编辑的
+	 		doc.find("#running").val(data.is_open);//收款页面 是否开业变成可编辑的
 			doc.find("#fenhong").val(data.is_dividend);
 			doc.find('#pinpai').text(data.industry_type);
 			var source_id = data.source_id ; 

public/resource/js/reportList.js

@@ -968,7 +968,6 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
             if($('.commission-pay-type').val() == 91){
                params.type_ext=$('.fee-type-zhongjie').val();//中介费类型
                params.is_dividend=$('.commission-type-zhongjie').val();//是否分红
-               
             	
             }else{
                params.is_dividend=$('.commission-type-anchang').val();//是否分红
@@ -978,6 +977,12 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
             	alert('请填写入账日期');
             	return;
             }
+            if($('.shop-is-open').val() == 3){
+            	alert('请填写是否开业');
+            	return;
+            }
+            params.is_open=$('.shop-is-open').val();//是否开业
+            
             $.ajax({
                 'type': 'POST',
                 'url': '/broker/collectingBill',