后台 财务日报同步

application/index/view/finance/daily_details.html

@@ -1176,13 +1176,14 @@
 						<div class="col-xs-6 ky">
 							<div class="form-group">
 								<strong><span class="col-xs-3 ld-Marheight">是否开业:</span></strong>
-								<!--<div class="col-xs-6">-->
-									<span id="running" class="col-xs-6 ld-Marheight"></span>
-									<!--<select class="form-control" id="running">
-										<option value="0">是</option>		
-										<option value="1">否</option>		
-									</select>-->
-								<!--</div>-->
+								<div class="col-xs-6">
+									<!--<span id="running" class="col-xs-6 ld-Marheight"></span>-->
+									<select class="form-control" id="running">
+										<option value="3">请选择</option>		
+										<option value="0">否</option>		
+										<option value="1">是</option>
+									</select>
+								</div>
 							</div>
 						</div>
 						<div class="col-xs-6 xqac">
@@ -1688,6 +1689,20 @@
 								</div>
 							</div>
 						</div>
+						
+						<div class="col-xs-6 choose_topic_1">
+							<div class="form-group">
+								<strong><span class="col-xs-4 ld-Marheight">是否开业:</span></strong>
+								<div class="col-xs-6">
+									<select class="form-control " id="change_kaiye">
+										<option value="3">请选择</option>		
+										<option value="0">否</option>		
+										<option value="1">是</option>	
+									</select>
+								</div>
+							</div>
+						</div>
+						
 						<div class="col-xs-6 choose_topic_2">
 							<div class="form-group">
 								<strong><span class="col-xs-4 ld-Marheight">商铺号:</span></strong>

public/resource/js/financial_manager_daily_list.js

@@ -478,7 +478,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 				$('#shop_id_change').text("");
 				$('#shop_addr_change').text("");
 				$('#change_fenhong').val("");
-				
+				$('#change_kaiye').val(3);
 				$('#shop_id_change_shop').val("");
 				$('#change_time').val("");
 				$('.img_area').empty();
@@ -1382,7 +1382,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 	 		$("#belongT").text(data.store_name);
 	 		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(data.is_open);
 			doc.find("#fenhong").val(data.is_dividend);
 			doc.find('#pinpai').text(data.industry_type);
 			if (data.source == 0) {
@@ -1462,6 +1462,12 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 		saveRecervables : function(){
 			var that = bargain;
 			var params = that.recervablesParams();
+			if ($('#intoType').val() == 92 || $('#intoType').val() == 91){
+				if(params.is_open == 3){
+				alert('请选择是否开业');
+				return;
+			   };
+			};
 			$.post('/index/getCollectionEdit',params,function(data){
 				if(data.code == 200) {
 					bargain.getList();
@@ -1494,9 +1500,7 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 			if ($('#payNo').val()){//支付户名
 				params.transfer_name = $('#payNo').val()
 			};						 
-			if ($('#running').val()){//是否开业 1是 0否
-				params.is_open = $('#running').val()
-			};					
+			params.is_open = $('#running').val()
 			if ($('#fenhong').val()){//分红
 				params.is_dividend = $('#fenhong').val()
 			};					
@@ -1669,6 +1673,12 @@ define(['doT', 'text!temp/financial_manager_daily_list_template_tpl.html', 'css!
 				if ($('#change_fenhong').text()){//分红
 					params.is_dividend = $('#change_fenhong').val()
 				};
+				if($('#change_kaiye').val() == 3){//中介费 案场费
+						alert('请选择是否开业');
+						return;
+				}else{
+						params.is_open = $('#change_kaiye').val();
+				}
 			}
 			params.receipt_number = that.receipt_number ;
 			if ($('#into_id_change').val()){//带看id

public/resource/js/inspectionRecordAll.js

@@ -347,7 +347,6 @@ define(['doT', 'text!temp/inspectionRecordAll_list_template_tpl.html', 'css!styl
             params.order_no=record.orderNO;
             params.collecting_bill=$("input[name=area_demand]").val();
             params.house_number=$(".shop-num").val();//商铺号
-            params.industry_type=$(".yetai").val();//业态
             params.remark=$(".beizhu").val();
 //          params.pay_id=$("input[name=area_demand]").val();
             params.transfer_name=$(".intention-name").val();
@@ -374,10 +373,16 @@ define(['doT', 'text!temp/inspectionRecordAll_list_template_tpl.html', 'css!styl
 					 params.transfer_img = JSON.stringify(imgname);
 					 
 				} else {
+            	    alert('请选择图片');
 					return
 				};
             
-            
+            if($(".yetai").val()){
+               params.industry_type=$(".yetai").val();//业态
+            }else{
+            	alert('请填写业态');
+            	return;
+            }
             $.ajax({
                 'type': 'POST',
                 'url': '/broker/collectingBill',