Skip to content

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

push 

本地证前端 复制  异地证
parent 57bfdaba
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1078 additions and 443 deletions
src/main/resources/static/dialogs/alertLogin.html 0 → 100644
View file @ b7c0c977
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>{{msgText}}</div>
<div><span style="color: red">{{errText}}</span></div>
</div>
<div class="ui-dialog-confirm">
<button class="btn btn-info" ng-click="confirmYes()">确定</button>
</div>
src/main/resources/static/dialogs/confirmDeleteBack.html 0 → 100644
View file @ b7c0c977
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>确认删除受理号为 {{groupNo}} 的退回登记吗？</div>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/dialogs/confirmDeleteFailed.html
View file @ b7c0c977
......@@ -2,7 +2,7 @@
提示
</div>
<div class="ui-dialog-content">
<div>确认删除身份证号为{{idCard}}的废证吗？</div>
<div>确认删除身份证号为：<a>{{idCard}}</a>,姓名为：<a>{{name}}</a> 的废证吗？</div>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
......
src/main/resources/static/dialogs/confirmDeleteGreenFile.html 0 → 100644
View file @ b7c0c977
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>确认删除{{importDate}}导入的记录吗？</div>
</div>
<div class="ui-dialog-confirm">
<p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
<button type="submit" class="btn btn-info" ng-click="confirmDelete()">确认删除</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/dialogs/confirmFailedCards.html
View file @ b7c0c977
......@@ -19,10 +19,10 @@
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==null&&item.NAME!='查无此人'">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
<td ng-if="item.SPECIAL_TYPE==2" class="text-danger">快证</td>
<td ng-if="item.SPECIAL_TYPE==1" class="text-danger">余证</td>
<td ng-if="item.FAILED_CARD_REASON!=null" class="text-danger">废证</td>
<td ng-if="item.SPECIAL_TYPE==3" class="text-danger">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/dialogs/confirmRestCards.html
View file @ b7c0c977
......@@ -19,10 +19,10 @@
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==null&&item.NAME!='查无此人'">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
<td ng-if="item.SPECIAL_TYPE==2" class="text-danger">快证</td>
<td ng-if="item.SPECIAL_TYPE==1" class="text-danger">余证</td>
<td ng-if="item.FAILED_CARD_REASON!=null" class="text-danger">废证</td>
<td ng-if="item.SPECIAL_TYPE==3" class="text-danger">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/dialogs/confirmTagCards.html
View file @ b7c0c977
......@@ -19,10 +19,10 @@
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==null&&item.NAME!='查无此人'">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
<td ng-if="item.SPECIAL_TYPE==2" class="text-danger">快证</td>
<td ng-if="item.SPECIAL_TYPE==1" class="text-danger">余证</td>
<td ng-if="item.FAILED_CARD_REASON!=null" class="text-danger">废证</td>
<td ng-if="item.SPECIAL_TYPE==3" class="text-danger">退证</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/dialogs/confirmToDownload.html
View file @ b7c0c977
......@@ -2,7 +2,7 @@
提示
</div>
<div class="ui-dialog-content">
<div>下载格口文件导入日期为：{{importDate}} 的<strong>{{count}}</strong>条记录</div>
<div>下载格口文件导入日期为：{{importDate}}到{{importDate1}} 时间段内的<strong>{{count}}</strong>条记录</div>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDownload()">确认</button>
......
src/main/resources/static/dialogs/showFailedPolice.html 0 → 100644
View file @ b7c0c977
<div class="ui-dialog-title">
导入成功，本次导入成功数量：{{resultData.success}}, 失败数量：{{resultData.failed}},导入失败派出所名称为:
</div>
<div class="ui-dialog-content clearfix">
<!--<table class="table table-responsive" style="border-color: black;">
<tbody>
<tr ng-repeat="item in resultData.list">
<td>{{item}}</td>
<td>{{item}}</td>
<td>{{item}}</td>
</tr>
</tbody>
</table>-->
<div class="row">
<p class="col-lg-3" ng-repeat="item in resultData.list" >
{{$index+1}}. {{item}}
</p>
</div>
</div>
src/main/resources/static/dialogs/updateNote.html
View file @ b7c0c977
......@@ -10,14 +10,20 @@
<th>备注</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in idAndNote">
<tbody ng-repeat="item in idAndNote">
<tr>
<td>{{item.FIRST_WHITE}}</td>
<td>{{item.APPLICANT_NAME}}</td>
<td><input type="text" ng-model="item.NOTE"></td>
<td>{{item.NOTE}}</td>
</tr>
<tr>
<td colspan="3">
<input style="width: 100%" class="form-control" type="text" ng-model="item.NOTE">
</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm clearfix">
<div class="pull-left" ng-if="consoleMsg" style="color: red;margin-left: 69px;">
......
src/main/resources/static/index.html
View file @ b7c0c977
......@@ -80,13 +80,13 @@
<div ng-if="loginData.login == true" class="wrapper">
<header class="main-header">
<!-- Logo -->
<a href="index.html" class="logo" style="line-height: 50px;">
<a href="#!/blank" class="logo" style="line-height: 50px;">
<!-- 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 ng-if="loginData.roleList[0].process!=8">北京制证辅助平台</span>
<span ng-if="loginData.roleList[0].process==8">邮政管理系统</span>
<span ng-if="loginData.roleList[0].process==8">邮政速递业务管理子系统</span>
</span>
</a>
<!-- Header Navbar: style can be found in header.less -->
......@@ -147,7 +147,7 @@
导航
</li>
<li ng-repeat="menu in menuList | orderBy:'id'" ng-class="{true: 'active', false: ''}[tab =='{{menu.url}}']" ng-click="getFocus(menu.url)">
<li ng-repeat="menu in menuList | orderBy:zIndex" ng-class="{true: 'active', false: ''}[tab =='{{menu.url}}']" ng-click="getFocus(menu.url)">
<a href="#!{{menu.url}}">
<i class="{{icons[$index]}}"></i>
<span ng-bind="menu.name"></span>
......@@ -218,5 +218,7 @@
<script src="views/addBackCard/addBackCard.js"></script>
<script src="views/updatePass/updatePass.js"></script>
<script src="views/downloadGongan/downloadGongan.js"></script>
<script src="views/greenPackageInfo/greenPackageInfo.js"></script>
<script src="views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.js"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ b7c0c977
......@@ -43,6 +43,8 @@ angular.module('AvatarCheck', [
'AvatarCheck.addBackCard',
'AvatarCheck.updatePass',
'AvatarCheck.downloadGongan',
'AvatarCheck.greenPackageInfo',
"AvatarCheck.confirmNotDeliveredInfo",
'AvatarCheck.blank'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!');
......@@ -57,7 +59,7 @@ angular.module('AvatarCheck', [
$rootScope.loginData = localStorageService.get('loginData');
$scope.id = 'id';
$scope.zIndex = 'zindex';
if($rootScope.loginData == null){
$rootScope.loginData = {userid:'用户未登录', login:false};
......@@ -220,6 +222,12 @@ angular.module('AvatarCheck', [
if($location.path()=="/downloadGongan"){
$rootScope.tab = '/downloadGongan';
}
if($location.path()=="/greenPackageInfo"){
$rootScope.tab = '/greenPackageInfo';
}
if($location.path()=="/confirmNotDeliveredInfo"){
$rootScope.tab = '/confirmNotDeliveredInfo';
}
......
src/main/resources/static/js/service.js
View file @ b7c0c977
This diff is collapsed.
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.html
View file @ b7c0c977
......@@ -83,19 +83,22 @@
<th>妥投文件名</th>
<th>导入时间</th>
<th>导入人姓名</th>
<th>导入数量</th>
<th></th>
<th>记录数</th>
<th>妥投</th>
<th>未妥投</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in deliveredByImportDate">
<td>{{item.id}}</td>
<td>{{item.fileName}}</td>
<td>{{item.importDate}}</td>
<td>{{item.importName}}</td>
<td>{{item.importCount}}</td>
<td><button class="btn btn-primary" ng-click="deleteDeliveredByFileId(item.id)">删除</button></td>
<td>{{$index+1}}</td>
<td>{{item.FILE_NAME}}</td>
<td>{{item.IMPORT_DATE | date:"yyyy-MM-dd hh:mm:ss"}}</td>
<td>{{item.IMPORT_NAME}}</td>
<td>{{item.DELIVE+item.UNDELICE}}</td>
<td>{{item.DELIVE}}</td>
<td>{{item.UNDELICE}}</td>
<td><a ng-click="deleteDeliveredByFileId(item.FILE_ID,item.IMPORT_DATE,item.DELIVE+item.UNDELICE)">删除</a></td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.js
View file @ b7c0c977
......@@ -43,7 +43,6 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
if(data){
$scope.closeThisDialog();
getData();
MessageService.showAlert("上传成功")
}else{
$scope.wrongMsg = '上传失败';
}
......@@ -71,23 +70,34 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
console.log(date)
HttpService.queryDeliveredByImportDate(date,function(data){
$scope.deliveredByImportDate = data;
console.log($scope.deliveredByImportDate)
console.log($scope.deliveredByImportDate,"deliveredByImportDate")
})
};
$scope.queryDeliveredByImportDate();
$scope.deleteDeliveredByFileId=function (fileid) {
console.log(fileid);
HttpService.deleteDeliveredByFileId(fileid,function(data){
if(data==true){
MessageService.showAlert("删除成功")
}else{
MessageService.showAlert("删除失败")
}
HttpService.queryDeliveredByImportDate($("#datepicker").val(),function(data){
$scope.deliveredByImportDate = data;
console.log($scope.deliveredByImportDate)
})
})
$scope.deleteDeliveredByFileId=function (fileid,importDate,importCount) {
console.log(fileid, $filter("date")(importDate,"yyyy-MM-dd hh:mm:ss"),importCount);
var reget = $scope.queryDeliveredByImportDate;
ngDialog.openConfirm({
template: 'dialogs/confirm.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.importDate = $filter("date")(importDate,"yyyy-MM-dd hh:mm:ss");
$scope.total = importCount;
$scope.confirmDelete = function () {
$scope.closeThisDialog();
HttpService.deleteDeliveredByFileId(fileid,function(data){
if(data==true){
}else{
MessageService.showAlert("删除失败")
}
reget();
})
}
}]
});
}
})
\ No newline at end of file
src/main/resources/static/views/addFailed/addFailed.html
View file @ b7c0c977
......@@ -98,10 +98,16 @@
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="200px;">
<span>日期:</span>
<span>起始日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker" readonly/>
<input type="text" class="form-control" ng-model="choseDate1" id="datepicker1" readonly/>
</td>
<td width="200px;">
<span>截止日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
</td>
<td>
<div style="text-align: left;">
......@@ -140,7 +146,7 @@
<td>{{item.NAME}}</td>
<td>{{item.STATE}}</td>
<td>{{item.NOTE}}</td>
<td ng-if="loginData.roleList[0].process==2"><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,item.CARD_NAME)">删除</a></td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/addFailed/addFailed.js
View file @ b7c0c977
......@@ -12,7 +12,16 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
.controller('addFailedCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker
$('#datepicker').datetimepicker({
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
......@@ -21,14 +30,24 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//查询废证
$scope.aselectFailedInfo = function () {
var date = $('#datepicker').val();
if(date==""){
date=$scope.choseDate
var date1 = $('#datepicker1').val();
var date2 = $('#datepicker2').val();
if(date1==""){
date1=$scope.choseDate1;
}
if(date2==""){
date2=$scope.choseDate;
}
HttpService.selectFailedInfo(date,$rootScope.loginData.name,function(data){
//工作组只能查看自己的
if ($rootScope.loginData.roleList[0].process==3){
$scope.userName=$rootScope.loginData.name;
}else {
$scope.userName="";
}
HttpService.selectFailedInfo(date1,date2,$scope.userName,function(data){
$scope.failedInfo = data;
console.log($scope.failedInfo)
})
......@@ -129,7 +148,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
}
}
$scope.deleteFailed = function(failedCardId,cardId) {
$scope.deleteFailed = function(failedCardId,cardId,name) {
ngDialog.open({
template: 'dialogs/confirmDeleteFailed.html' + urlTimeStamp(),
width: 600,
......@@ -137,6 +156,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.idCard = cardId;
$scope.name = name;
$scope.confirmDelete = function () {
HttpService.deleteFailedCard(failedCardId,function(data) {
$scope.closeThisDialog();
......
src/main/resources/static/views/addTag/addTag.html
View file @ b7c0c977
......@@ -40,5 +40,65 @@
</div>
</div>
</div>
<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="200px;">
<span>起始日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate1" id="datepicker1" readonly/>
</td>
<td width="200px;">
<span>截止日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="aselectTagInfo()">查询</button>
</div>
</td>
</tr>
</table>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="tagInfo.length>0">
<thead>
<tr>
<th>NO.</th>
<th>受理组号</th>
<th>姓名</th>
<th>身份证号</th>
<th>性别</th>
<th>保存时间</th>
<th>提交人</th>
<th>备注</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in tagInfo">
<td>{{$index+1}}</td>
<th>{{item.acceptNo}}</th>
<td>{{item.name}}</td>
<td>{{item.cardId}}</td>
<td ng-if="item.sex==1">男</td>
<td ng-if="item.sex==2">女</td>
<td>{{item.submitDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.submitName}}</td>
<td>{{item.note}}</td>
</tr>
</tbody>
</table>
<div ng-if="tagInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/addTag/addTag.js
View file @ b7c0c977
......@@ -10,6 +10,25 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
}])
.controller('addTagCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.createInputs = function(){
if($scope.tagCount>0){
......@@ -53,7 +72,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
var json = {};
json.acceptNo=result[i][0];
json.note=result[i][1];
// json.initiator = $rootScope.loginData.roleList[0].process
json.name = $rootScope.loginData.name;
list.push(json)
}
}
......@@ -95,5 +114,24 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
}
}
$scope.aselectTagInfo = function () {
var date1 = $('#datepicker1').val();
var date2 = $('#datepicker2').val();
if(date1==""){
date1=$scope.choseDate1;
}
if(date2==""){
date2=$scope.choseDate;
}
HttpService.aselectTagInfoData(date1,date2,$rootScope.loginData.name,function(data){
$scope.tagInfo = data;
console.log($scope.tagInfo)
})
}
if($rootScope.loginData.login==true){
$scope.aselectTagInfo();
}
});
\ No newline at end of file
src/main/resources/static/views/autoCheck/autoCheck.html
View file @ b7c0c977
......@@ -91,6 +91,9 @@
<button class="btn btn-primary pull-right" style="margin-right: 20px;" ng-click="emptyList()">清空列表</button>
</div>
</div>
<div class="box-body" ng-if="policeCardsList.length==0">
暂无数据
</div>
</div>
</div>
</section>
\ No newline at end of file
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ b7c0c977
......@@ -55,7 +55,7 @@
</td>
</tr>
<tr>
<td>制证包上传时间：</td>
<td>制证包上传时间：</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
......@@ -65,14 +65,26 @@
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td>禁用:</td>
<td style="text-align: left;">
<select class="form-control select2" id="packageType">
<option value="">全部</option>
<option value="0">是</option>
<option value="1" selected>否</option>
</select>
</td>
<td>至</td>
<td>
<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="{{choseDate}}" id="datepicker1" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td>禁用:</td>
<td style="text-align: left;">
<select class="form-control select2" id="packageType">
<option value="">全部</option>
<option value="0">是</option>
<option value="1" selected>否</option>
</select>
</td>
</tr>
<tr>
<td>下载状态</td>
<td style="text-align: left;">
<select class="form-control select2" id="downloadState">
......@@ -81,10 +93,6 @@
<option value="0" selected>否</option>
</select>
</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ b7c0c977
......@@ -26,6 +26,14 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
todayBtn: 1,
autoclose: 1
});
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
......@@ -48,6 +56,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
}
$scope.doPackageQueryPage=function(){
var date = $("#datepicker").val();
var date1 = $("#datepicker1").val();
var cardType = $("#cardType").val();
var packageType = $("#packageType").val();
var downloadState = $("#downloadState").val();
......@@ -75,11 +84,14 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(date=='{{choseDate}}'){
date=$scope.choseDate
}
if(date1=='{{choseDate}}'){
date1=$scope.choseDate
}
// if($scope.paginationConf.currentPage==0){
// $scope.paginationConf.currentPage=1
// }
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
cardType,packageType,downloadState,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
cardType,packageType,downloadState,date,date1,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total;
$scope.simpleCardCount = data.puSum;
$scope.postCardCount = data.youSum;
......@@ -102,6 +114,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
var getCountAndDownloadUrl = function (url) {
var date = $("#datepicker").val();
var date1 = $("#datepicker1").val();
var packageType = $("#packageType").val();
var cardType=$("#cardType").val();
var downloadState = $("#downloadState").val();
......@@ -146,15 +159,21 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
url = url + 'downloadState=' + downloadState + '&';
}
if (date==''){
url = url + 'uploadDate=&';
url = url + 'uploadDate1=&';
}else{
url = url + 'uploadDate=' + date + '&';
url = url + 'uploadDate1=' + date + '&';
}
if (date1==''){
url = url + 'uploadDate2=&';
}else{
url = url + 'uploadDate2=' + date1 + '&';
}
return url + 't=' + Math.floor(Date.now());
}
var getDownloadCount = function () {
var date = $("#datepicker").val();
var date1 = $("#datepicker1").val();
var cardType = $("#cardType").val();
var packageType = $("#packageType").val();
var downloadState = $("#downloadState").val();
......@@ -182,14 +201,18 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(date=='{{choseDate}}'){
date=$scope.choseDate
}
if(date1=='{{choseDate}}'){
date1=$scope.choseDate
}
HttpService.getDownloadCount($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
cardType,packageType,downloadState,date,function(data) {
cardType,packageType,downloadState,date,date1,function(data) {
$rootScope.count = data.total;
})
}
$scope.downloadXml = function(){
$rootScope.count = 0;
var date = $("#datepicker").val();
var date1 = $("#datepicker1").val();
ngDialog.open({
template: 'dialogs/confirmToDownload.html' + urlTimeStamp(),
width: 800,
......@@ -198,12 +221,14 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
controller: ['$scope',function ($scope) {
getDownloadCount();
$scope.importDate = date;
$scope.importDate1 = date1;
$scope.confirmDownload = function () {
var url = '../exportXML/printXmlData?';
var a = document.createElement("a");
document.body.appendChild(a);
a.href = encodeURI(getCountAndDownloadUrl(url));
a.click();
console.log(getCountAndDownloadUrl(url))
$scope.closeThisDialog();
}
}]
......
src/main/resources/static/views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.html 0 → 100644
View file @ b7c0c977
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.select2-search__field {
height:30px;
}
.ul li{
cursor: pointer;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<div class="box-header">
<strong>确认接收登记妥投失败信息</strong>
</div>
<div class="box box-primary">
<div class="box-body">
<div ng-if="deliveredFailedInfo.length==0">
<h4>暂无数据</h4>
</div>
<table class="table table-bordered table-hover postTable" ng-if="deliveredFailedInfo.length>0">
<thead>
<tr>
<th><input type="checkbox" ng-model="checkAll"></th>
<th>No.</th>
<th>反向运单号</th>
<th>身份证号码</th>
<th>退回原因</th>
<th>登记人姓名</th>
<th>备注</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in deliveredFailedInfo">
<td><input type="checkbox" class="checks" ng-checked="checkAll" value="{{item.CARD_ID}}"></td>
<td>{{$index+1}}</td>
<td>{{item.WAYBILL_NUMBER}}</td>
<td>{{item.CARD_ID}}</td>
<td>{{item.REASON}}</td>
<td>{{item.REGISTER_NAME}}</td>
<td>{{item.NOTE}}</td>
</tr>
</tbody>
</table>
</div>
<div class="box-footer" style="text-align: right;" ng-if="deliveredFailedInfo.length>0">
<button class="btn btn-primary" ng-click="confirmNotDelivered()">确认接收</button>
</div>
</div>
</div>
<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>起始日期:</td>
<td>
<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="datepicker1" readonly/>
</div>
</td>
<td>截止日期:</td>
<td>
<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="datepicker2" readonly/>
</div>
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="searchHasConfirmedInfo()">查询</button>
</div>
</td>
</tr>
</table>
<div class="box-body">
<div ng-if="hasConfirmedInfo.length==0">
<h4>暂无数据</h4>
</div>
<table class="table table-bordered table-hover postTable" ng-if="hasConfirmedInfo.length>0">
<thead>
<tr>
<th>No.</th>
<th>反向运单号</th>
<th>身份证号码</th>
<th>退回原因</th>
<th>登记人姓名</th>
<th>备注</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in hasConfirmedInfo">
<td>{{$index+1}}</td>
<td>{{item.WAYBILL_NUMBER}}</td>
<td>{{item.CARD_ID}}</td>
<td>{{item.REASON}}</td>
<td>{{item.REGISTER_NAME}}</td>
<td>{{item.NOTE}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.js 0 → 100644
View file @ b7c0c977
'use strict';
angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/confirmNotDeliveredInfo', {
templateUrl: 'views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.html' + urlTimeStamp(),
controller: 'confirmNotDeliveredInfoContr',
cache: false
});
}])
.controller('confirmNotDeliveredInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog,$routeParams) {
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//查询未接收的投递失败的信息
$scope.queryDeliveredFailedInfo=function () {
HttpService.queryDeliveredFailedInfoDate(function(data){
$scope.deliveredFailedInfo = data;
console.log($scope.deliveredFailedInfo)
})
};
//查询已接收的信息
$scope.searchHasConfirmedInfo = function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
HttpService.getHasConfirmedInfo(date1,date2,function(data){
$scope.hasConfirmedInfo = data;
console.log($scope.hasConfirmedInfo);
})
}
if($rootScope.loginData.login==true){
$scope.queryDeliveredFailedInfo();
$scope.searchHasConfirmedInfo();
}
//确认接收按钮
$scope.confirmNotDelivered = function() {
var checkboxes = $(".checks:checked");
if(checkboxes.length==0){
MessageService.showAlert("请选择确认接收的证件");
}else{
var json = {
cardIdList:[],
name:$rootScope.loginData.name
};
for(var i=0;i<checkboxes.length;i++){
json.cardIdList.push(checkboxes[i].value);
}
console.log(json);
HttpService.confirmNotDelivereData(json,function(data) {
console.log(data)
$scope.checkAll = false;
$scope.queryDeliveredFailedInfo();
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/greenPackageInfo/greenPackageInfo.html 0 → 100644
View file @ b7c0c977
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.ul li{
cursor: pointer;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<strong class="box-header with-border">绿包快递单导入</strong>
<div class="box box-primary">
<table class="table table-bordered">
<tr>
<td width="15%;">订单发出日期：</td>
<td width="20%">
<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="datepicker1" readonly/>
</div>
</td>
<td width="15%">选择Excel文件：</td>
<td width="40%">
<input type="file"
id="id_file_photo_for_check"
class="file"
data-show-preview="false"
data-allowed-file-extensions='["XLS","xls","XLSX","xlsx"]'
multiple/>
</td>
<td>
<div style="float: left">
<button class="btn btn-primary" ng-click="ReadGreenInfo()">导入</button>
</div>
</td>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header">
<strong>查询导入文件详情</strong>
<!--<span class="text-aqua" ng-if="showMsg">(本次导入成功数量：{{resultData.success}}, 失败数量：{{resultData.failed}})</span>-->
</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="queryGreenByImportDate()">查询</button>
</td>
</tr>
</table>
<div class="box-body">
<div ng-if="deliveredByImportDate.length==0">
<h4>暂无数据</h4>
</div>
<table class="table table-bordered table-hover postTable" ng-if="deliveredByImportDate.length>0">
<thead>
<tr>
<th>No.</th>
<th>文件名</th>
<th>导入时间</th>
<th>导入人</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in deliveredByImportDate">
<td>{{$index+1}}</td>
<td>{{item.fileName}}</td>
<td>{{item.importDate | date:"yyyy-MM-dd hh:mm:ss"}}</td>
<td>{{item.importName}}</td>
<td><a ng-click="deleteGreenByFileId(item.id,item.importDate)">删除</a></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/greenPackageInfo/greenPackageInfo.js 0 → 100644
View file @ b7c0c977
'use strict';
angular.module('AvatarCheck.greenPackageInfo', ['ngRoute', 'AvatarCheck.http', 'tm.pagination'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/greenPackageInfo', {
templateUrl: 'views/greenPackageInfo/greenPackageInfo.html' + urlTimeStamp(),
controller: 'greenPackageInfoCtrl',
cache: false
});
}])
.controller('greenPackageInfoCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
$("#id_file_photo_for_check").fileinput({
language: 'zh',
showUpload: false,
showCaption: true,
maxFileCount: 1024,
showPreview: true,
maxFileSize: 1024 * 30
});
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
// $scope.showMsg = false;
// var showSuccessAndFailed = function(data) {
// $scope.showMsg = true;
// $scope.resultData = data;
// console.log($scope.resultData);
// };
// var changeShowMsg = function () {
// $scope.showMsg = false;
// };
$scope.ReadGreenInfo = function () {
var date =$('#datepicker1').val();
if(date==''){
date = $filter("date")(new Date(), "yyyy-MM-dd");
}
var importName = $rootScope.loginData.name;
var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files;
if(files.length==0){
MessageService.showAlert("请选择上传的文件...")
}else{
for(var i in files){
fd.append('file', files[i]);
}
var getData = $scope.queryGreenByImportDate;
ngDialog.openConfirm({
template: 'dialogs/alert.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.wrongMsg =-1;
$scope.msgText = "上传中，请稍等...";
console.log(fd,importName);
HttpService.ReadGreenInfoData(fd,date,importName,function (data) {
console.log(data)
if(data){
$scope.closeThisDialog();
ngDialog.openConfirm({
template: 'dialogs/showFailedPolice.html' + urlTimeStamp(),
width: 1100,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.resultData = data;
}]
})
// showSuccessAndFailed(data);
getData();
}else{
$scope.wrongMsg = '上传失败';
}
})
}]
});
}
}
$scope.queryGreenByImportDate=function () {
var date = $("#datepicker").val();
if(date ==''){
date = $scope.choseDate;
}
console.log(date)
HttpService.queryGreenByImportDateData(date,function(data){
$scope.deliveredByImportDate = data;
console.log($scope.deliveredByImportDate,"deliveredByImportDate")
})
};
if($rootScope.loginData.login==true){
$scope.queryGreenByImportDate();
}
$scope.deleteGreenByFileId=function (fileid,importDate) {
console.log(fileid, $filter("date")(importDate,"yyyy-MM-dd hh:mm:ss"));
var reget = $scope.queryGreenByImportDate;
ngDialog.openConfirm({
template: 'dialogs/confirmDeleteGreenFile.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.importDate = $filter("date")(importDate,"yyyy-MM-dd hh:mm:ss");
$scope.confirmDelete = function () {
$scope.closeThisDialog();
HttpService.deleteGreenByFileId(fileid,function(data){
if(data==true){
// changeShowMsg();
}else{
MessageService.showAlert("删除失败")
}
reget();
})
}
}]
});
}
});
src/main/resources/static/views/historyCards/historyBack.html
View file @ b7c0c977
......@@ -7,11 +7,11 @@
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header with-border">回迁证添加</strong>
<strong class="box-header with-border">补证添加</strong>
<table class="table table-bordered" style="margin-bottom:10px;">
<tr>
<td width="200px">
<span>回迁证数量:</span>
<span>补证数量:</span>
</td>
<td width="200px">
<input class="form-control" type="number" ng-model="historyCount"></td>
......@@ -30,7 +30,7 @@
</tr>
</table>
<div style="padding: 15px;">
<div style="padding: 15px;" ng-if="arr.length>0">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
......@@ -73,16 +73,22 @@
</div>
<div class="box">
<div class="box-header">
<strong>回迁证提交详情</strong>
<strong>补证提交详情</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="200px;">
<span>日期:</span>
<span>起始日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker" readonly/>
<input type="text" class="form-control" ng-model="choseDate1" id="datepicker1" readonly/>
</td>
<td width="200px;">
<span>截止日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
</td>
<td>
<div style="text-align: left;">
......
src/main/resources/static/views/historyCards/historyBack.js
View file @ b7c0c977
......@@ -12,7 +12,7 @@ angular.module('AvatarCheck.historyBack', ['ngRoute', 'AvatarCheck.http'])
.controller('historyBackCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker
$('#datepicker').datetimepicker({
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
......@@ -20,15 +20,27 @@ angular.module('AvatarCheck.historyBack', ['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
//查询废证
$scope.selectBackInfo = function () {
var date = $('#datepicker').val();
if(date==""){
date=$scope.choseDate
var date1 = $('#datepicker1').val();
var date2 = $('#datepicker2').val();
if(date1==""){
date1=$scope.choseDate1;
}
if(date2==""){
date2=$scope.choseDate;
}
HttpService.selectFailedInfo(date,$rootScope.loginData.name,function(data){
HttpService.selectFailedInfo(date1,date2,$rootScope.loginData.name,function(data){
$scope.failedInfo = data;
console.log($scope.failedInfo)
})
......
src/main/resources/static/views/login/login.js
View file @ b7c0c977
......@@ -13,8 +13,8 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
var whereToGo = function(process){
switch (process){
case 1:
$location.path("/createTaskList");
$rootScope.tab = '/createTaskList';
$location.path("/xmlAndSearch");
$rootScope.tab = '/xmlAndSearch';
break;
case 2:
$location.path("/taskListPrint");
......@@ -44,8 +44,8 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
$rootScope.tab = '/receitp';
break;
case 8:
$location.path("/uploadExcelAndSearch");
$rootScope.tab = '/uploadExcelAndSearch';
$location.path("/excelAndSearch");
$rootScope.tab = '/excelAndSearch';
break;
case 9:
$location.path("/filmReport");
......
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.html
View file @ b7c0c977
......@@ -7,7 +7,7 @@
<div class="box-header">
<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="choseDate" id="datepicker1" readonly/> <span>至</span>
<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="choseDate1" 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>
......@@ -19,28 +19,28 @@
<div ng-if="deliveredReportList.length==0">
<h4>暂无数据</h4>
</div>
<div ng-if="deliveredReportList.length>0">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover">
<thead>
<tr>
<th><input type="checkbox" ng-model="checkAll"></th>
<th>订单发出日期</th>
<th>邮寄数量</th>
<th>妥投数量</th>
<th>妥投失败数量</th>
<th>未妥投数量</th>
<th>打印时间</th>
<th>妥投失败数量</th>
</tr>
</thead>
<tbody ng-repeat="item in deliveredReportList">
<tr>
<td><input type="checkbox" class="checkbox" value="{{item.PRINT_DATE}}" ng-checked="checkAll"></td>
<td>{{item.PRINT_DATE | myDateFilter}}</td>
<td>{{item.POST_COUNT}}</td>
<td>{{item.DELIVERED_COUNT}}</td>
<td>{{item.DELIVERED_FAILED_COUNT}}</td>
<td>{{item.POST_COUNT-item.DELIVERED_COUNT-item.DELIVERED_FAILED_COUNT}}</td>
<td>{{item.PRINT_DATE}}</td>
</tr>
</tbody>
</table>
......@@ -53,8 +53,12 @@
</div>
<!-- /.box-body -->
</div>
<div class="box-footer" ng-if="deliveredReportList.length>0" style="border-top: 0;">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="downloadNotDelivered()">下载未妥投邮件号</button>
</div>
</div>
</div>
</div>
<!-- /.col -->
</div>
......
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.js
View file @ b7c0c977
......@@ -16,7 +16,7 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
//Date picker
$('#datepicker2').datetimepicker({
......@@ -30,11 +30,36 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'
$scope.queryDeliveredReport=function () {
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
if(date1==''){
date1=$filter("date")(new Date(), "yyyy-MM-01");
}
if(date2==''){
date2=$filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.queryDeliveredReport(date1,date2,function (data) {
$scope.deliveredReportList = data;
console.log($scope.deliveredReportList);
})
};
$scope.queryDeliveredReport();
$scope.downloadNotDelivered = function () {
var checkbox = $(".checkbox:checked");
var arr = [];
for(var i=0;i<checkbox.length;i++){
arr.push(checkbox[i].value);
}
if (arr.length==0){
MessageService.showAlert("请勾选订单发出日期");
}else {
HttpService.downloadNotDeliveredData(arr,function(data) {
var blob = new Blob([data], {type: "application/vnd.ms-excel"});
var a = document.createElement("a");
document.body.appendChild(a);
a.href = URL.createObjectURL(blob);
a.click();
})
}
}
})
\ No newline at end of file
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.html
View file @ b7c0c977
......@@ -26,26 +26,17 @@
<table class="table table-hover postTable table-bordered">
<thead>
<tr>
<th style="text-align: center;">日期</th>
<th style="text-align: center;" colspan="2">日期</th>
<th style="text-align: center;" colspan="2">普通证</th>
<th style="text-align: center;" colspan="2">邮寄证</th>
<th style="text-align: center;" colspan="2">军人证</th>
<th style="text-align: center;" colspan="2">快证</th>
<th style="text-align: center;" colspan="2">重做登记</th>
<th style="text-align: center;" colspan="2">港澳证</th>
<th style="text-align: center;" colspan="2">台湾证</th>
<th style="text-align: center;" colspan="2">异地证</th>
<th style="text-align: center;" colspan="2">补证</th>
<th style="text-align: center;" colspan="2">退回重制</th>
<th style="text-align: center;" >补证</th>
<th style="text-align: center;" colspan="2">制证数</th>
</tr>
<tr class="tr">
<td></td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td colspan="2"></td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
......@@ -57,28 +48,38 @@
<td>成品</td>
<td class="text-danger">废品</td>
<td>数量</td>
<td>数量</td>
</tr>
</thead>
<tbody ng-repeat="item in qualityCheckReportList | orderBy:date" style="border-top: 1px solid #f4f4f4;">
<tr ng-if="item.date!='合计'">
<td>{{item.date | myDateFilter}}</td>
<td colspan="2">{{item.date | myDateFilter}}</td>
<!--普通证-->
<td>{{item.list[0].VALID_COUNT}}</td>
<td>{{item.list[0].FAILED_COUNT}}</td>
<!--邮寄证-->
<td>{{item.list[7].VALID_COUNT}}</td>
<td>{{item.list[7].FAILED_COUNT}}</td>
<!--军人证-->
<td>{{item.list[4].VALID_COUNT}}</td>
<td>{{item.list[4].FAILED_COUNT}}</td>
<!--快证-->
<td>{{item.list[1].VALID_COUNT}}</td>
<td>{{item.list[1].FAILED_COUNT}}</td>
<!--退回重制-->
<td>{{item.list[2].VALID_COUNT}}</td>
<td>{{item.list[2].FAILED_COUNT}}</td>
<td>{{item.list[3].VALID_COUNT}}</td>
<td>{{item.list[3].FAILED_COUNT}}</td>
<td>{{item.list[5].VALID_COUNT}}</td>
<td>{{item.list[5].FAILED_COUNT}}</td>
<td>{{item.list[6].VALID_COUNT}}</td>
<td>{{item.list[6].FAILED_COUNT}}</td>
<!--补证-->
<td>{{item.list[8].FAILED_COUNT}}</td>
<!--制证数-->
<td>{{item.list[0].VALID_COUNT+item.list[7].VALID_COUNT+item.list[4].VALID_COUNT+
item.list[1].VALID_COUNT+item.list[2].VALID_COUNT+item.list[8].FAILED_COUNT}}</td>
</tr>
<tr ng-if="item.date=='合计'" class="bg-gray">
<td>{{item.date}}：</td>
<td colspan="2">{{item.date}}</td>
<td colspan="4">成品证：{{item.list.validCount}}</td>
<td colspan="4">废品证：{{item.list.failedCount}}</td>
<td colspan="3">补证：{{item.list.buCount}}</td>
<td colspan="4">补证：{{item.list.buCount}}</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/receitp/receitp.html
View file @ b7c0c977
......@@ -15,7 +15,7 @@
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body" ng-if="isHistory==0">
<div class="box-body" ng-if="isHistory==0||isHistory==-1">
<div ng-if="receitpData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" >
<ul class="nav nav-tabs">
......@@ -87,7 +87,7 @@
<!-- /.table -->
<div class="box-footer" ng-if="receitpData.length>0">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button>
<button class="btn btn-primary" ng-click="printReceitp()">出库&打印交接单</button>
<!--<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>-->
</div>
</div>
......@@ -170,7 +170,7 @@
<!-- /.table -->
<div class="box-footer" ng-if="receitpHistoryData.length>0">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="printReceitp(type.typeCode)">出库&打印交接单</button>
<button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button>
<!--<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>-->
</div>
</div>
......@@ -205,7 +205,7 @@
<th width="150" style="text-align: center;">
身份证受理组号
</th>
<th width="300" style="text-align: center;">
<th width="300"colspan="2" style="text-align: center;">
身份证所属派出所名称
</th>
<th width="80" style="text-align: center;">
......@@ -221,13 +221,13 @@
<td width="60">
{{item.id}}
</td>
<td width="150" style="text-align: left;">
<td width="150" style="text-align: left;padding-left: 7px;">
{{item.QR_CODE}}
</td>
<td width="300" style="text-align: left;">
<td width="300"colspan="2" style="text-align: left;padding-left: 7px;">
{{item.COUNTYNAME}}{{item.GAJG_MC}}
</td>
<td width="80" style="text-align: left;">
<td width="80" style="text-align: left; padding-left: 7px;">
{{item.FINISH_COUNT}}
</td>
<td width="145">
......@@ -240,10 +240,10 @@
<td colspan="2" class="center">
合计
</td>
<td>
<td colspan="2">
</td>
<td class= "center" style="text-align: left;">
<td class= "center" style="text-align: left;padding-left: 7px;">
{{idx.total}}
</td>
<td>
......@@ -251,7 +251,7 @@
</td>
</tr>
<tr>
<td colspan="5" style="height: 110px;text-align: left;">
<td colspan="3" style="height: 110px;text-align: left;">
<div>实发：</div>
<br />
<div class="sign">
......@@ -262,9 +262,8 @@
日期：
</div>
</td>
</tr>
<tr>
<td colspan="5" style="height: 110px;text-align: left;">
<td colspan="3" style="height: 110px;text-align: left;">
<div>实收：</div>
<br />
<div class="sign">
......
src/main/resources/static/views/receitp/receitp.js
View file @ b7c0c977
......@@ -84,19 +84,25 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
$scope.currentTab = index;
};
HttpService.getReceitp("","",function(data){
$scope.receitpData=data;
for(var i=0;i<$scope.receitpData.length;i++){
if(i==$scope.currentTab){
$scope.receitpData[i].isActive=true;
}else{
$scope.receitpData[i].isActive=false;
$scope.isHistory = -1;
var getData = function () {
HttpService.getReceitp("","",function(data){
$scope.receitpData=data;
for(var i=0;i<$scope.receitpData.length;i++){
if(i==$scope.currentTab){
$scope.receitpData[i].isActive=true;
}else{
$scope.receitpData[i].isActive=false;
}
}
}
console.log($scope.receitpData,"初始化");
});
console.log($scope.receitpData,"初始化");
});
};
if($rootScope.loginData.login==true&&$scope.isHistory == -1){
getData();
}
$scope.isHistory = 0;
$scope.doSearchReceitp = function () {
$scope.isHistory = 0;
var startDate=$('#datepicker1').val();
......@@ -149,7 +155,12 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
var iRadioValue=1;
$scope.printReceitp = function() {
var typeCode = $scope.receitpData[$scope.currentTab].typeCode;
var typeCode ='';
if($scope.isHistory==0||$scope.isHistory==-1){
typeCode = $scope.receitpData[$scope.currentTab].typeCode;
}else{
typeCode = $scope.receitpHistoryData[$scope.currentTab].typeCode;
}
console.log(typeCode)
var json={
type:typeCode,
......@@ -160,11 +171,23 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
json.list.push(checks[i].value)
}
if($scope.isHistory==0||$scope.isHistory==-1){
HttpService.updateReceiptByReceiptIdData(json.list,function(data) {
console.log(data,"更新返回值")
})
}
if(json.list.length==0){
MessageService.showAlert("请选择要打印的分局或派出所")
}else{
console.log(json)
HttpService.printReceitpData(json,function (data) {
if($scope.isHistory==0){
$scope.doSearchReceitp();
}else if($scope.isHistory==1){
$scope.searchHistory();
}else{
getData();
}
$scope.receitpDataToPrint = data;
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++){
......@@ -206,7 +229,7 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.ADD_PRINT_TEXT(90, 33, "100%", 20, "送至：");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10);
LODOP.ADD_PRINT_TABLE(110, 30, 700, "100%", document.getElementById("divPrint"+i).innerHTML);
LODOP.ADD_PRINT_TABLE(110, 30, 750, "100%", document.getElementById("divPrint"+i).innerHTML);
LODOP.SET_PRINT_STYLEA(0, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(0, "Vorient", 3);
LODOP.SET_PRINTER_INDEXA(-1);
......
src/main/resources/static/views/report/report.html
View file @ b7c0c977
......@@ -3,16 +3,17 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary" >
<div class="box" >
<div class="box-header">
<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="choseDate1" 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="choseDate2" id="datepicker2" readonly/>
<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="searchReport()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<div class="box box-primary">
<!-- /.box-header -->
<div class="box-body">
<div ng-if="reportData.length==1">
......@@ -30,16 +31,18 @@
<th>军人证</th>
<th>快证</th>
<th>废证</th>
<th>合计</th>
</tr>
</thead>
<tbody ng-repeat="item in reportData">
<tbody ng-repeat="item in reportData | orderBy:date">
<tr>
<td>{{item.date}}</td>
<td style="color: #3c8dbc">{{item.pu}}</td>
<td>{{item.pu}}</td>
<td>{{item.you}}</td>
<td>{{item.jun}}</td>
<td>{{item.kuai}}</td>
<td>{{item.fei}}</td>
<td style="color: #3c8dbc">{{item.total}}</td>
</tr>
</tbody>
</table>
......@@ -51,61 +54,8 @@
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
</div>
<!--<div class="box box-primary" >-->
<!--<div class="box-header">-->
<!--<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="choseDate1" 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="choseDate2" id="datepicker2" readonly/>-->
<!--<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchReport()">查询</button>-->
<!--</div>-->
<!--&lt;!&ndash; /.box-tools &ndash;&gt;-->
<!--</div>-->
<!--&lt;!&ndash; /.box-header &ndash;&gt;-->
<!--<div class="box-body">-->
<!--<div ng-if="reportData.length==1">-->
<!--<h4>暂无数据</h4>-->
<!--</div>-->
<!--<div ng-if="reportData.length>1">-->
<!--<div class="table-responsive mailbox-messages" >-->
<!--<div class="mailbox-messages">-->
<!--<table class="table table-hover postTable">-->
<!--<thead>-->
<!--<tr>-->
<!--<th>打印日期</th>-->
<!--<th>大批证</th>-->
<!--<th>邮寄证</th>-->
<!--<th>军人证</th>-->
<!--<th>快证</th>-->
<!--<th>废证</th>-->
<!--</tr>-->
<!--</thead>-->
<!--<tbody ng-repeat="item in reportData">-->
<!--<tr style="background-color: #eee">-->
<!--<td>{{item.date}}</td>-->
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<!--<td>{{item.you}}</td>-->
<!--<td>{{item.jun}}</td>-->
<!--<td>{{item.kuai}}</td>-->
<!--<td>{{item.fei}}</td>-->
<!--</tr>-->
<!--</tbody>-->
<!--</table>-->
<!--&lt;!&ndash; /.table &ndash;&gt;-->
<!--</div>-->
<!--&lt;!&ndash; /.table &ndash;&gt;-->
<!--</div>-->
<!--</div>-->
<!--&lt;!&ndash; /.mail-box-messages &ndash;&gt;-->
<!--</div>-->
<!--&lt;!&ndash; /.box-body &ndash;&gt;-->
<!--</div>-->
<!-- /. box -->
</div>
<!-- /.col -->
......
src/main/resources/static/views/report/report.js
View file @ b7c0c977
......@@ -10,6 +10,8 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
}])
.controller('reportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.date = 'date';
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -25,15 +27,15 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
todayBtn: 1,
autoclose: 1
});
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate2 = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-01");
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.searchReport = function () {
var date1=$('#datepicker1').val();
var date2=$('#datepicker2').val();
if(date1==''){
date1= $filter("date")(new Date(), "yyyy-MM-dd");
date1= $filter("date")(new Date(), "yyyy-MM-01");
}
if(date2==''){
date2= $filter("date")(new Date(), "yyyy-MM-dd");
......@@ -43,7 +45,10 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
console.log($scope.reportData)
})
}
$scope.searchReport();
if($rootScope.loginData.login==true){
$scope.searchReport();
}
});
\ No newline at end of file
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html
View file @ b7c0c977
......@@ -34,14 +34,10 @@
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>运单号:</td>
<td><input type="text" class="form-control" ng-model="waybillNumber" placeholder="运单号"></td>
<td>登记人姓名:</td>
<td><input type="text" class="form-control" ng-model="registerName" placeholder="登记人姓名"></td>
<td>反向运单号:</td>
<td><input type="text" class="form-control" ng-model="waybillNumber" placeholder="反向运单号"></td>
<td>身份证号码:</td>
<td><input type="text" class="form-control" ng-model="cardId" placeholder="身份证号码"></td>
</tr>
<tr>
<td>退回原因:</td>
<td>
<select class="form-control select2" ng-model="backReason">
......@@ -49,9 +45,12 @@
<option ng-repeat="item in backReasonList" value="{{item.id}}">{{item.reason}}</option>
</select>
</td>
</tr>
<tr>
<td>登记人姓名:</td>
<td><input type="text" class="form-control" ng-model="registerName" placeholder="登记人姓名"></td>
<td>备注:</td>
<td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
<td><div style="text-align: left;">
<button class="btn btn-primary" ng-click="saveDeliveredFailedInfo()">提交</button>
</div></td>
......@@ -67,7 +66,7 @@
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%;">查询日期：</td>
<td width="15%;">起始日期：</td>
<td width="30%">
<div class="input-group date">
<div class="input-group-addon">
......@@ -76,6 +75,15 @@
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
<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="datepicker1" readonly/>
</div>
</td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="queryDeliveredFailedByRegisterDate()">查询</button>
</td>
......@@ -88,26 +96,25 @@
<table class="table table-bordered table-hover postTable" ng-if="deliveredFailedByRegisterDate.length>0">
<thead>
<tr>
<th>流水号</th>
<th>No.</th>
<th>反向运单号</th>
<th>身份证号码</th>
<th>退回原因</th>
<th>登记人姓名</th>
<th>运单号</th>
<th>备注</th>
<th>退回原因</th>
<th>身份证号码</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in deliveredFailedByRegisterDate">
<td>{{item.ID}}</td>
<td>{{item.REGISTER_NAME}}</td>
<td>{{$index+1}}</td>
<td>{{item.WAYBILL_NUMBER}}</td>
<td>{{item.NOTE}}</td>
<td>{{item.REASON}}</td>
<td>{{item.CARD_ID}}</td>
<td><button class="btn btn-primary" ng-click="deleteDeliveredFailedById(item.ID)">删除</button></td>
<td>{{item.REASON}}</td>
<td>{{item.REGISTER_NAME}}</td>
<td>{{item.NOTE}}</td>
<td ng-if="item.RECEIVE_DATE==null"><button class="btn btn-primary" ng-click="deleteDeliveredFailedById(item.ID)">删除</button></td>
<td ng-if="item.RECEIVE_DATE!=null"><button class="btn btn-primary" disabled>删除</button></td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js
View file @ b7c0c977
......@@ -23,6 +23,14 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
todayBtn: 1,
autoclose: 1
});
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.saveDeliveredFailedInfo=function () {
......@@ -34,44 +42,72 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
MessageService.showAlert("请选择退回原因")
}else{
var note = $scope.note;
if(angular.isUndefined(note)){
note = "";
}
if(angular.isUndefined(waybillNumber)){
waybillNumber = "";
}
if(angular.isUndefined(registerName)){
registerName = "";
}
if(angular.isUndefined(cardId)){
cardId = "";
}
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("提交成功");
console.log(arr,"==========");
var waybillNumberArr = [];
var json = {
backWaybillNumber:waybillNumber,
cardId:cardId
};
waybillNumberArr.push(json);
HttpService.checkThisWaybillNumber(waybillNumberArr,function(data) {
console.log(data);
if(data){
HttpService.saveDeliveredFailedInfo(arr,function (data) {
$scope.queryDeliveredFailedByRegisterDate();
if(data==true){
MessageService.showAlert("提交成功");
}else{
MessageService.showAlert("提交失败")
}
})
}else{
MessageService.showAlert("提交失败")
MessageService.showAlert("该反向邮件号不存在")
}
})
}
}
$scope.queryDeliveredFailedByRegisterDate=function () {
var date = $("#datepicker").val();
var date1 = $("#datepicker1").val();
if(date ==''){
date = $scope.choseDate;
}
console.log(date)
HttpService.queryDeliveredFailedByRegisterDate(date,function(data){
if(date1 ==''){
date1 = $scope.choseDate;
}
console.log(date,date1);
HttpService.queryDeliveredFailedByRegisterDate(date,date1,function(data){
$scope.deliveredFailedByRegisterDate = data;
console.log($scope.deliveredFailedByRegisterDate)
})
};
$scope.queryDeliveredFailedByRegisterDate();
if($rootScope.loginData.login==true){
$scope.queryDeliveredFailedByRegisterDate();
}
$scope.deleteDeliveredFailedById=function (id) {
console.log(id);
HttpService.deleteDeliveredFailedById(id,function(data){
if(data==true){
MessageService.showAlert("删除成功")
}else{
MessageService.showAlert("删除失败")
}
HttpService.queryDeliveredFailedByRegisterDate($("#datepicker").val(),function(data){
$scope.deliveredFailedByRegisterDate = data;
console.log($scope.deliveredFailedByRegisterDate)
})
$scope.queryDeliveredFailedByRegisterDate();
})
}
})
\ No newline at end of file
src/main/resources/static/views/searchCard/searchCard.html
View file @ b7c0c977
......@@ -22,7 +22,7 @@
<table class="table table-hover table-bordered">
<thead>
<th>任务单流水号</th>
<th>区县</th>
<!--<th>区县</th>-->
<th>制证类型</th>
<th>数量</th>
<th>工作组</th>
......@@ -35,7 +35,7 @@
<tbody>
<tr ng-repeat="item in searchResult.workOrderData">
<td>{{item.TASK_ID}}</td>
<td>{{item.COUNTYNAME}}</td>
<!--<td>{{item.COUNTYNAME}}</td>-->
<td>{{item.CARD_TYPE}}</td>
<td>{{item.VALID_COUNT}}</td>
<td ng-show="item.WORK_GROUP==1">A组</td>
......@@ -87,11 +87,11 @@
<td>{{item.ID_NO}}</td>
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td>{{item.GAJG1}}</td>
<td>{{item.SIGN_GOVT}}</td>
<td>{{item.BEGIN_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>{{item.POLICE_NAME}}</td>
</tr>
</tbody>
</table>
......@@ -138,11 +138,11 @@
<td>{{item.ID_NO}}</td>
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td>{{item.GAJG1}}</td>
<td>{{item.SIGN_GOVT}}</td>
<td>{{item.BEGIN_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>{{item.POLICE_NAME}}</td>
<td></td>
</tr>
</tbody>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ b7c0c977
......@@ -41,7 +41,8 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
count:'',
policeCardsList:[],
isShow:false,
policeData:''
policeData:'',
QR_CODE:''
}
var getDetailListById = function (id) {
......@@ -60,11 +61,17 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
$scope.json.policeCardsList[i].styleClass = "bg-danger"
}
}
if($scope.json.policeCardsList.length==1){
$scope.PreviewMytableRotate();
}
$scope.json.id = id;
console.log($scope.json)
})
}
var bgCount = 0;
$scope.showDetail = function(item){
bgCount = 0;
for(var i=0;i<$scope.tagPrintData.length;i++){
if($scope.tagPrintData[i].ID!==item.ID){
$scope.tagPrintData[i].show = false;
......@@ -75,6 +82,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
$scope.json.policeName = item.GAJG_MC;
$scope.json.policeCode = item.POLICE_CODE;
$scope.json.count = item.FINISH_COUNT;
$scope.json.QR_CODE = item.QR_CODE;
$scope.json.isShow=item.show;
getDetailListById(item.ID);
};
......@@ -100,7 +108,9 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
var getCardDetailsByIdCardAndDate = function (idcard,startDate,endDate) {
HttpService.selectTagPrintData(idcard,startDate,endDate,function(data){
console.log(data);
$scope.json.QR_CODE = data.qrCode;
$scope.json.policeName = data.policeName;
$scope.json.count = data.count;
if(data.state===1){
$scope.json.isShow=true;
getPoliceListDataNotChecked();
......@@ -130,6 +140,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
})
}
$scope.doQueryByIdCard = function(idcard,startDate,endDate){
console.log(idcard,startDate,endDate);
if($scope.json.policeCardsList.length>0&&$scope.json.isShow===true){
......@@ -137,14 +148,24 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
for (var i=0;i<$scope.json.policeCardsList.length;i++){
if($scope.json.policeCardsList[i].CARD_ID===idcard){
$scope.json.policeCardsList[i].styleClass="bg-danger";
bgCount=bgCount+1;
} else{
count=count+1;
}
if(count===$scope.json.policeCardsList.length){
MessageService.showAlert("身份证号:"+idcard+" 在本组中不存在");
}
if(bgCount==2&&$scope.json.policeCardsList.length>=2){
$scope.PreviewMytableRotate();
break;
}
if($scope.json.policeCardsList.length==1){
$scope.PreviewMytableRotate();
break;
}
}
}else{
bgCount = 1;
getCardDetailsByIdCardAndDate(idcard,startDate,endDate);
}
};
......@@ -250,7 +271,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
$scope.PreviewMytableRotate = function(){
HttpService.getPoliceName($scope.json.policeCode,function(data) {
HttpService.getPoliceName($scope.json.QR_CODE,function(data) {
$scope.json.policeData = data[0].POLICE_NAME;
console.log($scope.json.policeData)
$timeout(function () {
......
src/main/resources/static/views/task/task.js
View file @ b7c0c977
......@@ -7,16 +7,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
controller: 'taskListPrintCtrl',
cache: false
});
$routeProvider.when('/taskListPreLocating', {
templateUrl: 'views/task/taskListPreLocating.html' + urlTimeStamp(),
controller: 'taskListPreLocatingCtrl',
cache: false
});
$routeProvider.when('/taskListPushing', {
templateUrl: 'views/task/taskListPushing.html' + urlTimeStamp(),
controller: 'taskListPreLocatingCtrl',
cache: false
});
$routeProvider.when('/taskListEwriting', {
templateUrl: 'views/task/taskListEwriting.html' + urlTimeStamp(),
controller: 'taskListEwritingCtrl',
......@@ -66,8 +56,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
console.log($scope.cycleSheetData)
})
}
$scope.searchTaskList();
if($rootScope.loginData.login==true){
$scope.searchTaskList();
}
$scope.searchHistory = function(){
$scope.totalCardProd = 0;
$scope.isHistory=1;
......@@ -257,176 +248,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
})
}
})
.controller('taskListPreLocatingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.desc = 0;
$scope.countyCode = "countyCode";
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.isHistory=0;
$scope.searchTaskList = function(){
$scope.selected = [];
$scope.isHistory=0;
HttpService.getPingTaskListByProcess(function(data){
$scope.cycleSheetData = data.typeList;
$scope.total = data.total;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log(data)
})
}
$scope.searchTaskList();
$scope.searchHistory = function(){
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("历史：",$scope.cycleSheetData)
})
}
//创建变量用来保存选中结果
$scope.selected = [];
var updateSelected = function (action, task) {
if (action === 'add' && $scope.selected.indexOf(task) === -1) {
$scope.selected.push(task);
}
if (action === 'remove' && $scope.selected.indexOf(task) !== -1) $scope.selected.splice($scope.selected.indexOf(task), 1);
};
//更新某一列数据的选择
$scope.updateSelection = function ($event, task) {
var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove');
updateSelected(action, task);
};
//全选操作
$scope.selectAll = function (task,$event) {
var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove');
for (var i = 0; i < task.length; i++) {
var contact = task[i];
updateSelected(action, contact);
}
};
$scope.isSelected = function (task) {
return $scope.selected.indexOf(task) >= 0;
};
$scope.isSelectedAll = function (index) {
return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
};
$scope.taskId=1;
$scope.getPoliceList = function(groupList,taskId){
$scope.policeList = groupList;
if($scope.taskId==1){
$scope.taskId=taskId;
}else{
$scope.taskId=1
}
console.log(groupList)
}
$scope.currentTab = 0;
$scope.func = function (index) {
for (var idx in $scope.cycleSheetData) {
if (index == idx) {
$scope.cycleSheetData[idx].isActive = true;
} else {
$scope.cycleSheetData[idx].isActive = false;
}
}
$scope.currentTab = index;
}
$scope.getSpecialCardsInfo = function(groupNo,specialCardCount){
if(parseInt(specialCardCount)>0){
ngDialog.open({
template: 'dialogs/specailCardInfo.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
HttpService.getSpecialCardData(groupNo,function(data) {
$scope.specailCardData = data;
console.log(data)
})
}]
});
}else{
MessageService.showAlert("该组中没有特殊证件")
}
}
$scope.goes = function(){
$rootScope.selectCount = 0;
for (var i = 0; i < $scope.selected.length; i++) {
$rootScope.selectCount =$rootScope.selectCount + parseInt($scope.selected[i].countyValidCount-$scope.selected[i].specialCount);
}
console.log("for",$rootScope.selectCount)
var go = function () {
var checks = $(".checkOneBox:checked");
if(checks.length>0){
var arr = [];
var failedArr=[];
for (var i=0;i<checks.length;i++){
if(checks[i].value.length<11){
failedArr.push(checks[i].value)
}else{
arr.push(checks[i].value)
}
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr,
failedList:failedArr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
$scope.selected=[];
$rootScope.closeThis();
})
}else{
MessageService.showAlert("请选择转出的任务单")
}
}
ngDialog.open({
template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope',function ($scope) {
$scope.confirmGoTo = go;
$rootScope.closeThis = $scope.closeThisDialog;
}]
})
}
})
.controller('taskListEwritingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
......@@ -463,7 +284,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
console.log($scope.cycleSheetData)
})
}
$scope.searchTaskList();
if($rootScope.loginData.login==true){
$scope.searchTaskList();
}
$scope.searchHistory = function(){
$scope.totalCardProd = 0;
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ b7c0c977
......@@ -38,7 +38,7 @@
<td><input type="text" class="form-control" ng-model="applicantName" placeholder="申请人姓名"></td>
<td>订单号:</td>
<td><input type="text" class="form-control" ng-model="orderNo" placeholder="订单号"></td>
<td>邮件号:</td>
<td>正向邮件号:</td>
<td><input type="text" class="form-control" ng-model="emailNo" placeholder="邮件号"></td>
</tr>
<tr>
......@@ -56,7 +56,7 @@
<td style="text-align: left;">
<select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择区县--"
style="width: 100%;" ng-model="currentCounty">
<option value="{{county.countyCode}}" ng-repeat="county in countyList">{{county.countyname}}</option>
<option value="{{county.countyname}}" ng-repeat="county in countyList">{{county.countyname}}</option>
</select>
</td>
</tr>
......@@ -100,9 +100,9 @@
<table class="table table-bordered table-hover" ng-if="postData.length>0">
<thead>
<tr>
<th>NO.</th>
<!--<th>NO.</th>-->
<th>订单号</th>
<th>邮件号</th>
<th>正向邮件号</th>
<th>反向邮件号</th>
<th>受理号</th>
<th>申请人姓名</th>
......@@ -114,7 +114,7 @@
</thead>
<tbody>
<tr ng-repeat="item in postData | orderBy:item.id">
<td>{{item.id}}</td>
<!--<td>{{item.id}}</td>-->
<td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td>
<td>{{item.backWaybillNumber}}</td>
......@@ -123,7 +123,10 @@
<td>{{item.recipientPhone}}</td>
<td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click="addNote(item.id)"><a>备注</a></td>
<td ng-click="addNote(item.id)">
<a style="color: black">{{item.note}}</a>
<a ng-if="item.note==null" >更新</a>
</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ b7c0c977
......@@ -364,6 +364,8 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
arr.push(json);
}
HttpService.updateTheseNote(arr,function(data) {
$scope.closeThisDialog();
getPost();
if(data){
$scope.consoleMsg = "更新成功";
}
......
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