Skip to content

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

修改页面，完成制证信息下载

parent a2d3e0ae
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 86 deletions
src/main/resources/static/js/service.js
View file @ 4d6c0700
...@@ -276,21 +276,33 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -276,21 +276,33 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
selectXmlData:function(uploadNo,idCard,name,packageNo,importDate, selectXmlData:function(startPackageNo,endPackageNo,pcs_name,startDate,endDate,currPage,pageSize,success){
typeCode,packageType,orderStartDate,orderEndDate,success){
$http({ $http({
method: 'GET', method: 'GET',
url: "../selectDetailedInformation/selectDetailedInfo"+urlTimeStamp(), url: "../InfoManagementApi/selectInfoManagement"+urlTimeStamp(),
params:{ params:{
uploadNo:uploadNo, beginFileName:startPackageNo,
idCard:idCard, endFileName:endPackageNo,
name:name, gajgMc:pcs_name,
packageNo:packageNo, beginDate:startDate,
readDate:importDate, endDate:endDate,
cardType:typeCode, currPage:currPage,
packageType:packageType, pageSize:pageSize
startDate:orderStartDate, }
endDate:orderEndDate }).then(function successCallback(response) {
success(response.data)
})
},
selectXmlDataCount:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) {
$http({
method: 'GET',
url: "../InfoManagementApi/selectCount"+urlTimeStamp(),
params:{
beginFileName:startPackageNo,
endFileName:endPackageNo,
gajgMc:pcs_name,
beginDate:startDate,
endDate:endDate
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -691,7 +703,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -691,7 +703,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
getPoliceListDataNotCheckedData:function(success) { getPoliceListDataNotCheckedData:function(success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../ReceiptApi/updatePreproPerson"+urlTimeStamp() url: "../ReceiptApi/selectRecriptData"+urlTimeStamp()
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
...@@ -703,6 +715,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -703,6 +715,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
downloadGAinfoData:function(date,success){
$http({
method: 'GET',
url: "../exportExcel/printExcelData"+urlTimeStamp(),
params:{
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ 4d6c0700
...@@ -93,40 +93,13 @@ ...@@ -93,40 +93,13 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr ng-repeat="item in xmlDatas">
<td>1</td> <td>{{$index+1}}</td>
<td>11020</td> <td>{{item.dwdm}}</td>
<td>马连洼派出所</td> <td>{{item.dwmc}}</td>
<td>30</td> <td>{{item.recordNumber}}</td>
<td>2019-03-03 16:30</td> <td>{{item.createDate | myDateFilter}}</td>
<td>11020180227001</td> <td>{{item.newFileName}}</td>
</tr>
<tr>
<td>2</td>
<td>11020</td>
<td>农大南路派出所</td>
<td>30</td>
<td>2019-03-03 16:30</td>
<td>11020180227001</td>
</tr>
<tr>
<td>3</td>
<td>11020</td>
<td>朝阳分局</td>
<td>30</td>
<td>2019-03-03 16:30</td>
<td>11020180227001</td>
</tr>
<tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;">
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.printTime | date:"yyyy-MM-dd hh:mm:ss"}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 4d6c0700
...@@ -54,12 +54,33 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -54,12 +54,33 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$scope.paginationConf.totalItems = 50; $scope.paginationConf.totalItems = 50;
$scope.doXmlQuery = function() { $scope.doXmlQuery = function() {
console.log($scope.uploadNo,$scope.idCard,$scope.name,$scope.packageNo,$("#datepicker1").val(),$scope.typeCode,$scope.packageType,$("#datepicker2").val(),$("#datepicker3").val()) var startDate=$("#datepicker1").val();
HttpService.selectXmlData($scope.applicantName,$scope.orderNo,$scope.name,$scope.packageNo,$("#datepicker1").val(), var endDate =$("#datepicker2").val();
$scope.typeCode,$scope.packageType,$("#datepicker2").val(),$("#datepicker3").val(),function(data) { if(angular.isUndefined($scope.startPackageNo)){
$scope.startPackageNo='';
}
if(angular.isUndefined($scope.endPackageNo)){
$scope.endPackageNo='';
}
if(angular.isUndefined($scope.pcs_name)){
$scope.pcs_name='';
}
if(startDate==''){
startDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
if(endDate==''){
endDate=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate)
HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
$scope.xmlDatas = data; $scope.xmlDatas = data;
console.log($scope.xmlDatas) console.log($scope.xmlDatas)
}) })
HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data;
console.log(data)
})
} }
}); });
\ No newline at end of file
src/main/resources/static/views/receitp/receitp.html
View file @ 4d6c0700
...@@ -153,7 +153,8 @@ ...@@ -153,7 +153,8 @@
<div class="box-footer"> <div class="box-footer">
<div class="pull-right" style="margin-left: 10px;"> <div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">生成交接单</button> <button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button>
<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/receitp/receitp.js
View file @ 4d6c0700
...@@ -22,5 +22,13 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -22,5 +22,13 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.downloadGAinfo = function(){
var date = $("#datepicker").val();
var url = "../exportExcel/printExcelData?date="+date;
var a = document.createElement("a");
document.body.appendChild(a);
a.href = encodeURI(url);
a.click();
}
}); });
\ No newline at end of file
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 4d6c0700
...@@ -53,41 +53,16 @@ ...@@ -53,41 +53,16 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-click="showDetail(1)"> <tr ng-click="showDetail(item.ID)" ng-repeat="item in tagPrintData">
<td>1</td> <td>{{$index+1}}</td>
<td>110021</td> <td>{{item.POLICE_CODE}}</td>
<td>东城派出所</td> <td>{{item.POLICE_NAME}}</td>
<td>2</td> <td>{{item.download}}</td>
<td>2</td> <td>{{item.electricCount}}</td>
<td>0</td> <td ng-if="item.STATE">未复核</td>
<td></td> <td></td>
</tr>
<tr ng-click="showDetail(2)">
<td>2</td>
<td>110021</td>
<td>东城派出所</td>
<td>3</td>
<td>3</td>
<td>3</td>
<td></td> <td></td>
</tr> </tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 4d6c0700
...@@ -1028,13 +1028,18 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -1028,13 +1028,18 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
console.log($scope.tagPrintData) console.log($scope.tagPrintData)
}) })
} }
getPoliceListDataNotChecked();
$scope.searchTagPrintData = function(){ $scope.searchTagPrintData = function(){
HttpService.selectTagPrintData($scope.idCard,function(data){ HttpService.selectTagPrintData($scope.idCard,function(data){
if(!data){ console.log(data)
MessageService.showAlert("生成交接单成功") if(data){
getPoliceListDataNotChecked();
}else{
MessageService.showAlert("生成交接单失败")
getPoliceListDataNotChecked();
} }
getPoliceListDataNotChecked();
}) })
} }
......
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