1

public/app/js/submit_report_pc.js

@@ -277,7 +277,7 @@ require(['vue', 'css!style/submit_report_pc.css', 'jquery0325', 'common'], funct
 						_isBreak = true;
             			return false;
 					};
-					_totalScale += _scale;
+					_totalScale += _scale*1;
 					_dataArr.push({
 						'role': _role,
 						'agent_id': _agent_id,
@@ -295,6 +295,7 @@ require(['vue', 'css!style/submit_report_pc.css', 'jquery0325', 'common'], funct
 				}else{
 					urlOffice ="/broker/bargain";
 				}
+				console.log(_totalScale);
 				if(_totalScale !=100){
 					alert('分佣比例总和须为100%，方能提交成功');
 					return;

public/resource/js/methodOfAnalysis.js

@@ -119,6 +119,12 @@
             params.store_id =$('#guest_stores').val();
             params.pageNo = report.pageNo;
             params.pageSize = report.pageSize;
+             if($("#district_id2_city").val()){
+				if(!$("#district_id").val()){
+				   alert('请选择部门进行搜索');
+				   return
+				}
+			}
 			$.ajax({
 			    type: 'GET',
 			    url: '/index/methodOfAnalysis',

public/resource/js/qualityAssessment.js

@@ -118,6 +118,12 @@
             params.store_id =$('#guest_stores').val();
             params.pageNo = report.pageNo;
             params.pageSize = report.pageSize;
+             if($("#district_id2_city").val()){
+				if(!$("#district_id").val()){
+				   alert('请选择部门进行搜索');
+				   return
+				}
+			}
 			$.ajax({
 			    type: 'GET',
 			    url: '/index/qualityAssessment',

public/resource/js/valueAssessment.js

@@ -119,7 +119,12 @@
             params.store_id =$('#guest_stores').val();
             params.pageNo = report.pageNo;
             params.pageSize = report.pageSize;
-            
+            if($("#district_id2_city").val()){
+				if(!$("#district_id").val()){
+				   alert('请选择部门进行搜索');
+				   return
+				}
+			}
 			$.ajax({
 			    type: 'GET',
 			    url: '/index/valueAssessment',//日报