Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit ba51da15 authored by dahai's avatar dahai
Browse files
Options

push

parent 67198dfb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 297 additions and 268 deletions
src/main/resources/static/index.html
View file @ ba51da15
......@@ -12,7 +12,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge;charset=gb2312">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- 上述3个meta标签*必须*放在最前面任何其他内容都*必须*跟随其后 -->
<title>北京制证辅助平台</title>
<title>北京市公安局证件制作管理中心</title>
<!--angularJs -->
<script src="components/angularjs/angular.js"></script>
<script src="components/angularjs/angular-local-storage.js"></script>
......@@ -73,7 +73,7 @@
<OBJECT classid="clsid:18EE8930-6993-4ADA-B8BB-02BA5820AC94" id="aaa" width="0px" height="0px" style="float: left;"
CODEBASE="plugin/Termb.cab#version=1,0,0,1" VIEWASTEXT></OBJECT>
<body class="hold-transition skin-blue-light sidebar-mini">
<body class="hold-transition skin-blue-light sidebar-mini fixed">
<div ng-if="loginData.login == true" class="wrapper">
<header class="main-header">
<!-- Logo -->
......@@ -81,8 +81,8 @@
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><span><img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;"></span></span>
<!-- logo for regular state and mobile devices -->
<span class="logo-lg">
北京制证辅助平台
<span class="logo-lg" style="font-size: 14px;">
北京市公安局证件制作管理中心
</span>
</a>
<!-- Header Navbar: style can be found in header.less -->
......@@ -151,7 +151,7 @@
<div class="pull-right hidden-xs">
<b>Version:</b>1.0.1.110
</div>
<strong>北京制证辅助平台</strong>
<strong>北京市公安局人口管理和基层工作总队</strong>
</footer>
</div>
<div ng-if="loginData.login == false" class="wrapper" style="background-image:url(newTheme/dist/img/download.jpg);background-size:100% 100%;background-repeat:no-repeat;">
......@@ -196,5 +196,7 @@
<script src="views/filmManagement/filmManagement.js"></script>
<script src="views/cardReport/cardReport.js"></script>
<script src="views/filmReport/filmReport.js"></script>
<script src="views/dataCheckReport/dataCheckReport.js"></script>
<script src="views/blank/blank.js"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ ba51da15
......@@ -38,10 +38,12 @@ angular.module('AvatarCheck', [
'AvatarCheck.insertCardBody',
'AvatarCheck.filmManagement',
'AvatarCheck.filmReport',
'AvatarCheck.cardReport'
"AvatarCheck.dataCheckReport",
'AvatarCheck.cardReport',
'AvatarCheck.blank'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!');
$routeProvider.otherwise({redirectTo: '/createTaskList'});
$routeProvider.otherwise({redirectTo: '/blank'});
localStorageServiceProvider.setPrefix('AvatarCheck');
$qProvider.errorOnUnhandledRejections(false)
}])
......@@ -54,6 +56,7 @@ angular.module('AvatarCheck', [
window.open("http://localhost:8081/#!searchCardMsg/zhangsan/10010001/2",'_blank');
};
$rootScope.loginData = localStorageService.get('loginData')
......@@ -208,6 +211,9 @@ angular.module('AvatarCheck', [
if($location.path()=="/filmReport"){
$rootScope.tab = '/filmReport';
}
if($location.path()=="/dataCheckReport"){
$rootScope.tab = '/dataCheckReport';
}
......
src/main/resources/static/js/service.js
View file @ ba51da15
......@@ -627,6 +627,27 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
queryDataCheckReport:function(startDate,endDate,policeCode,policeName,cardType,success){
if(angular.isUndefined(policeCode)){
policeCode = "";
}
if(angular.isUndefined(policeName)){
policeName = ""
}
$http({
method: 'GET',
url: "../ReportApi/queryDataAuditingReport"+urlTimeStamp(),
params:{
startDate:startDate,
endDate:endDate,
policeName:policeName,
policeCode:policeCode,
typeCode:cardType
}
}).then(function successCallback(response) {
success(response.data)
})
},
createTask:function(data,success){
var body = JSON.stringify(data);
console.log("data:",body)
......@@ -932,6 +953,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
selectFailedInfo:function(date,name,success){
if($rootScope.loginData.roleList[0].process==2){
name = "";
}
$http({
method: 'GET',
url: "../FailedCardApi/queryFailedCardInfo",
......@@ -1073,6 +1097,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
queryWorkGroupReport:function (date1,date2,success) {
if(date1==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
}
if(date2==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
}
$http({
method: 'GET',
url: "../ReportApi/queryWorkGroupReport" + urlTimeStamp(),
......@@ -1087,6 +1117,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
},
querySortingReport:function (date1,date2,name,success) {
if(date1==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
}
if(date2==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
}
$http({
method: 'GET',
url: "../ReportApi/querySortingReport" + urlTimeStamp(),
......@@ -1100,6 +1136,12 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
queryQualityCheckReport:function (date1,date2,success) {
if(date1==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
}
if(date2==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
}
$http({
method: 'GET',
url: "../ReportApi/queryQualityCheckReport" + urlTimeStamp(),
......
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.html
View file @ ba51da15
......@@ -32,13 +32,9 @@
<strong class="box-header with-border">导入妥投信息表</strong>
<div class="box box-primary">
<table class="table table-bordered">
<!--<tr>-->
<!--<td>文件名称</td>-->
<!--<td><input type="text" ng-model="importName"/></td>-->
<!--</tr>-->
<tr>
<td>选择Excel文件：</td>
<td colspan="2">
<td width="15%">选择Excel文件：</td>
<td width="40%">
<input type="file"
id="id_file_photo_for_check"
class="file"
......@@ -56,16 +52,30 @@
</div>
</div>
<div class="box box-default">
<div class="box-header with-border"><strong>查询导入妥投信息</strong>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="Date" id="datepicker" readonly/>
<div class="box-header">
<strong>查询导入妥投信息</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%;">查询日期：</td>
<td width="30%">
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="queryDeliveredByImportDate()">查询</button>
<!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
<!--{{paginationConf.totalItems}}条</span>)</div>-->
</td>
</tr>
</table>
<div class="box-body">
<div ng-if="deliveredByImportDate.length==0">
<h4>暂无数据</h4>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="deliveredByImportDate.length>0">
<thead>
<tr>
......@@ -74,7 +84,7 @@
<th>导入时间</th>
<th>导入人姓名</th>
<th>导入数量</th>
<th> </th>
<th></th>
</tr>
</thead>
......@@ -86,18 +96,11 @@
<td>{{item.importName}}</td>
<td>{{item.importCount}}</td>
<td><button class="btn btn-primary" ng-click="deleteDeliveredByFileId(item.id)">删除</button></td>
</tr>
</tbody>
</table>
<!--<div ng-if="packageLogData.length==0" class="box-body">-->
<!--<h4>暂无数据</h4>-->
<!--</div>-->
<!--<div style="padding-left: 27%;" ng-if="packageLogData.length>0">-->
<!--<tm-pagination conf="paginationConf" class="ul"></tm-pagination>-->
<!--</div>-->
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.js
View file @ ba51da15
......@@ -9,6 +9,15 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
}])
.controller('readDeliveredInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$("#id_file_photo_for_check").fileinput({
language: 'zh',
showUpload: false,
showCaption: true,
maxFileCount: 1024,
showPreview: true,
maxFileSize: 1024 * 30
});
$scope.ReadDeliveredInfo = function () {
var importName = $rootScope.loginData.name;
var fd = new FormData();
......@@ -19,7 +28,7 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
for(var i in files){
fd.append('file', files[i]);
}
// var getData = $scope.getPostPackage;
var getData = $scope.queryDeliveredByImportDate;
ngDialog.openConfirm({
template: 'dialogs/alert.html' + urlTimeStamp(),
width: 600,
......@@ -27,13 +36,13 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.msgText = "上传中，请稍等..."
console.log(fd,importName)
$scope.msgText = "上传中，请稍等...";
console.log(fd,importName);
HttpService.ReadDeliveredInfo(fd,importName,function (data) {
console.log(data)
if(data){
$scope.closeThisDialog();
// getData();
getData();
MessageService.showAlert("上传成功")
}else{
$scope.wrongMsg = '上传失败';
......@@ -53,25 +62,23 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.queryDeliveredByImportDate=function () {
var date = $("#datepicker").val();
if(date ==''){
date = $scope.choseDate;
}
console.log(date)
HttpService.queryDeliveredByImportDate(date,function(data){
$scope.deliveredByImportDate = data;
console.log($scope.deliveredByImportDate)
})
}
};
$scope.queryDeliveredByImportDate();
$scope.deleteDeliveredByFileId=function (fileid) {
console.log(fileid);
HttpService.deleteDeliveredByFileId(fileid,function(data){
if(data==true){
MessageService.showAlert("删除成功")
}else{
......@@ -81,7 +88,6 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
$scope.deliveredByImportDate = data;
console.log($scope.deliveredByImportDate)
})
})
}
})
\ No newline at end of file
src/main/resources/static/views/addFailed/addFailed.html
View file @ ba51da15
......@@ -33,7 +33,7 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<div class="box" ng-if="loginData.roleList[0].process==3">
<strong class="box-header">废证添加</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom:10px;">
......@@ -45,7 +45,7 @@
<input style="" type="number" ng-model="failedCount"></td>
<td>
<div style="text-align: left;">
<input type="submit" ng-click="createInputs()" class="btn btn-primary" value="确定">
<input type="submit" ng-click="createInputs(failedCount)" class="btn btn-primary" value="确定">
</div>
</td>
</tr>
......@@ -117,7 +117,7 @@
<th>提交人</th>
<th>状态</th>
<th>备注</th>
<th>操作</th>
<th ng-if="loginData.roleList[0].process==2">操作</th>
</tr>
</thead>
<tbody>
......@@ -133,14 +133,13 @@
<td>{{item.NAME}}</td>
<td>{{item.STATE}}</td>
<td>{{item.NOTE}}</td>
<td><a ng-click="deleteFailed(item.FAILED_CARD_ID,item.ID_NO)">删除</a></td>
<td ng-if="loginData.roleList[0].process==2"><a ng-click="deleteFailed(item.FAILED_CARD_ID,item.ID_NO)">删除</a></td>
</tr>
</tbody>
<tbody ng-if="failedInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</tbody>
</table>
<div ng-if="failedInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</div>
</div>
</div>
</div>
......
src/main/resources/static/views/addFailed/addFailed.js
View file @ ba51da15
......@@ -26,7 +26,6 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.aselectFailedInfo = function () {
var date = $('#datepicker').val();
if(date==""){
console.log("???????")
date=$scope.choseDate
}
HttpService.selectFailedInfo(date,$rootScope.loginData.name,function(data){
......@@ -42,9 +41,9 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
console.log(data)
})
$scope.createInputs = function(){
if($scope.failedCount>0){
var count = $scope.failedCount;
$scope.createInputs = function(failedCount){
if(failedCount>0){
var count = failedCount;
if(count>10){
count=10;
}
......
src/main/resources/static/views/addRest/addRest.html
View file @ ba51da15
......@@ -70,8 +70,8 @@
<tr ng-repeat="item in restInfo">
<td>{{$index+1}}</td>
<th>{{item.ACCEPT_NO}}</th>
<td>{{item.CARD_NAME}}</td>
<td>{{item.ID_NO}}</td>
<td>{{item.NAME}}</td>
<td>{{item.FILL_IN_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td ng-if="item.WORK_GROUP == 1">A组</td>
<td ng-if="item.WORK_GROUP == 2">B组</td>
......@@ -80,11 +80,11 @@
<td>{{item.NOTE}}</td>
</tr>
</tbody>
<tbody ng-if="restInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</tbody>
</table>
</table>
<div ng-if="restInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</div>
</div>
</div>
</div>
......
src/main/resources/static/views/cardReport/cardReport.html
View file @ ba51da15
......@@ -50,7 +50,7 @@
<select class="form-control select2" id="cardBodyType1">
<option value="0">全部</option>
<option value="1">身份证卡体</option>
<option value="2">香港居住证卡体</option>
<option value="2">台湾居住证卡体</option>
<option value="3">港澳居住证卡体</option>
</select>
</td>
......
src/main/resources/static/views/insertCardBody/insertCardBody.html
View file @ ba51da15
......@@ -86,7 +86,7 @@
<select class="form-control select2" id="cardBodyType1">
<option value="0">全部</option>
<option value="1">身份证卡体</option>
<option value="2">香港居住证卡体</option>
<option value="2">台湾居住证卡体</option>
<option value="3">港澳居住证卡体</option>
</select>
</td>
......
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.html
View file @ ba51da15
......@@ -3,18 +3,18 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >妥投信息报表</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryDeliveredReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box box-primary">
<div class="box-body">
<div ng-if="deliveredReportList.length==0">
<h4>暂无数据</h4>
......@@ -24,12 +24,9 @@
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<table class="table table-hover">
<thead>
<tr>
<!--<th ng-if="state==2">打印日期</th>-->
<!--<th ng-if="state==3">预定位日期</th>-->
<!--<th>邮寄证</th>-->
<th>邮寄数量</th>
<th>妥投数量</th>
<th>妥投失败数量</th>
......@@ -38,9 +35,8 @@
</tr>
</thead>
<tbody ng-repeat="item in deliveredReportList">
<tr style="background-color: #eee">
<tr>
<td>{{item.POST_COUNT}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<td>{{item.DELIVERED_COUNT}}</td>
<td>{{item.DELIVERED_FAILED_COUNT}}</td>
<td>{{item.POST_COUNT-item.DELIVERED_COUNT-item.DELIVERED_FAILED_COUNT}}</td>
......@@ -57,6 +53,7 @@
</div>
<!-- /.box-body -->
</div>
</div>
</div>
<!-- /.col -->
......
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.js
View file @ ba51da15
......@@ -17,10 +17,6 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
......@@ -31,10 +27,6 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.queryDeliveredReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
......@@ -42,6 +34,7 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'
$scope.deliveredReportList = data;
console.log($scope.deliveredReportList);
})
};
}
$scope.queryDeliveredReport();
})
\ No newline at end of file
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.html
View file @ ba51da15
......@@ -3,38 +3,32 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >质检报表</strong>
<strong >报表</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryQualityCheckReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box box-primary">
<div class="box-body">
<div ng-if="qualityCheckReportList.length==0">
<h4>暂无数据</h4>
</div>
<div ng-if="qualityCheckReportList.length>0">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<table class="table table-hover">
<thead>
<tr>
<!--<th ng-if="state==2">打印日期</th>-->
<!--<th ng-if="state==3">预定位日期</th>-->
<th>分局代码</th>
<th>数量</th>
<th>公安机关名称</th>
<!--<th>普通证</th>-->
<!--<th>废证</th>-->
</tr>
</thead>
<tbody ng-repeat="item in qualityCheckReportList">
......@@ -42,12 +36,6 @@
<td>{{item.DATA_AUDITING.POLICE_SUBSTATION}}</td>
<td>{{item.sum(count)}}</td>
<td>{{item.GAJG_DM.GAJG_MC}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<!--<td>{{item.POLICE_CODE}}</td>-->
<!--<td>{{item.SUM(RECEIPT_LIST:FINISH_COUNT)}}</td>-->
<!--<td>{{item.kuai}}</td>-->
<!--<td>{{item.pu}}</td>-->
<!--<td>{{item.fei}}</td>-->
</tr>
</tbody>
</table>
......@@ -58,6 +46,7 @@
</div>
<!-- /.mail-box-messages -->
</div>
</div>
<!-- /.box-body -->
</div>
......
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.js
View file @ ba51da15
......@@ -39,13 +39,11 @@ angular.module("AvatarCheck.queryQualityCheckReport",['ngRoute', 'AvatarCheck.ht
$scope.queryQualityCheckReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
HttpService.queryQualityCheckReport(date1,date2,function (data) {
$scope.qualityCheckReportList = data;
console.log($scope.qualityCheckReportList);
})
}
$scope.queryQualityCheckReport();
})
\ No newline at end of file
src/main/resources/static/views/querySortingReport/querySortingReport.html
View file @ ba51da15
......@@ -3,59 +3,48 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >分拣报表</strong>
<div class="box-tools pull-right">
分拣人员姓名:<input type="text" ng-model="name"/>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="querySortingReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box box-primary">
<div class="box-body">
<div ng-if="sortingReportList.length==0">
<h4>暂无数据</h4>
</div>
<div ng-if="sortingReportList.length>0">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<table class="table table-hover">
<thead>
<tr>
<!--<th ng-if="state==2">打印日期</th>-->
<!--<th ng-if="state==3">预定位日期</th>-->
<th>公安机关名称</th>
<th>公安机关代码</th>
<th>数量</th>
<!--<th>普通证</th>-->
<!--<th>废证</th>-->
</tr>
</thead>
<tbody ng-repeat="item in sortingReportList">
<tr style="background-color: #eee">
<tr>
<td>{{item.GAJG_MC}}</td>
<td>{{item.POLICE_CODE}}</td>
<td>{{item.FINISH_COUNT}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<!--<td>{{item.POLICE_CODE}}</td>-->
<!--<td>{{item.SUM(RECEIPT_LIST:FINISH_COUNT)}}</td>-->
<!--<td>{{item.kuai}}</td>-->
<!--<td>{{item.pu}}</td>-->
<!--<td>{{item.fei}}</td>-->
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.table -->
</div>
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
......
src/main/resources/static/views/querySortingReport/querySortingReport.js
View file @ ba51da15
......@@ -17,10 +17,6 @@ angular.module("AvatarCheck.querySortingReport",['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
......@@ -31,20 +27,16 @@ angular.module("AvatarCheck.querySortingReport",['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.querySortingReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var name = $scope.name;
var name = $rootScope.loginData.name;
HttpService.querySortingReport(date1,date2,name,function (data) {
$scope.sortingReportList = data;
console.log($scope.sortingReportList);
})
}
$scope.querySortingReport();
})
\ No newline at end of file
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.html
View file @ ba51da15
<!--<title>Title</title>-->
<!--<div class="input-group date">-->
<!--<div class="input-group-addon">-->
<!--<i class="fa fa-calendar">开始日期</i>-->
<!--</div>-->
<!--<input type="text" class="form-control pull-right" value="{{startDate}}" id="datepicker1" readonly/>-->
<!--<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>-->
<!--<div class="input-group-addon">-->
<!--<i class="fa fa-calendar">结束日期</i>-->
<!--</div>-->
<!--<input type="text" class="form-control pull-right" value="{{endDate}}" id="datepicker2" readonly/>-->
<!--<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>-->
<!--</div>-->
<!--<button class="btn btn-primary" style="margin-right: 7px;" ng-click="queryWorkGroupReport()">查询工作组报表</button>-->
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box" >
<div class="box-header">
<!--<strong ng-if="state==2">膜打印数据报表</strong>-->
<strong >工作组报表</strong>
<div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryWorkGroupReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box box-primary">
<div class="box-body">
<div ng-if="groupReportList.length==1">
<h4>暂无数据</h4>
</div>
<div ng-if="groupReportList.length>1">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<table class="table table-hover">
<thead>
<tr>
<th ng-if="state==2">打印日期</th>
<!--<th ng-if="state==3">预定位日期</th>-->
<th>日期</th>
<th>邮寄证</th>
<th>军人证</th>
<th>快证</th>
......@@ -58,10 +32,9 @@
<th>废证</th>
</tr>
</thead>
<tbody ng-repeat="item in groupReportList">
<tr style="background-color: #eee">
<tbody ng-repeat="item in groupReportList | orderBy:date" ng-class="{true: 'bg-info', false: ''}[item.date=='合计']">
<tr>
<td>{{item.date}}</td>
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<td>{{item.you}}</td>
<td>{{item.jun}}</td>
<td>{{item.kuai}}</td>
......@@ -74,16 +47,15 @@
</div>
<!-- /.table -->
</div>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
</div>
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.js
View file @ ba51da15
......@@ -9,6 +9,8 @@ angular.module("AvatarCheck.queryWorkGroupReport",['ngRoute', 'AvatarCheck.http'
}])
.controller('queryWorkGroupReportContro', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.date = 'date';
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -44,6 +46,6 @@ angular.module("AvatarCheck.queryWorkGroupReport",['ngRoute', 'AvatarCheck.http'
$scope.groupReportList = data;
console.log($scope.groupReportList);
})
}
$scope.queryWorkGroupReport();
})
src/main/resources/static/views/receitp/receitp.js
View file @ ba51da15
......@@ -29,32 +29,20 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
// $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);
// console.log(a.href)
// a.click();
// };
$scope.downloadGAinfo = function(typeCode){
$scope.downloadGAinfo = function(){
var typeCode = $scope.receitpData[$scope.currentTab].typeCode;
var json={
type:typeCode,
list:[]
}
var checks = $(".checkAllPolice:checked");
var checks = $(".checkPoliceBox:checked");
for (var i=0;i<checks.length;i++){
for(var j=0;j<JSON.parse(checks[i].value).length;j++){
json.list.push(JSON.parse(checks[i].value)[j].ID)
}
json.list.push(checks[i].value)
}
if(json.list.length==0){
MessageService.showAlert("请选择要打印的分局")
MessageService.showAlert("请选择要下载的分局或派出所")
}else{
console.log(json)
HttpService.printExcelData(json,function (data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
......@@ -66,9 +54,19 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
};
$scope.taskId=-1;
$scope.showPoliceList = function(index) {
if($scope.taskId==-1){
$scope.taskId=index;
}else{
$scope.taskId=-1
}
};
$scope.currentTab = 0;
$scope.func = function (index) {
$scope.taskId=-1;
for (var idx in $scope.receitpData) {
if (index == idx) {
$scope.receitpData[idx].isActive = true;
......@@ -135,45 +133,60 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
}
$scope.checkAll = function ($event){
var checkAll = $event.target;
var checkbox =$("input[type=checkbox]");
for (var i=0;i<checkbox.length;i++){
if(checkAll.checked) {
$scope.checkAllPolice = function ($event,typeCode,countyCode) {
console.log(countyCode)
var checkAllPolice = $event.target;
var checkbox =document.getElementsByName("checkPolice"+typeCode+countyCode);
console.log(checkbox.length);
for(var i=0;i<checkbox.length;i++){
if(checkAllPolice.checked) {
checkbox[i].checked = true;
}else {
checkbox[i].checked = false;
}
}
}
};
var iRadioValue=1;
$scope.printReceitp = function(typeCode) {
$scope.printReceitp = function() {
var typeCode = $scope.receitpData[$scope.currentTab].typeCode;
console.log(typeCode)
var json={
type:typeCode,
list:[]
}
var checks = $(".checkAllPolice:checked");
};
var checks = $(".checkPoliceBox:checked");
for (var i=0;i<checks.length;i++){
for(var j=0;j<JSON.parse(checks[i].value).length;j++){
json.list.push(JSON.parse(checks[i].value)[j].ID)
}
json.list.push(checks[i].value)
}
if(json.list.length==0){
MessageService.showAlert("请选择要打印的分局")
MessageService.showAlert("请选择要打印的分局或派出所")
}else{
console.log(json)
HttpService.printReceitpData(json,function (data) {
$scope.receitpDataToPrint = data;
for (var i=0;i<$scope.receitpDataToPrint.list.length;i++){
$scope.receitpDataToPrint.list[i].id = i+1
for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j++){
$scope.receitpDataToPrint.list[0].countyList[i].policeList[j].id=j+1;
}
}
$scope.result = [];
for(var i=0;i<$scope.receitpDataToPrint.list.length;i+=37){
$scope.result.push($scope.receitpDataToPrint.list.slice(i,i+37));
for(var i=0;i<$scope.receitpDataToPrint.list[0].countyList.length;i++){
for (var j=0;j<$scope.receitpDataToPrint.list[0].countyList[i].policeList.length;j+=37){
var json = {};
if(($scope.receitpDataToPrint.list[0].countyList[i].policeList.length-j)>37){
json.value = 1
}else{
json.value = 0;
}
json.county = $scope.receitpDataToPrint.list[0].countyList[i].countyName;
json.total = $scope.receitpDataToPrint.list[0].countyList[i].countyValidCount;
json.policeList = $scope.receitpDataToPrint.list[0].countyList[i].policeList.slice(j,j+37);
$scope.result.push(json);
}
}
console.log($scope.result)
console.log("result",$scope.result);
$timeout(function () {
for (var i=0;i<$scope.result.length;i++){
var LODOP = getLodop();
......
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html
View file @ ba51da15
......@@ -52,7 +52,7 @@
<td>备注:</td>
<td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
<td><div style="text-align: right;">
<td><div style="text-align: left;">
<button class="btn btn-primary" ng-click="saveDeliveredFailedInfo()">提交</button>
</div></td>
</tr>
......@@ -60,17 +60,31 @@
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header with-border"><strong>查询登记妥投失败信息</strong>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="Date" id="datepicker" readonly/>
<div class="box">
<div class="box-header">
<strong>查询登记妥投失败信息</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%;">查询日期：</td>
<td width="30%">
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="queryDeliveredFailedByRegisterDate()">查询</button>
<!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
<!--{{paginationConf.totalItems}}条</span>)</div>-->
</td>
</tr>
</table>
<div class="box-body">
<div ng-if="deliveredFailedByRegisterDate.length==0">
<h4>暂无数据</h4>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="deliveredFailedByRegisterDate.length>0">
<thead>
<tr>
......@@ -85,7 +99,6 @@
</tr>
</thead>
<tbody>
<!--REGISTER_NAME: "qwdqw", WAYBILL_NUMBER: "4", NOTE: "3", BACK_REASON: 1, CARD_ID: "adqwd",-->
<tr ng-repeat="item in deliveredFailedByRegisterDate">
<td>{{item.ID}}</td>
<td>{{item.REGISTER_NAME}}</td>
......@@ -98,12 +111,6 @@
</tr>
</tbody>
</table>
<!--<div ng-if="packageLogData.length==0" class="box-body">-->
<!--<h4>暂无数据</h4>-->
<!--</div>-->
<!--<div style="padding-left: 27%;" ng-if="packageLogData.length>0">-->
<!--<tm-pagination conf="paginationConf" class="ul"></tm-pagination>-->
<!--</div>-->
</div>
</div>
</div>
......
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js
View file @ ba51da15
......@@ -7,11 +7,13 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
cache: false
});
}])
.controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
.controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog,$routeParams) {
HttpService.queryDeliveredFailedType(function(data) {
console.log(data)
$scope.backReasonList = data;
})
});
//Date picker
$('#datepicker').datetimepicker({
......@@ -22,16 +24,13 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.saveDeliveredFailedInfo=function () {
var waybillNumber = $scope.waybillNumber;
var registerName = $scope.registerName;
var cardId = $scope.cardId;
var backReason = $scope.backReason;
if(backReason==null){
if(angular.isUndefined(backReason)){
MessageService.showAlert("请选择退回原因")
}else{
var note = $scope.note;
......@@ -39,27 +38,28 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
var arr = [{"waybillNumber":waybillNumber,"registerName":registerName,"cardId":cardId,"backReason":backReason,"note":note}];
console.log(arr);
HttpService.saveDeliveredFailedInfo(arr,function (data) {
if(data==true){
MessageService.showAlert("提交成功");
}else{
MessageService.showAlert("提交失败!!")
MessageService.showAlert("提交失败")
}
})
}
}
$scope.queryDeliveredFailedByRegisterDate=function () {
var date = $("#datepicker").val();
if(date ==''){
date = $scope.choseDate;
}
console.log(date)
HttpService.queryDeliveredFailedByRegisterDate(date,function(data){
$scope.deliveredFailedByRegisterDate = data;
console.log($scope.deliveredFailedByRegisterDate)
})
}
};
$scope.queryDeliveredFailedByRegisterDate();
$scope.deleteDeliveredFailedById=function (id) {
console.log(id);
HttpService.deleteDeliveredFailedById(id,function(data){
......@@ -72,7 +72,6 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
$scope.deliveredFailedByRegisterDate = data;
console.log($scope.deliveredFailedByRegisterDate)
})
})
}
})
\ No newline at end of file
src/main/resources/static/views/searchCard/searchCard.html
View file @ ba51da15
......@@ -64,7 +64,7 @@
<table class="table table-hover table-bordered">
<thead>
<tr>
<th></th>
<th ng-if="loginData.roleList[0].process==1"></th>
<th>受理号</th>
<th>区县</th>
<th>姓名</th>
......@@ -78,7 +78,7 @@
</thead>
<tbody>
<tr ng-repeat="item in searchResult.ACCdata">
<td><input ng-checked="searchResult.ACCdata.length==1" type="checkbox"
<td ng-if="loginData.roleList[0].process==1"><input ng-checked="searchResult.ACCdata.length==1" type="checkbox"
value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}"
class="accu"></td>
<td>{{item.ACCEPT_NO}}</td>
......@@ -89,7 +89,8 @@
<td ng-if="item.SEX_NO==2">女</td>
<td>{{item.GAJG1}}</td>
<td>{{item.BEGIN_DATE | myDateFilter}}</td>
<td>{{item.EXPIRE_DATE | myDateFilter}}</td>
<td ng-if="item.EXPIRE_DATE=='长期'">{{item.EXPIRE_DATE}}</td>
<td ng-if="item.EXPIRE_DATE!='长期'">{{item.EXPIRE_DATE | myDateFilter}}</td>
<td>{{item.SIGN_GOVT}}</td>
</tr>
</tbody>
......@@ -113,7 +114,7 @@
<table class="table table-hover table-bordered">
<thead>
<tr>
<th></th>
<th ng-if="loginData.roleList[0].process==1"></th>
<th>受理号</th>
<th>区县</th>
<th>姓名</th>
......@@ -128,7 +129,7 @@
</thead>
<tbody>
<tr ng-repeat="item in searchResult.PRODData">
<td><input ng-checked="searchResult.PRODData.length==1" type="checkbox"
<td ng-if="loginData.roleList[0].process==1"><input ng-checked="searchResult.PRODData.length==1" type="checkbox"
value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}"
class="prod"></td>
<td>{{item.ACCEPT_NO}}</td>
......@@ -139,7 +140,8 @@
<td ng-if="item.SEX_NO==2">女</td>
<td>{{item.GAJG1}}</td>
<td>{{item.BEGIN_DATE | myDateFilter}}</td>
<td>{{item.EXPIRE_DATE | myDateFilter}}</td>
<td ng-if="item.EXPIRE_DATE=='长期'">{{item.EXPIRE_DATE}}</td>
<td ng-if="item.EXPIRE_DATE!='长期'">{{item.EXPIRE_DATE | myDateFilter}}</td>
<td>{{item.SIGN_GOVT}}</td>
<td></td>
</tr>
......
src/main/resources/static/views/searchCardMsg/searchCardMsg.js
View file @ ba51da15
......@@ -50,12 +50,12 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
$scope.postMsgDetail = [];
$scope.currentTime = getNowFormatDate();
var doPost = function () {
var doPost = function (flag) {
HttpService.doPostAndGetData(postData, function (data) {
$scope.postMsgDetail = data;
console.log("$scope.postMsgDetail:", $scope.postMsgDetail)
$timeout(function () {
if ($scope.postMsgDetail.length == 1 && $scope.postMsgDetail[0].printTime == null) {
if ($scope.postMsgDetail.length == 1 && $scope.postMsgDetail[0].printTime == null&&flag == true) {
$scope.PreviewMytableRotate();
}
})
......@@ -154,7 +154,14 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
if (ret == 1 || ret == 3) {
myform.name.value = document.getElementById("aaa").sName;
myform.sex.value = document.getElementById("aaa").sSex == 1 ? '男' : '女';
myform.national.value = parseInt(document.getElementById("aaa").sNation);
var flag = false;
if(myform.national.value>56||myform.national.value<1){
MessageService.showAlert("该民族代码不在56个民族代码中");
}else{
myform.national.value = nation_data[(parseInt(document.getElementById("aaa").sNation)) - 1].name;
flag=true;
}
myform.birthday.value = document.getElementById("aaa").sBornDate;
myform.address.value = document.getElementById("aaa").sAddress;
myform.id.value = document.getElementById("aaa").sIDNo;
......@@ -173,8 +180,7 @@ angular.module('AvatarCheck.searchCardMsg', ['ngRoute', 'AvatarCheck.http'])
postData.idCard = myform.id.value;
postData.startDate = myform.yxqstart.value;
postData.endDate = myform.yxqend.value;
doPost()
doPost(flag)
}
}
} else {
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ ba51da15
......@@ -120,6 +120,7 @@
<div class="box-footer clearfix" style="border: 0;">
<button class="btn btn-success pull-right" style="margin-right: 20px;" ng-click="checkSame(json.id)">复核一致</button>
<button class="btn btn-info pull-right" style="margin-right: 20px;" ng-click="PreviewMytableRotate()">打印标签</button>
<!--<button class="btn btn-info pull-right" style="margin-right: 20px;" ng-click="closeRight()">关闭</button>-->
</div>
</div>
</div>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ ba51da15
......@@ -79,7 +79,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
getDetailListById(item.ID);
};
// $scope.closeRight = function () {
// $scope.json.isShow = false;
// for (var i=0;i<$scope.json.policeCardsList.length;i++){
// $scope.json.policeCardsList[i].styleClass = ""
// }
// };
$scope.checkSame = function (id) {
HttpService.updateReceiptList(id,function(data) {
......
src/main/resources/static/views/task/task.js
View file @ ba51da15
......@@ -176,20 +176,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}
$scope.groupList = [
{
id:1,
name:'A组'
},
{
id:2,
name:'B组'
}
]
$scope.updateGroup = function(typeCode) {
console.log(typeCode,"-=-=-=-=-=-=-=-=-=-")
var groupSelected = $("#groupSelected").val();
console.log(groupSelected)
$scope.updateGroup = function() {
var typeCode = $scope.cycleSheetData[$scope.currentTab].typeCode;
var checks = $("#checkOneBox:checked");
var arr = [];
for (var i=0;i<checks.length;i++){
......@@ -197,18 +185,16 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}
if(arr.length>0){
var json = {
workGroup:groupSelected,
workGroup:$("#selectedGroup").val(),
taskIdList:arr
}
if (typeCode==100){
HttpService.updateFailedCardWorkGroup(json,function(data) {
console.log("===================")
console.log(data)
$scope.searchTaskList();
})
}else {
HttpService.updateWorkGroup(json,function(data) {
console.log("------------------------")
console.log(data)
$scope.searchTaskList();
})
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ ba51da15
......@@ -67,6 +67,8 @@
<table class="table">
<thead>
<th>组号</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">姓名</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">身份证号</th>
<th>派出所名称</th>
<th>证件数量</th>
<th>电写入数量</th>
......@@ -78,6 +80,8 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.NAME}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.ID_NO}}</td>
<td>{{item.GAJG_MC}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT-item.FAILECOUNT}}</td>
<td>{{item.E_WRITER_COUNT}}</td>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ ba51da15
......@@ -22,7 +22,7 @@
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<a ng-click="func($index)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
......@@ -77,6 +77,8 @@
<table class="table">
<thead>
<th>组号</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">姓名</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">身份证号</th>
<th>核验数量</th>
<th>卸载数量</th>
<th>证件数量</th>
......@@ -87,6 +89,8 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.NAME}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.ID_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.DOWNLOAD_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
......@@ -101,21 +105,22 @@
</tbody>
</table>
<!-- /.table -->
<!-- /.mail-box-messages -->
</div>
<div class="box-footer">
<div class="pull-left">
<select class="form-control select2" id="groupSelected" style="border-radius:5px">
<option value="{{group.id}}" ng-repeat="group in groupList">{{group.name}}</option>
<select class="form-control" id="selectedGroup" style="border-radius:5px">
<option value="1">A组</option>
<option value="2">B组</option>
</select>
</div>
<div class="pull-left" style="margin-left: 10px;">
<button class="btn btn-info" ng-click="updateGroup(type.typeCode)">更新工作组</button>
<button class="btn btn-info" ng-click="updateGroup()">更新工作组</button>
</div>
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div>
<!-- /.mail-box-messages -->
</div>
</div>
</div>
<!-- 查询历史--->
......@@ -168,6 +173,8 @@
<table class="table">
<thead>
<th>组号</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">姓名</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">身份证号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
......@@ -176,6 +183,8 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.NAME}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.ID_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
......@@ -204,4 +213,5 @@
<!-- /.row -->
</div>
</div>
</div>
</div>
src/main/resources/static/views/task/taskListSorting.html
View file @ ba51da15
......@@ -88,6 +88,8 @@
<table class="table">
<thead>
<th>组号</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">姓名</th>
<th ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">身份证号</th>
<th>派出所名称</th>
<th>证件数量</th>
<th>电写入数量</th>
......@@ -100,6 +102,8 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.NAME}}</td>
<td ng-if="type.typeCode=='100'||type.typeCode=='99'||type.typeCode=='1'">{{item.ID_NO}}</td>
<td>{{item.GAJG_MC}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.E_WRITER_COUNT}}</td>
......
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