Commit 51ba3f86 authored by liboyang's avatar liboyang

新增页面

parent b0320bbe
...@@ -153,6 +153,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -153,6 +153,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
uploadPackage:function(fd,success){ uploadPackage:function(fd,success){
console.log(fd)
$http({ $http({
method: 'POST', method: 'POST',
url: "../importXML/getXMLToCheck", url: "../importXML/getXMLToCheck",
...@@ -184,6 +185,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -184,6 +185,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}, },
selectXmlPackageCount:function(date,success){ selectXmlPackageCount:function(date,success){
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
$http({ $http({
method: 'GET', method: 'GET',
url: "../importXML/queryPersonXMLCount"+urlTimeStamp(), url: "../importXML/queryPersonXMLCount"+urlTimeStamp(),
...@@ -195,6 +199,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -195,6 +199,10 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
selectXmlPackage:function(date,currentPage,itemsPerPage,success){ selectXmlPackage:function(date,currentPage,itemsPerPage,success){
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(date,currentPage,itemsPerPage)
$http({ $http({
method: 'GET', method: 'GET',
url: "../importXML/queryPersonXML"+urlTimeStamp(), url: "../importXML/queryPersonXML"+urlTimeStamp(),
...@@ -372,6 +380,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -372,6 +380,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(date==""){ if(date==""){
date=$filter("date")(new Date(), "yyyy-MM-dd"); date=$filter("date")(new Date(), "yyyy-MM-dd");
} }
console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage)
console.log(newPackageName,idCard,date,county) console.log(newPackageName,idCard,date,county)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -413,6 +422,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -413,6 +422,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
getTaskListToCreate:function(date,success){ getTaskListToCreate:function(date,success){
if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log($rootScope.loginData.roleList[0].process,date) console.log($rootScope.loginData.roleList[0].process,date)
$http({ $http({
method: 'GET', method: 'GET',
......
...@@ -41,9 +41,6 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -41,9 +41,6 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
} }
$scope.searchCurrent(); $scope.searchCurrent();
var reGet = function () {
$scope.searchCurrent();
}
$scope.currentTab = 0; $scope.currentTab = 0;
$scope.func = function (index) { $scope.func = function (index) {
...@@ -163,8 +160,8 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -163,8 +160,8 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
console.log(map) console.log(map)
HttpService.createTask(map,function(data){ HttpService.createTask(map,function(data){
MessageService.showAlert("创建成功") MessageService.showAlert("创建成功")
console.log(reGet) console.log($scope.searchCurrent)
reGet(); $scope.searchCurrent();
}) })
}else{ }else{
MessageService.showAlert("请选择创建任务单的组") MessageService.showAlert("请选择创建任务单的组")
......
...@@ -104,6 +104,9 @@ ...@@ -104,6 +104,9 @@
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
......
...@@ -84,17 +84,14 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -84,17 +84,14 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.getXmlPackage = function(){ $scope.getXmlPackage = function(){
console.log($("#datepicker").val())
HttpService.selectXmlPackageCount($("#datepicker").val(),function(data){ HttpService.selectXmlPackageCount($("#datepicker").val(),function(data){
$scope.paginationConf.totalItems = data.respData.string; $scope.paginationConf.totalItems = data.respData.string;
}) })
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage+1,$scope.paginationConf.itemsPerPage,function(data){
$scope.xmlPackageData = data.respData; $scope.xmlPackageData = data.respData;
console.log("$scope.xmlPackageData:",$scope.xmlPackageData) console.log("$scope.xmlPackageData:",$scope.xmlPackageData)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候,重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候,重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage); $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackage);
......
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