Skip to content

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

Merge remote-tracking branch 'origin/dev' into dev

parents 9cc19e4a ad8060a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 113 deletions
src/main/resources/static/dialogs/gotoDistribute.html 0 → 100644
View file @ 3979ea1b
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>已选择任务量{{cardsTotal}}，是否确认下发？</div>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmGoTo()">确认</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/views/addFailed/addFailed.js
View file @ 3979ea1b
......@@ -83,7 +83,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
if($scope.personInfo[i].SEX_NO==-1){
$scope.can = true;
}
}
......
src/main/resources/static/views/addTag/addTag.js
View file @ 3979ea1b
......@@ -76,7 +76,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1||$scope.personInfo[i].SPECIAL_TYPE==0||$scope.personInfo[i].SPECIAL_TYPE==1||$scope.personInfo[i].SPECIAL_TYPE==2||$scope.personInfo[i].SPECIAL_TYPE==3){
if($scope.personInfo[i].SEX_NO==-1){
$scope.can = true;
}
}
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 3979ea1b
......@@ -53,7 +53,6 @@
</ul>
</a>
</li>
<li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal+groupCardsTotal}}</h4></li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
......@@ -65,20 +64,29 @@
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>证件数量</th>
<th>合格数量</th>
<th>不合格数量</th>
<th>特殊证件数量</th>
<th>状态</th>
<th></th>
</tr>
</thead>
<tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc">
<tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
<td ng-if="task.DEAL_FLAG==3"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
<td ng-if="task.DEAL_FLAG!=3"></td>
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.countyInvalidCount}}</td>
<td class="mailbox-date">{{task.specialCount}}</td>
<td ng-if="task.DEAL_FLAG==0" style="color: #9f191f">未处理</td>
<td ng-if="task.DEAL_FLAG==1||groups.DEAL_FLAG==2" style="color: #0b93d5">处理中</td>
<td ng-if="task.DEAL_FLAG==3">可以转出</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList)">组号列表</a></td>
</tr>
</tbody>
......@@ -117,6 +125,7 @@
<th>保存日期</th>
<th>地区</th>
<th>组数</th>
<th>证件数量</th>
<th>受理组号</th>
<th>合格数量</th>
<th>不合格数量</th>
......@@ -128,6 +137,7 @@
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.countyInvalidCount}}</td>
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 3979ea1b
......@@ -206,39 +206,49 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
};
$scope.createTaskList = function(typeCode){
if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
var arr = [];
for (var i=0;i<$scope.selected.length;i++){
var json = {
countyCode:$scope.selected[i].countyCode,
typeCode:typeCode
var go = function () {
if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
var arr = [];
for (var i=0;i<$scope.selected.length;i++){
var json = {
countyCode:$scope.selected[i].countyCode,
typeCode:typeCode
}
arr.push(json);
}
arr.push(json);
}
var groupList = [];
for (var i=0;i<$scope.selectedGroup.length;i++){
groupList.push($scope.selectedGroup[i].GROUP_NO)
}
var map = {
date:$('#datepicker').val(),
name:$rootScope.loginData.name,
countyList:arr,
groupList:groupList
var groupList = [];
for (var i=0;i<$scope.selectedGroup.length;i++){
groupList.push($scope.selectedGroup[i].GROUP_NO)
}
var map = {
date:$('#datepicker').val(),
name:$rootScope.loginData.name,
countyList:arr,
groupList:groupList
}
console.log(map)
HttpService.createTask(map,function(data){
console.log(data)
MessageService.showAlert(data.msg)
console.log($scope.searchCurrent)
$scope.searchCurrent();
$scope.selected=[];
$rootScope.selectedGroup=[];
$rootScope.cardsTotal = 0;
})
}else{
MessageService.showAlert("请选择创建任务单的组")
}
console.log(map)
HttpService.createTask(map,function(data){
console.log(data)
MessageService.showAlert(data.msg)
console.log($scope.searchCurrent)
$scope.searchCurrent();
$scope.selected=[];
$rootScope.selectedGroup=[];
$rootScope.cardsTotal = 0;
})
}else{
MessageService.showAlert("请选择创建任务单的组")
}
ngDialog.open({
template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService',function ($scope) {
$scope.confirmGoTo = go;
}]
})
}
});
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 3979ea1b
......@@ -27,7 +27,6 @@
</ul>
</a>
</li>
<li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
......@@ -39,6 +38,7 @@
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>证件数量</th>
<th>合格数量</th>
<th>不合格数量</th>
<th>废证数量</th>
......@@ -53,6 +53,7 @@
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.countyInvalidCount}}</td>
<td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 3979ea1b
......@@ -159,32 +159,44 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.goes = 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 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();
MessageService.showAlert("下发完成")
$rootScope.cardsTotal = 0;
})
}else{
MessageService.showAlert("请选择下发的任务单")
}
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();
MessageService.showAlert("下发完成")
$rootScope.cardsTotal = 0;
})
}else{
MessageService.showAlert("请选择下发的任务单")
}
ngDialog.open({
template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService',function ($scope) {
$scope.confirmGoTo = go;
}]
})
}
});
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ 3979ea1b
......@@ -27,7 +27,6 @@
</ul>
</a>
</li>
<li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
......@@ -40,7 +39,6 @@
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>核验数量</th>
<th>证件数量</th>
<th>电写入数量</th>
<th>特殊证件数量</th>
......@@ -57,7 +55,6 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject"></td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.eWriteCount}}</td>
<td class="mailbox-subject">{{task.specialCount}}</td>
......@@ -72,7 +69,6 @@
<thead>
<th>组号</th>
<th>派出所名称</th>
<th>核验数量</th>
<th>证件数量</th>
<th>电写入数量</th>
<th>特殊证件数量</th>
......@@ -83,7 +79,6 @@
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.GAJG_MC}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.E_WRITER_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
......@@ -131,7 +126,6 @@
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
......@@ -145,7 +139,6 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
......@@ -158,7 +151,6 @@
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
......@@ -167,7 +159,6 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 3979ea1b
......@@ -27,7 +27,6 @@
</ul>
</a>
</li>
<li class="pull-right" style="padding-right: 20px;"><h4>已选择数量：{{cardsTotal}}</h4></li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
......@@ -40,7 +39,6 @@
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
......@@ -56,7 +54,6 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
......@@ -69,7 +66,6 @@
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
......@@ -78,7 +74,6 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
......@@ -125,7 +120,6 @@
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th></th>
......@@ -138,7 +132,6 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
......@@ -149,7 +142,6 @@
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th></th>
......@@ -157,7 +149,6 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 3979ea1b
......@@ -95,7 +95,6 @@
</table>
<!-- /.table -->
<div class="box-footer">
<h5 style="text-align: right;">已转出任务量：{{distributedCount}}</h5>
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
......
src/main/resources/static/views/task/taskListPushing.html
View file @ 3979ea1b
......@@ -27,9 +27,6 @@
</ul>
</a>
</li>
<li style="float: right; padding-right: 20px;">
<h4>任务总数:{{cardsTotal}}</h4>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
......@@ -42,7 +39,6 @@
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
......@@ -58,7 +54,6 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
......@@ -71,7 +66,6 @@
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
......@@ -80,7 +74,6 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
......@@ -127,7 +120,6 @@
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th></th>
......@@ -140,7 +132,6 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
......@@ -151,7 +142,6 @@
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th></th>
......@@ -159,7 +149,6 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 3979ea1b
......@@ -31,9 +31,6 @@
</ul>
</a>
</li>
<li style="float: right; padding-right: 20px;">
<h4>任务总数:{{cardsTotal}}</h4>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages"
......@@ -48,7 +45,6 @@
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>核验数量</th>
<th>证件数量</th>
<th>电写入数量</th>
<th>特殊证件数量</th>
......@@ -70,8 +66,7 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject"></td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.eWriteCount}}</td>
<td class="mailbox-subject">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">
......@@ -80,7 +75,7 @@
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-subject">{{task.recheckCount}}</td>
<td class="mailbox-date"><a
ng-click="getPoliceList(task.policeList,task.taskId)">派出所列表</a></td>
ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
<td class="mailbox-subject">
<button class="btn btn-primary">打印封条</button>
</td>
......@@ -92,7 +87,6 @@
<thead>
<th>组号</th>
<th>派出所名称</th>
<th>核验数量</th>
<th>证件数量</th>
<th>电写入数量</th>
<th>特殊证件数量</th>
......@@ -103,7 +97,6 @@
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.GAJG_MC}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.E_WRITER_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
......@@ -154,7 +147,6 @@
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>复核数量</th>
......@@ -169,8 +161,7 @@
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.policeList.length}}</td>
<td class="mailbox-subject"></td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.specialCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-date"><a
......@@ -185,7 +176,6 @@
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th></th>
......@@ -193,7 +183,6 @@
<tbody>
<tr ng-repeat="item in policeList">
<td>{{item.GROUP_NO}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 3979ea1b
......@@ -39,7 +39,7 @@
<td>订单号:</td>
<td><input type="text" class="form-control" ng-model="orderNo" placeholder="订单号"></td>
<td>序号:</td>
<td><input type="text" class="form-control" ng-model="number" placeholder="序号"></td>
<td><input type="text" class="form-control" ng-model="emailNo" placeholder="邮件号"></td>
</tr>
<tr>
<td>打印状态:</td>
......@@ -75,8 +75,8 @@
<td colspan="4">
<div style="float: left">
<button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button>
<button class="btn btn-primary" style="margin-right: 7px;"ng-click="subSomething()">读卡查询</button>
<button type="submit" class="btn btn-info"style="margin-right: 7px;" ng-click="downloadExcel()"> 下载Excel</button>
<button class="btn btn-primary" style="margin-right: 7px;" ng-click="subSomething()">读卡查询</button>
<button type="submit" class="btn btn-info" style="margin-right: 7px;" ng-click="downloadExcel()"> 下载Excel</button>
<button type="submit" class="btn btn-danger" ng-click="deleteRecords()"> 删除</button>
</div>
</td>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 3979ea1b
......@@ -61,6 +61,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else {
json.state=$("#print").val();
}
if(angular.isUndefined($scope.emailNo)){
json.emailNo = ''
}else{
json.emailNo =$scope.emailNo
}
if (angular.isDefined($scope.gkxx)) {
json.latticeMouthInformation = $scope.gkxx
}else {
......@@ -97,6 +102,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else {
json.state=$("#print").val();
}
if(angular.isUndefined($scope.emailNo)){
json.emailNo = ''
}else{
json.emailNo =$scope.emailNo
}
if (angular.isDefined($scope.gkxx)) {
json.latticeMouthInformation = $scope.gkxx
}else {
......@@ -134,7 +144,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
var getCountAndDownloadUrl = function (url) {
var date=$('#datepicker').val();
if (angular.isDefined($scope.applicantName)) {
url = url + 'sqrxm=' + $scope.applicantName + '&';
}else{
......@@ -161,18 +171,19 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
url = url + 'gkxx=&';
}
if ($("#county").val() != null) {
// for (var i = 0; i < $("#county").val().length; i++) {
// url = url + 'djx=' + ($("#county").val())[i] + '&';
// }
url = url + 'djx=' + ($("#county").val()) + '&';
}else{
url = url + 'djx=&';
}
if ($("#datepicker").val() == '') {
url = url + 'uploadDate=&';
if(angular.isUndefined($scope.emailNo)){
url = url + 'emailNo=&';
}else{
url = url + 'emailNo='+$scope.emailNo+'&';
}
if ($("#datepicker").val() != '') {
url = url + 'uploadDate=' + $("#datepicker").val() + '&';
if(date=='{{choseDate}}'){
url = url + 'uploadDate='+$scope.choseDate+'&';
}else {
url = url + 'uploadDate='+$("#datepicker").val()+'&';
}
return url + 't=' + Math.floor(Date.now());
}
......
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