Merge branch 'test' of https://gitee.com/zwyjjc/tl_estate into test

public/resource/js/reportList.js

@@ -971,14 +971,24 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 		},
 		//新增时，点确定按钮
 		newAddMaidOk: function(){
+			var _fenyongfang = $('#addmaid_input_servant').val();
+			if(_fenyongfang == ''){
+				alert('请选择分佣方');
+				return false;
+			};
+			var _ywyId = $('#addmaid_input_ywy').attr('data-id');
+			if(!_ywyId){
+				alert('请填写业务员');
+				return false;
+			};
 			$.ajax({
 			    type: 'POST',
 			    url: '/index/addBargain',
 			    data: {
 			    	'id': bargain.bargain_id,
-			    	'agent_id': $('#addmaid_input_ywy').attr('data-id'),
+			    	'agent_id': _ywyId,
 			    	'scale_fee': $('#addmaid_input_cash').val(),
-			    	'role': $('#addmaid_input_servant').val(),
+			    	'role': _fenyongfang,
 			    	'scale': $('#addmaid_input_ratio').val(),
 			    	'step': bargain.mainTabIndex,
 			    	'source': 1