统计条件判断

public/resource/js/daily_total.js

@@ -32,29 +32,72 @@ define(['doT', 'text!temp/adjustment_template_tpl.html', 'css!style/home.css', '
 				
 			});
 		},
-		buildParams: function() {
+		buildParams: function(is_string) {
 			var start_time = $('#comit_time_start').val();
 			var end_time = $('#comit_time_end').val();
 			var create_start_time = $('#create_start_time').val();
 			var create_end_time = $('#create_end_time').val();
 			var params_string = "";
+			var params = {};
 			if (start_time) {
 				params_string += "start_time="+start_time+"&";
+				params.start_time = start_time;
 			}
 			if (end_time) {
 				params_string += "end_time="+end_time+"&";
+				params.end_time = end_time;
 			}
 			if (create_start_time) {
 				params_string += "create_start_time="+create_start_time+"&";
+				params.create_start_time = create_start_time;
 			}
 			if (create_end_time) {
 				params_string += "create_end_time="+create_end_time+"&";
+				params.create_end_time = create_end_time;
 			}
+
+			if(is_string) {
 				return params_string;
+			} else {
+				return params;
+			}
+
 		},
 		getList : function(){
+			var params = adjustment.buildParams(0);
+
+			if ((params.start_time == undefined && params.end_time == undefined) && (params.create_start_time == undefined && params.create_end_time == undefined)) {
+				alert("请选择时间条件");
+				return false;
+			}
+
+			if (params.start_time && params.end_time == undefined) {
+				alert("请选择入账日期结束时间");
+				return false;
+			}
+
+			if (params.end_time && params.start_time == undefined) {
+				alert("请选择入账日期开始时间");
+				return false;
+			}
+
+			if (params.create_start_time && params.create_end_time == undefined) {
+				alert("请选择收款结束时间");
+				return false;
+			}
+
+			if (params.create_end_time && params.create_start_time == undefined) {
+				alert("请选择收款开始时间");
+				return false;
+			}
+
+			if (params.start_time && params.end_time && params.create_start_time && params.create_end_time) {
+				alert("两个时间段不能同时查询");
+				return false;
+			}
+
 			$.ajax({
-                url: '/index/getPaylogTotalPrice?' + adjustment.buildParams(),
+			url: '/index/getPaylogTotalPrice?' + adjustment.buildParams(1),
 			type: 'GET',
 			async: true,
 			dataType: 'json',