Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit abc8f247 authored by liboyang's avatar liboyang
Browse files
Options

下载制证包增加一个下载状态

parent adfbb745
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 11 deletions
src/main/resources/static/js/service.js
View file @ abc8f247
......@@ -387,7 +387,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
getPackageData:function(uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
typeCode,packageType,date,currentPage,itemsPerPage,success){
typeCode,packageType,downloadState,date,currentPage,itemsPerPage,success){
// var json ={
// uploadNo:uploadNo,
// IDCard:idCard,
......@@ -402,7 +402,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
// arr.push(json);
// var body = JSON.stringify(arr);
console.log(uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
typeCode,packageType,date,currentPage,itemsPerPage)
typeCode,packageType,downloadState,date,currentPage,itemsPerPage)
$http({
method: 'GET',
url: "../queryPreproPerson/queryPreproPerson",
......@@ -414,6 +414,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
SSXQDM:sljg,
cardType:typeCode,
state:packageType,
downloadState:downloadState,
uploadDate:date,
currPage:currentPage,
pageSize:itemsPerPage
......@@ -853,7 +854,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
getDownloadCount:function (uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
typeCode,packageType,date,success) {
typeCode,packageType,downloadState,date,success) {
$http({
method: 'GET',
url: "../queryPreproPerson/queryPreproPersonCount",
......@@ -865,6 +866,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
SSXQDM:sljg,
cardType:typeCode,
state:packageType,
downloadState:downloadState,
uploadDate:date
}
}).then(function successCallback(response) {
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ abc8f247
......@@ -73,15 +73,21 @@
<option value="1" selected>否</option>
</select>
</td>
<td></td>
<td><div style="float: left;">
<button class="btn btn-primary" ng-click="doPackageQuery()">查询</button>
<button type="submit" class="btn btn-info" ng-click="downloadXml()">下载制证包</button>
</div></td>
<td>下载状态</td>
<td style="text-align: left;">
<select class="form-control select2" id="downloadState">
<option value="">全部</option>
<option value="1">是</option>
<option value="0" selected>否</option>
</select>
</td>
</tr>
</table>
</div>
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="doPackageQuery()">查询</button>
<button type="submit" class="btn btn-info" ng-click="downloadXml()">下载制证包</button>
</div>
</div>
<div class="box box-default">
<strong class="box-header with-border">制证信息详情</strong>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ abc8f247
......@@ -43,6 +43,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
var date = $("#datepicker").val();
var cardType = $("#cardType").val();
var packageType = $("#packageType").val();
var downloadState = $("#downloadState").val();
if(angular.isUndefined($scope.uploadNo)){
$scope.uploadNo='';
}
......@@ -61,6 +62,9 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(packageType==''){
packageType=-1;
}
if(downloadState==''){
downloadState=-1;
}
if(date=='{{choseDate}}'){
date=$scope.choseDate
}
......@@ -68,7 +72,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
$scope.paginationConf.currentPage=1
}
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
cardType,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
cardType,packageType,downloadState,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total;
$scope.simpleCardCount = data.puSum;
$scope.postCardCount = data.youSum;
......@@ -91,6 +95,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
var date = $("#datepicker").val();
var packageType = $("#packageType").val();
var cardType=$("#cardType").val();
var downloadState = $("#downloadState").val();
if(angular.isUndefined($scope.uploadNo)){
url = url + 'uploadNo=&';
}else{
......@@ -126,6 +131,11 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
}else{
url = url + 'state=' + packageType + '&';
}
if(downloadState==''){
url = url + 'downloadState=-1&';
}else{
url = url + 'downloadState=' + downloadState + '&';
}
if (date==''){
url = url + 'uploadDate=&';
}else{
......@@ -138,6 +148,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
var date = $("#datepicker").val();
var cardType = $("#cardType").val();
var packageType = $("#packageType").val();
var downloadState = $("#downloadState").val();
if(angular.isUndefined($scope.uploadNo)){
$scope.uploadNo='';
}
......@@ -156,11 +167,14 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(packageType==''){
packageType=-1;
}
if(downloadState==''){
downloadState=-1;
}
if(date=='{{choseDate}}'){
date=$scope.choseDate
}
HttpService.getDownloadCount($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
cardType,packageType,date,function(data) {
cardType,packageType,downloadState,date,function(data) {
$rootScope.count = data.total;
})
}
......
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