Commit e63f022a authored by liboyang's avatar liboyang

添加快证页面修改

parent 1e3db5e1
...@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)){ if(angular.isUndefined(state)){
state=-1; state=-1;
} }
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,date) console.log(fileName,state,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)){ if(angular.isUndefined(state)){
state=-1; state=-1;
} }
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,currentPage,itemsPerPage,date) console.log(fileName,state,currentPage,itemsPerPage,date)
$http({ $http({
method: 'GET', method: 'GET',
......
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
</div> </div>
<input type="text" <input type="text"
class="form-control pull-right" class="form-control pull-right"
ng-model="choseDate"
id="datepicker3" readonly/> id="datepicker3" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td>文件名称:</td> <td>文件名称:</td>
......
...@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$('#datepicker2').datetimepicker({ $('#datepicker2').datetimepicker({
minView: "month", //选择日期后,不会再跳转去选择时分秒 minView: "month", //选择日期后,不会再跳转去选择时分秒
language: 'zh-CN', language: 'zh-CN',
...@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.uploadExcel = function () { $scope.uploadExcel = function () {
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
......
...@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
json.uploadDate = $("#datepicker").val(); json.uploadDate = $("#datepicker").val();
} }
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1
}
json.firstIndex=$scope.paginationConf.currentPage; json.firstIndex=$scope.paginationConf.currentPage;
json.pageSize=$scope.paginationConf.itemsPerPage; json.pageSize=$scope.paginationConf.itemsPerPage;
return json; return json;
...@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
console.log(data) console.log(data)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候,重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候,重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery); $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment