1

application/app_broker/view/index/weekly.html

@@ -12,8 +12,9 @@
 	</head>
     <style type="text/css">
     	.city-zongjian{
-    		float: right;
-    		margin-right: .3rem;
+    		/*float: right;*/
+    		display: inline-block;
+    		margin-left: .4rem;
     	}
     	.city-zongjian span{
     		display: inline-block;

application/index/view/finance/adjustment.html

@@ -326,8 +326,7 @@
 												<input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="comit_phone" placeholder="提交人手机号" type="text" value="">
 												<span class="btn btn-info btn3 ld-Marheight" id="search" style="float:left">搜索</span>
 												<span class="btn btn-info btn3 ld-Marheight" id="reset" style="float:left">重置</span>
-												<!--<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出excel</span>-->
-												<!--<span class="btn btn-info btn3 ld-Marheight" id="count" style="float:left">统计</span>-->
+												<span class="btn btn-info btn3 ld-Marheight" id="export" style="float:left">导出报表</span>
 												<span class="money_total_two  ld-Marheight " style="float:left">调整统计：</span><span style="float:left" id="money_total" class="money_total_two_shifu  fore-span ld-Marheight">0元</span>
 											</form>
 										</td>

public/app/js/weekly.js

@@ -52,8 +52,8 @@ require(['vue', 'vconsole', 'css!style/weekly.css', 'jquery0325', 'common'], fun
 				
 				//如果之前有存储的用户输入数据，则打开询问框，总监周报
 				var _mdzjZbData = localStorage.getItem('mdzjZbData') == null?'':JSON.parse(decodeURIComponent(localStorage.getItem('mdzjZbData'))); //用户输入的存储
-				if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('useridliu')){
-//				if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('userid')){
+//				if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('useridliu')){
+				if(_mdzjZbData && _mdzjZbData['userId'] == localStorage.getItem('userid')){
 					layer.open({
 					    content: '您有未完成的内容，是否继续？',
 					    btn: ['前往', '留在本页'],
@@ -162,7 +162,7 @@ require(['vue', 'vconsole', 'css!style/weekly.css', 'jquery0325', 'common'], fun
 				                            $(".city-zongjian span:eq(0)").addClass('achieve-span');
 				                            $(".city-zongjian span:gt(0)").addClass('no-achieve-span');
 					                        localStorage.setItem('userid',_data.data[0].id);
-					                        localStorage.setItem('useridliu',_data.data[0].id);
+//					                        localStorage.setItem('useridliu',_data.data[0].id);
 					                        
 			                            }
 			                            

public/resource/js/adjustment.js

@@ -11,6 +11,7 @@ define(['doT', 'text!temp/adjustment_template_tpl.html', 'css!style/home.css', '
 		listData :"",
 		moneyTotal : "" ,
 		agent_id_phone : '',
+		buildSearchParamsLiu:'',
 		init: function() {
 			//初始化dot
 			$(document.body).append(template);
@@ -285,20 +286,15 @@ define(['doT', 'text!temp/adjustment_template_tpl.html', 'css!style/home.css', '
 		 * 导出报表
 		 */
 		exportExcel : function(){
-			var that = adjustment;
-			var params = that.buildSearchParams();
-			$.post('',params, function(data){
-				if(data.code == 200) {
-                } else {
-                	alert(data.msg);
-                }
-			})
+			adjustment.buildSearchParams();
+			var _url = '/index/adjustment' + '?excel=1';
+			window.open(_url + adjustment.buildSearchParamsLiu);
 		},
 		
 		/**
 		 * 获取查询参数
 		 */
-		buildSearchParams : function(){
+		buildSearchParams : function(excel){
 			var that = adjustment;
 			var commite_time_start = $('#comit_time_start').val();
 			var commite_time_end = $('#comit_time_end').val();
@@ -315,48 +311,78 @@ define(['doT', 'text!temp/adjustment_template_tpl.html', 'css!style/home.css', '
 			var comit_phone = $('#comit_phone').val();
 			var choose_type = $('.btn-group').find('.btn-info').html();
 			var params = {};
+			var paramsStr = "" ; 
 			if ( choose_type ) {
 				params.choose_type = choose_type;
+				paramsStr += "choose_type=" + choose_type + "&"
+				
 			}
 			if ( commite_time_start ) {
 				params.start_time = commite_time_start;
+				paramsStr += "start_time=" + commite_time_start + "&"
+				
 			}
 			if ( commite_time_end ) {
 				params.end_time = commite_time_end;
+				paramsStr += "end_time=" + commite_time_end + "&"
+				
 			}
 			if ( into_time_start ) {
 				params.income_start_time = into_time_start;
+				paramsStr += "income_start_time=" + into_time_start + "&"
+				
 			}
 			if ( into_time_end ) {
 				params.income_end_time = into_time_end;
+				paramsStr += "income_end_time=" + into_time_end + "&"
+				
 			}
 			if ( changed_type ) {
 				params.type = changed_type;
+				paramsStr += "type=" + changed_type + "&"
+				
 			}
 			if ( changed_id ) {
 				params.id = changed_id;
+				paramsStr += "id=" + changed_id + "&"
+				
 			}
 			if ( looked_id ) {
 				params.march_id = looked_id;
+				paramsStr += "march_id=" + looked_id + "&"
+				
 			}
 			if ( shoped_id ) {
 				params.house_id = shoped_id;
+				paramsStr += "house_id=" + shoped_id + "&"
+				
 			}
 			if ( shoped_addr) {
 				params.address = shoped_addr;
+				paramsStr += "address=" + shoped_addr + "&"
+				
 			}
 			if ( commit_home ) {
 				params.district_id = commit_home;
+				paramsStr += "district_id=" + commit_home + "&"
+				
 			}
 			if ( commit_shop ) {
 				params.store_id = commit_shop;
+				paramsStr += "store_id=" + commit_shop + "&"
+				
 			}
 			if ( comit_name ) {
 				params.agent_id = comit_name;
+				paramsStr += "agent_id=" + comit_name + "&"
+				
 			}
 			if ( comit_phone ) {
 				params.phone = comit_phone;
+				paramsStr += "phone=" + comit_phone + "&"
+				
 			}
+			adjustment.buildSearchParamsLiu = paramsStr.substr(0,paramsStr.length-1);
 			return params ;
 		},