时间优化

application/index/view/cost/accountingTable.html

@@ -20,9 +20,9 @@
 					<div class="panel-heading breadcrumb">
 						<li>
 							<span class="manager-title ld-Marheight"></span>
-							<!--<input id="count_time2" class="form-control ld-Marheight" placeholder="请选择" style="width: 150px;float: left;">-->
+							<!--<input id="count_time2" class="form-control ld-Marheight timepicker timepicker-default" placeholder="请选择" style="width: 150px;float: left;">-->
 								
-							<input type="month" id="count_time" class="form-control ld-Marheight" placeholder="请选择" style="width: 150px;float: left;"/>
+							<input id="count_time" class="form-control ld-Marheight" placeholder="请选择" style="width: 150px;float: left;" autocomplete="off"/>
 						    <a class="btn btn-info is-print ld-Marheight" style="margin-left: 20px;">打印</a>
 						    <!--<a class="btn btn-info is-close ld-Marheight" style="margin-left: 20px;">导出excel</a>-->
 						    
@@ -30,7 +30,7 @@
 					</div>
 					<div class="panel-body manager-daily-detail">
             	<!--办公室-->
-            	<div class="table-responsive" style="font-size: 12px;">
+            	<div class="table-responsive" style="font-size: 12px;width: 960px;">
 					<table class="table table-striped table-bordered table-bordered1 table-hover table-condensed">
 							<thead>
             	                <tr class="maintable-tr-bar">

application/index/view/cost/quicklyGenerate.html

@@ -303,7 +303,7 @@
 										<td style="height: 800px;padding-left: 20px;">
 											<form id="form_search">
 												<span class="fore-span ld-Marheight">计入月份:</span>
-												<input type="month" id="comit_time_start" class="form-control ld-Marheight" placeholder="请选择" style="width: 150px;float: left;"/>
+												<input id="comit_time_start" class="form-control ld-Marheight" placeholder="请选择" style="width: 150px;float: left;" autocomplete="off"/>
 												
 												<!--<input id="comit_time_start" class="form-control btn4 ld-Marheight" type="text" placeholder="请选择" 
 													onClick="WdatePicker({el:this,dateFmt:'yyyy-MM',readOnly:'readonly' })"> -->

public/resource/js/accountingTable.js

@@ -32,25 +32,29 @@ define(['doT','html2canvas','text!temp/accountingTable_list_template_tpl.html',
 		},
 		event: function() {
 			var that = bargain;
-//			$('#count_time2').datetimepicker({
-//				format:'yyyy-mm',
-//				startView: 3,
-//				maxViewMode: 1,
-//				minViewMode:1,
-//				autoclose : true,
-//				minView : 3 ,
-//             onChange : function() {  }
-//          });
+			$('#count_time').datetimepicker({
+				format:'yyyy-mm',
+				startView: 3,
+				maxViewMode: 1,
+				minViewMode:1,
+				autoclose : true,
+				minView : 3 ,
+				endDate :new Date(),
+				keyboardNavigation : false,
+            }).on('changeDate', function(ev){
+				bargain.getList();
+			});;
+            
 			
 			var _doc = $(document);
 			//门店成本 时间搜索
-			_doc.on('input', '#count_time', function() {
-				if(!($('#count_time').val())){
-					alert('时间不能为空!');
-					return
-				}
-				bargain.getList();
-            });
+//			_doc.on('input', '#count_time', function() {
+//				if(!($('#count_time').val())){
+//					alert('时间不能为空!');
+//					return
+//				}
+//				bargain.getList();
+//          });
 			//点击详情
 			$(document).on('click','.checkCost',function(e){//点击审核按钮 调整审核页面
 				var id = e.target.dataset.id;

public/resource/js/quicklyGenerate.js

@@ -25,9 +25,21 @@ define(['doT', 'text!temp/cost_details_template_tpl.html', 'css!style/home.css',
 			var _doc = $(document);
 				
 			//搜索
-			$(document).on('input','#comit_time_start',function(e){
-				that.getList(1);
-			});
+//			$(document).on('input','#comit_time_start',function(e){
+//				that.getList(1);
+//			});
+            $('#comit_time_start').datetimepicker({
+				format:'yyyy-mm',
+				startView: 3,
+				maxViewMode: 1,
+				minViewMode:1,
+				autoclose : true,
+				minView : 3 ,
+				endDate :new Date(),
+				keyboardNavigation : false,
+            }).on('changeDate', function(ev){
+				that.getList();
+			});;
 			//重置搜索条件
 			$(document).on('click','#reset',function(e){
 				that.resetAll();