是否开业

application/index/view/finance/getCollection.html

@@ -571,6 +571,18 @@
 								</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>
@@ -887,14 +899,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">-->
+								<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>
 						<div class="col-xs-6 xqac">
@@ -926,7 +938,7 @@
 					</div>
 			</div>
 			<div class="modal-footer pic-con2">
-				<button type="button btn2" class="btn btn-primary" id="savePayBtn" data-dismiss="modal">
+				<button type="button btn2" class="btn btn-primary" id="savePayBtn">
                     保存
                 </button>
 			</div>

public/resource/js/getCollection.js

@@ -445,6 +445,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				$('#shop_addr_change').text("");
 				$('#shop_id_change_shop').val("");
 				$('#change_fenhong').val("");
+
 				$('#change_time').val("");
 				$('.img_area').empty();
 				$('#reportArea').hide();
@@ -462,7 +463,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.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();
@@ -1087,6 +1088,16 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 				if ($('#change_fenhong').text()){//分红
 					params.is_dividend = $('#change_fenhong').val()
 				};
+				if ($('#change_fenhong').text()){//调整 是否开业
+					if($('#change_kaiye').val() == 3){
+						alert('请选择是否开业');
+						return;
+					}else{
+						params.is_open = $('#change_kaiye').val();
+					}
+					
+				};
+				
 				
 			}
 			
@@ -1134,8 +1145,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){
+				alert('请选择是否开业');
+				return;
+			};
 			$.post('/index/getCollectionEdit',params,function(data){
 				if(data.code == 200) {
+					$('#modal-addPic').modal('hide');//操作成功后 在隐藏弹窗
 					if(receiv.is_baocun_bargainID*1 == 0){//判断点击的是哪个 保存详情的按钮
 					   that.getList(that.pageNo);
 					}else{
@@ -1186,12 +1202,7 @@ define(['doT', 'text!temp/receivables_template_tpl.html', 'css!style/home.css',
 			if ($('#payNo').val()){//支付户名
 				params.transfer_name = $('#payNo').val()
 			};						 
-			if ($('#running').val() == 3){//是否开业 1是 0否
-                alert("请选择是否开业");
-                return;
-			}else{
-				params.is_open = $('#running').val()
-			};
+			params.is_open = $('#running').val()
 			if ($('#fenhong').val()){//分红
 				params.is_dividend = $('#fenhong').val()
 			};					
@@ -1530,6 +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("#fenhong").val(data.is_dividend);
 			doc.find('#pinpai').text(data.industry_type);
 			var source_id = data.source_id ;