Skip to content

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

各个工序任务单

parent c9e3a442
Hide whitespace changes
Inline Side-by-side
Showing with 819 additions and 618 deletions
src/main/resources/static/dialogs/specailCardInfo.html 0 → 100644
View file @ 54f4059c
<div class="ui-dialog-title">
特殊证件详情
</div>
<div class="ui-dialog-content">
<table class="table" style="border-color: black;">
<thead>
<tr>
<th>受理号</th>
<th>证件类型</th>
<th>工序</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="groups in specailCardData">
<td>{{groups.ACCEPT_NO}}</td>
<td ng-if="groups.SPECIAL_TYPE==2">快证</td>
<td ng-if="groups.SPECIAL_TYPE==1">余证</td>
<td>{{groups.TASK_STATE}}</td>
</tr>
</tbody>
</table>
</div>
\ No newline at end of file
src/main/resources/static/js/service.js
View file @ 54f4059c
...@@ -499,6 +499,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -499,6 +499,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
getFjTaskListByProcess:function(success){
$http({
method: 'GET',
url: "../TaskList/queryByCountyAtAuxiliaryState3"+urlTimeStamp(),
params:{
process:$rootScope.loginData.roleList[0].process
}
}).then(function successCallback(response) {
success(response.data)
})
},
getPingTaskListByProcess:function(success) {
$http({
method: 'GET',
url: "../TaskList/queryByCountyAtAuxiliaryState1" + urlTimeStamp(),
params: {
process: $rootScope.loginData.roleList[0].process
}
}).then(function successCallback(response) {
success(response.data)
})
},
analyseData:function(date,currPage,pageSize,success){ analyseData:function(date,currPage,pageSize,success){
$http({ $http({
method: 'GET', method: 'GET',
...@@ -534,6 +556,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -534,6 +556,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
updatePrintTaskListProcess:function(json,success){
var body = JSON.stringify(json);
$http({
method: 'POST',
url: "../TaskList/updateState2",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
addSpecialCard:function(data,success){ addSpecialCard:function(data,success){
var body = JSON.stringify(data); var body = JSON.stringify(data);
$http({ $http({
...@@ -544,6 +577,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -544,6 +577,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
getSpecialCardData:function(groupNo,success){
console.log(groupNo)
$http({
method: 'GET',
url: "../SpecialCard/selectSpecialCard"+urlTimeStamp(),
params:{
groupNo:groupNo
}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 54f4059c
...@@ -142,28 +142,34 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -142,28 +142,34 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
}; };
$scope.createTaskList = function(typeCode){ $scope.createTaskList = function(typeCode){
var arr = []; if($scope.selected.length>0){
for (var i=0;i<$scope.selected.length;i++){ var arr = [];
var json = { for (var i=0;i<$scope.selected.length;i++){
countyCode:$scope.selected[i].countyCode, var json = {
typeCode:typeCode countyCode:$scope.selected[i].countyCode,
typeCode:typeCode
}
arr.push(json);
} }
arr.push(json);
} var groupList = [];
var groupList = []; var map = {
var map = { date:$('#datepicker').val(),
date:$('#datepicker').val(), name:$rootScope.loginData.name,
name:$rootScope.loginData.name, countyList:arr,
countyList:arr, groupList:groupList,
groupList:groupList, tag:0
tag:0 }
console.log(map)
HttpService.createTask(map,function(data){
MessageService.showAlert("创建成功")
console.log(reGet)
reGet();
})
}else{
MessageService.showAlert("请选择创建任务单的组")
} }
console.log(map)
HttpService.createTask(map,function(data){
MessageService.showAlert("创建成功")
console.log(reGet)
reGet();
})
} }
}); });
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 54f4059c
...@@ -37,69 +37,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -37,69 +37,6 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
} }
$scope.searchTaskList(); $scope.searchTaskList();
// $scope.cycleSheetData = [
// {
// typeCode: '1',
// typeName: '普通证',
// typeSum: 300,
// isActive: 'true',
// countyList: [
// {
// saveDate: '20190228',
// county: '朝阳区',
// groupCount:5,
// groupNo: '00234653-03687587',
// valid: 240,
// invalid: 0,
// state:'未下发'
// },
// {
// saveDate: '20190228',
// county: '海淀区',
// groupCount:6,
// groupNo: '00234653-03687588',
// valid: 280,
// invalid: 2,
// state:'未下发'
// },
// {
// saveDate: '20190228',
// county: '海淀区',
// groupCount:6,
// groupNo: '00234653-03687588',
// valid: 280,
// invalid: 2,
// state:'未下发'
// }
// ]
// },
// {
// typeCode: '9',
// typeName: '邮寄证',
// typeSum: 500,
// isActive: 'false',
// countyList: [
// {
// saveDate: '20190228',
// county: '朝阳区',
// groupCount:5,
// groupNo: '00234653-03687587',
// valid: 240,
// invalid: 0,
// state:'未下发'
// },
// {
// saveDate: '20190228',
// county: '海淀区',
// groupCount:6,
// groupNo: '00234653-03687588',
// valid: 280,
// invalid: 2,
// state:'未下发'
// }
// ]
// }
// ]
//创建变量用来保存选中结果 //创建变量用来保存选中结果
$scope.selected = []; $scope.selected = [];
...@@ -172,47 +109,53 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -172,47 +109,53 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.currentTab = index; $scope.currentTab = index;
} }
$scope.getPoliceList = function(taskId){ $scope.getPoliceList = function(countyCode,typeCode){
ngDialog.open({ ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(), template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600, width: 800,
cache: false, cache: false,
closeByDocument:false, closeByDocument:false,
controller: ['$scope', function ($scope) { controller: ['$scope', 'HttpService',function ($scope,HttpService) {
$scope.policeList = [ console.log($('#datepicker').val(),countyCode,typeCode);
{ $scope.paginationConf = {
policeName:'东城派出所', currentPage: 1,
dataCheckCount:100, itemsPerPage: 10,
printCount:0, perPageOptions: [10, 20, 30, 40, 50]
qualityCheckCount:0 };
}, var getGroupInfoList = function () {
{ HttpService.getGroupListData($('#datepicker').val(),countyCode,typeCode,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){
policeName:'西城派出所', $scope.paginationConf.totalItems = data.count;
dataCheckCount:200, $scope.policeList =data.groupList;
printCount:0, })
qualityCheckCount:0 }
} // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
] $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', getGroupInfoList);
}] }]
}); });
} }
$scope.goes = function(){ $scope.goes = function(){
var checks = $(".checkOneBox:checked"); var checks = $(".checkOneBox:checked");
var arr = []; if(checks.length>0){
for (var i=0;i<checks.length;i++){ var arr = [];
arr.push(checks[i].value) for (var i=0;i<checks.length;i++){
} arr.push(checks[i].value)
var json={ }
process:$rootScope.loginData.roleList[0].process, var json={
name:$rootScope.loginData.name, process:$rootScope.loginData.roleList[0].process,
taskIdList:arr name:$rootScope.loginData.name,
taskIdList:arr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
}else{
MessageService.showAlert("请选择下发的任务单")
} }
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
} }
}); });
......
src/main/resources/static/views/task/task.js
View file @ 54f4059c
...@@ -14,12 +14,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -14,12 +14,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}); });
$routeProvider.when('/taskListPushing', { $routeProvider.when('/taskListPushing', {
templateUrl: 'views/task/taskListPushing.html' + urlTimeStamp(), templateUrl: 'views/task/taskListPushing.html' + urlTimeStamp(),
controller: 'taskListPushingCtrl', controller: 'taskListPreLocatingCtrl',
cache: false cache: false
}); });
$routeProvider.when('/taskListCutting', { $routeProvider.when('/taskListCutting', {
templateUrl: 'views/task/taskListCutting.html' + urlTimeStamp(), templateUrl: 'views/task/taskListCutting.html' + urlTimeStamp(),
controller: 'taskListCuttingCtrl', controller: 'taskListPreLocatingCtrl',
cache: false cache: false
}); });
$routeProvider.when('/taskListSorting', { $routeProvider.when('/taskListSorting', {
...@@ -128,6 +128,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -128,6 +128,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.searchTaskList(); $scope.searchTaskList();
//TODO 需要保证有废证的任务单不能下发
//创建变量用来保存选中结果 //创建变量用来保存选中结果
$scope.selected = []; $scope.selected = [];
var updateSelected = function (action, task) { var updateSelected = function (action, task) {
...@@ -139,15 +141,15 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -139,15 +141,15 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
//更新某一列数据的选择 //更新某一列数据的选择
var temp = 0; var temp = 0;
$rootScope.cardsTotal = 0; $rootScope.cardsTotal = 0;
$scope.updateSelection = function ($event, task) { $scope.updateSelection = function ($event, task,typeCode) {
var checkbox = $event.target; var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove'); var action = (checkbox.checked ? 'add' : 'remove');
updateSelected(action, task); updateSelected(action, task);
var sum = 0; var sum = 0;
var checks = document.getElementsByClassName("checkOneBox"); var checks = document.getElementsByClassName("checkOneBox"+typeCode);
for (var i=0;i<checks.length;i++){ for (var i=0;i<checks.length;i++){
if (checks[i].checked) { if (checks[i].checked&&!checks[i].disabled) {
sum += parseInt(checks[i].name); sum += parseInt(checks[i].name);
} }
} }
...@@ -157,9 +159,10 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -157,9 +159,10 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}; };
//全选操作 //全选操作
$scope.selectAll = function (task,$event) { $scope.selectAll = function (task,typeCode,$event) {
var checkbox = $event.target; var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove'); var action = (checkbox.checked ? 'add' : 'remove');
console.log(task)
for (var i = 0; i < task.length; i++) { for (var i = 0; i < task.length; i++) {
var contact = task[i]; var contact = task[i];
updateSelected(action, contact); updateSelected(action, contact);
...@@ -168,7 +171,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -168,7 +171,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
if(checkbox.checked){ if(checkbox.checked){
var sum = 0; var sum = 0;
var checks = document.getElementsByClassName("checkOneBox"); var checks = document.getElementsByClassName("checkOneBox"+typeCode);
for (var i = 0; i < checks.length; i++) { for (var i = 0; i < checks.length; i++) {
sum += parseInt(checks[i].name); sum += parseInt(checks[i].name);
} }
...@@ -177,9 +180,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -177,9 +180,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
temp = sum; temp = sum;
}else{ }else{
$rootScope.cardsTotal =0;
$scope.restCount=0
temp = 0;
} }
}; };
$scope.isSelected = function (task) { $scope.isSelected = function (task) {
...@@ -198,205 +199,70 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -198,205 +199,70 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.currentTab = index; $scope.currentTab = index;
} }
$scope.getPoliceList = function(taskId){ $scope.taskId=1;
ngDialog.open({ $scope.getPoliceList = function(groupList,taskId){
template: 'dialogs/policeList.html' + urlTimeStamp(), $scope.policeList = groupList;
width: 600, if($scope.taskId==1){
cache: false, $scope.taskId=taskId;
closeByDocument:false, }else{
controller: ['$scope', function ($scope) { $scope.taskId=1
$scope.policeList = [
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0,
failedCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0,
failedCount:1
}
]
}]
});
}
$scope.goes = function(){
var checks = $(".checkOneBox");
var arr = [];
for (var i=0;i<checks.length;i++){
arr.push(checks[i].value)
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
machine:$("#print").val(),
taskIdList:arr
} }
console.log(json) console.log(groupList)
// HttpService.updateTaskListProcess(json,function(data){
// $scope.searchTaskList();
// MessageService.showAlert("下发完成")
// })
} }
}) $scope.getSpecialCardsInfo = function(groupNo,specialCardCount){
.controller('taskListPreLocatingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { if(parseInt(specialCardCount)>0){
ngDialog.open({
template: 'dialogs/specailCardInfo.html' + urlTimeStamp(),
width: 600,
//Date picker cache: false,
$('#datepicker').datetimepicker({ closeByDocument:false,
minView: "month", //选择日期后，不会再跳转去选择时分秒 controller: ['$scope', function ($scope) {
language: 'zh-CN', HttpService.getSpecialCardData(groupNo,function(data) {
format: 'yyyy-mm-dd', $scope.specailCardData = data;
todayBtn: 1, console.log(data)
autoclose: 1 })
}); }]
});
}else{
MessageService.showAlert("该组中没有特殊证件")
}
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.searchRecordsNotMatched = function () {
HttpService.getRecordsNotMatched($("#datepicker").val(), function (data) {
$scope.records = data;
})
} }
$scope.searchTaskList = function(){ $scope.goes = function(){
HttpService.getTaskListByProcess(function(data){ var checks = $("#checkOneBox:checked");
$scope.cycleSheetData = data; if(checks.length>0){
for(var i=0;i<$scope.cycleSheetData.length;i++){ var arr = [];
if(i==$scope.currentTab){ for (var i=0;i<checks.length;i++){
$scope.cycleSheetData[i].isActive=true; if(!checks[i].disabled){
arr.push(checks[i].value)
}else{ }else{
$scope.cycleSheetData[i].isActive=false; continue;
} }
} }
console.log($scope.cycleSheetData)
})
}
$scope.searchTaskList();
//创建变量用来保存选中结果
$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);
};
//更新某一列数据的选择
var temp = 0;
$rootScope.cardsTotal = 0;
$scope.updateSelection = function ($event, task) {
var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove');
updateSelected(action, task);
var sum = 0; var json={
var checks = document.getElementsByClassName("checkOneBox"); process:$rootScope.loginData.roleList[0].process,
for (var i=0;i<checks.length;i++){ name:$rootScope.loginData.name,
if (checks[i].checked) { printer:$("#print").val(),
sum += parseInt(checks[i].value); taskIdList:arr
}
}
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
temp = sum;
};
//全选操作
$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);
}
if(checkbox.checked){
var sum = 0;
var checks = document.getElementsByClassName("checkOneBox");
for (var i = 0; i < checks.length; i++) {
sum += parseInt(checks[i].value);
} }
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp; console.log(json)
temp = sum; HttpService.updatePrintTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("转出完成")
$rootScope.cardsTotal=0;
$scope.restCount=0;
})
}else{ }else{
$rootScope.cardsTotal =0; MessageService.showAlert("请选择转出的任务单")
temp = 0;
} }
};
$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.getPoliceList = function(taskId){
ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.policeList = [
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0,
failedCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0,
failedCount:1
}
]
}]
});
};
$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.goes = function(){
var checks = $(".checkOneBox:checked");
var arr = [];
for (var i=0;i<checks.length;i++){
arr.push(checks[i].value)
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("转出完成")
})
} }
}) })
.controller('taskListPushingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('taskListPreLocatingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
...@@ -412,8 +278,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -412,8 +278,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
HttpService.getTaskListByProcess(function(data){ HttpService.getPingTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data.typeList;
$scope.total = data.total;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){ if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true; $scope.cycleSheetData[i].isActive=true;
...@@ -421,7 +288,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -421,7 +288,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.cycleSheetData[i].isActive=false; $scope.cycleSheetData[i].isActive=false;
} }
} }
console.log($scope.cycleSheetData) console.log(data)
}) })
} }
$scope.searchTaskList(); $scope.searchTaskList();
...@@ -484,32 +351,16 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -484,32 +351,16 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0; return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
}; };
$scope.getPoliceList = function(taskId){ $scope.taskId=1;
ngDialog.open({ $scope.getPoliceList = function(groupList,taskId){
template: 'dialogs/policeList.html' + urlTimeStamp(), $scope.policeList = groupList;
width: 600, if($scope.taskId==1){
cache: false, $scope.taskId=taskId;
closeByDocument:false, }else{
controller: ['$scope', function ($scope) { $scope.taskId=1
$scope.policeList = [ }
{ console.log(groupList)
policeName:'东城派出所', }
dataCheckCount:100,
printCount:0,
qualityCheckCount:0,
failedCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0,
failedCount:1
}
]
}]
});
};
$scope.currentTab = 0; $scope.currentTab = 0;
$scope.func = function (index) { $scope.func = function (index) {
...@@ -523,172 +374,355 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -523,172 +374,355 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.currentTab = index; $scope.currentTab = index;
} }
$scope.goes = function(){ $scope.getSpecialCardsInfo = function(groupNo,specialCardCount){
var checks = $(".checkOneBox:checked"); if(parseInt(specialCardCount)>0){
var arr = []; ngDialog.open({
for (var i=0;i<checks.length;i++){ template: 'dialogs/specailCardInfo.html' + urlTimeStamp(),
arr.push(checks[i].value) width: 600,
} cache: false,
var json={ closeByDocument:false,
process:$rootScope.loginData.roleList[0].process, controller: ['$scope', function ($scope) {
name:$rootScope.loginData.name, HttpService.getSpecialCardData(groupNo,function(data) {
taskIdList:arr $scope.specailCardData = data;
console.log(data)
})
}]
});
}else{
MessageService.showAlert("该组中没有特殊证件")
} }
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
}
}) }
.controller('taskListCuttingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//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.goes = function(){
$scope.searchTaskList = function(){ var checks = $(".checkOneBox:checked");
HttpService.getTaskListByProcess(function(data){ if(checks.length>0){
$scope.cycleSheetData = data; var arr = [];
for(var i=0;i<$scope.cycleSheetData.length;i++){ for (var i=0;i<checks.length;i++){
if(i==$scope.currentTab){ if(!checks[i].disabled){
$scope.cycleSheetData[i].isActive=true; arr.push(checks[i].value)
}else{ }else{
$scope.cycleSheetData[i].isActive=false; continue;
} }
} }
console.log($scope.cycleSheetData) var json={
}) process:$rootScope.loginData.roleList[0].process,
} name:$rootScope.loginData.name,
$scope.searchTaskList(); taskIdList:arr
//创建变量用来保存选中结果
$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);
};
//更新某一列数据的选择
var temp = 0;
$rootScope.cardsTotal = 0;
$scope.updateSelection = function ($event, task) {
var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove');
updateSelected(action, task);
var sum = 0;
var checks = document.getElementsByClassName("checkOneBox");
for (var i=0;i<checks.length;i++){
if (checks[i].checked) {
sum += parseInt(checks[i].value);
}
}
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
temp = sum;
};
//全选操作
$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);
}
if(checkbox.checked){
var sum = 0;
var checks = document.getElementsByClassName("checkOneBox");
for (var i = 0; i < checks.length; i++) {
sum += parseInt(checks[i].value);
} }
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp; console.log(json)
temp = sum; // HttpService.updateTaskListProcess(json,function(data){
// $scope.searchTaskList();
// MessageService.showAlert("转出完成")
// })
}else{ }else{
$rootScope.cardsTotal =0; MessageService.showAlert("请选择转出的任务单")
temp = 0;
} }
};
$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.getPoliceList = function(taskId){
ngDialog.open({
template: 'dialogs/policeList.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
$scope.policeList = [
{
policeName:'东城派出所',
dataCheckCount:100,
printCount:0,
qualityCheckCount:0,
failedCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0,
failedCount:1
}
]
}]
});
};
$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.goes = function(){
var checks = $(".checkOneBox:checked");
var arr = [];
for (var i=0;i<checks.length;i++){
arr.push(checks[i].value)
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
} }
}) })
// .controller('taskListPushingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//
//
//
// //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.searchTaskList = function(){
// 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.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);
// };
// //更新某一列数据的选择
// var temp = 0;
// $rootScope.cardsTotal = 0;
// $scope.updateSelection = function ($event, task) {
// var checkbox = $event.target;
// var action = (checkbox.checked ? 'add' : 'remove');
// updateSelected(action, task);
//
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i=0;i<checks.length;i++){
// if (checks[i].checked) {
// sum += parseInt(checks[i].value);
// }
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// };
// //全选操作
// $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);
// }
//
//
// if(checkbox.checked){
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i = 0; i < checks.length; i++) {
// sum += parseInt(checks[i].value);
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// }else{
// $rootScope.cardsTotal =0;
// temp = 0;
// }
// };
// $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.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.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.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(){
// var checks = $(".checkOneBox:checked");
// if(checks.length>0){
// var arr = [];
// for (var i=0;i<checks.length;i++){
// arr.push(checks[i].value)
// }
// var json={
// process:$rootScope.loginData.roleList[0].process,
// name:$rootScope.loginData.name,
// taskIdList:arr
// }
// console.log(json)
// HttpService.updateTaskListProcess(json,function(data){
// $scope.searchTaskList();
// MessageService.showAlert("转出完成")
// })
// }else{
// MessageService.showAlert("请选择转出的任务单")
// }
//
// }
//
// })
// .controller('taskListCuttingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
// //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.searchTaskList = function(){
// HttpService.getTaskListByProcess(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.searchTaskList();
//
// //创建变量用来保存选中结果
// $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);
// };
// //更新某一列数据的选择
// var temp = 0;
// $rootScope.cardsTotal = 0;
// $scope.updateSelection = function ($event, task) {
// var checkbox = $event.target;
// var action = (checkbox.checked ? 'add' : 'remove');
// updateSelected(action, task);
//
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i=0;i<checks.length;i++){
// if (checks[i].checked) {
// sum += parseInt(checks[i].value);
// }
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// };
// //全选操作
// $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);
// }
//
//
// if(checkbox.checked){
// var sum = 0;
// var checks = document.getElementsByClassName("checkOneBox");
// for (var i = 0; i < checks.length; i++) {
// sum += parseInt(checks[i].value);
// }
// $rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
// temp = sum;
//
// }else{
// $rootScope.cardsTotal =0;
// temp = 0;
// }
// };
// $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.getPoliceList = function(taskId){
// ngDialog.open({
// template: 'dialogs/policeList.html' + urlTimeStamp(),
// width: 600,
// cache: false,
// closeByDocument:false,
// controller: ['$scope', function ($scope) {
// $scope.policeList = [
// {
// policeName:'东城派出所',
// dataCheckCount:100,
// printCount:0,
// qualityCheckCount:0,
// failedCount:0
// },
// {
// policeName:'西城派出所',
// dataCheckCount:200,
// printCount:0,
// qualityCheckCount:0,
// failedCount:1
// }
// ]
// }]
// });
// };
//
// $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.goes = function(){
// var checks = $(".checkOneBox:checked");
// var arr = [];
// for (var i=0;i<checks.length;i++){
// arr.push(checks[i].value)
// }
// var json={
// process:$rootScope.loginData.roleList[0].process,
// name:$rootScope.loginData.name,
// taskIdList:arr
// }
// console.log(json)
// HttpService.updateTaskListProcess(json,function(data){
// $scope.searchTaskList();
// MessageService.showAlert("下发完成")
// })
// }
//
//
// })
.controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker //Date picker
$('#datepicker').datetimepicker({ $('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
...@@ -699,8 +733,10 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -699,8 +733,10 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.searchTaskList = function(){ $scope.searchTaskList = function(){
HttpService.getTaskListByProcess(function(data){ HttpService.getFjTaskListByProcess(function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
if(i==$scope.currentTab){ if(i==$scope.currentTab){
...@@ -772,32 +808,16 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -772,32 +808,16 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0; return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
}; };
$scope.getPoliceList = function(taskId){ $scope.taskId=1;
ngDialog.open({ $scope.getPoliceList = function(policeList,taskId){
template: 'dialogs/policeList.html' + urlTimeStamp(), $scope.policeList = policeList;
width: 600, if($scope.taskId==1){
cache: false, $scope.taskId=taskId;
closeByDocument:false, }else{
controller: ['$scope', function ($scope) { $scope.taskId=1
$scope.policeList = [ }
{ console.log(policeList)
policeName:'东城派出所', }
dataCheckCount:100,
printCount:0,
qualityCheckCount:0,
failedCount:0
},
{
policeName:'西城派出所',
dataCheckCount:200,
printCount:0,
qualityCheckCount:0,
failedCount:1
}
]
}]
});
};
$scope.currentTab = 0; $scope.currentTab = 0;
$scope.func = function (index) { $scope.func = function (index) {
...@@ -813,19 +833,28 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -813,19 +833,28 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.goes = function(){ $scope.goes = function(){
var checks = $(".checkOneBox:checked"); var checks = $(".checkOneBox:checked");
var arr = []; if(checks.length>0){
for (var i=0;i<checks.length;i++){ var arr = [];
arr.push(checks[i].value) for (var i=0;i<checks.length;i++){
} if(!checks[i].disabled){
var json={ arr.push(checks[i].value)
process:$rootScope.loginData.roleList[0].process, }else{
name:$rootScope.loginData.name, continue;
taskIdList:arr }
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
}else{
MessageService.showAlert("请选择转出的任务单");
} }
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
} }
}) })
\ No newline at end of file
src/main/resources/static/views/task/taskListCutting.html
View file @ 54f4059c
...@@ -27,42 +27,72 @@ ...@@ -27,42 +27,72 @@
</ul> </ul>
</a> </a>
</li> </li>
<li style="float: right; padding-right: 30px;"> <li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4> <h4>任务总数:{{total}}</h4>
</li> </li>
</ul> </ul>
</div> </div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th> <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th> <th>任务单编号</th>
<th>核验日期</th> <th>核验日期</th>
<th>地区</th> <th>地区</th>
<th>组数</th> <th>组数</th>
<th>组号</th> <th>组号</th>
<th>数据核验数量</th> <th>核验数量</th>
<th>电写入数量</th> <th>证件数量</th>
<th>废证数量</th> <th>特殊证件数量</th>
<th></th> <th>废证数量</th>
</tr> <th></th>
</thead> </tr>
<tbody> </thead>
<tr ng-repeat="task in type.countyList"> <tbody ng-repeat="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td> <tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-subject">{{task.checkDate}}</td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td> <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupNum}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-subject">{{task.countyValidCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td> <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td> <td class="mailbox-attachment">{{task.specialCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
</tr> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
</tbody> <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<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>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 54f4059c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</a> </a>
</li> </li>
<li style="float: right; padding-right: 30px;"> <li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4> <h4>任务总数:{{total}}</h4>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -42,27 +42,57 @@ ...@@ -42,27 +42,57 @@
<th>地区</th> <th>地区</th>
<th>组数</th> <th>组数</th>
<th>组号</th> <th>组号</th>
<th>数据核验数量</th> <th>核验数量</th>
<th>电写入数量</th> <th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th> <th>废证数量</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody ng-repeat="task in type.countyList">
<tr ng-repeat="task in type.countyList"> <tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td> <td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td> <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td> <td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
</tr> <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tbody> </tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<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>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 54f4059c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<table class="table table-hover table-striped"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th> <th><input type="checkbox" ng-click="selectAll(type.countyList,type.typeCode,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th> <th>任务单编号</th>
<th>核验日期</th> <th>核验日期</th>
<th>地区</th> <th>地区</th>
...@@ -50,11 +50,11 @@ ...@@ -50,11 +50,11 @@
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody ng-repeat="task in type.countyList">
<tr ng-repeat="task in type.countyList"> <tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}" ng-click="updateSelection($event,task)"></td> <td><input type="checkbox" ng-disabled="task.faileCount>0" id="checkOneBox" class="checkOneBox{{type.typeCode}}" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}" ng-click="updateSelection($event,task,type.typeCode)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate}}</td> <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
...@@ -63,7 +63,35 @@ ...@@ -63,7 +63,35 @@
<td class="mailbox-attachment">{{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> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<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>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/task/taskListPushing.html
View file @ 54f4059c
...@@ -28,41 +28,71 @@ ...@@ -28,41 +28,71 @@
</a> </a>
</li> </li>
<li style="float: right; padding-right: 30px;"> <li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4> <h4>任务总数:{{total}}</h4>
</li> </li>
</ul> </ul>
</div> </div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<table class="table table-hover table-striped"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th> <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th> <th>任务单编号</th>
<th>核验日期</th> <th>核验日期</th>
<th>地区</th> <th>地区</th>
<th>组数</th> <th>组数</th>
<th>组号</th> <th>组号</th>
<th>数据核验数量</th> <th>核验数量</th>
<th>电写入数量</th> <th>证件数量</th>
<th>废证数量</th> <th>特殊证件数量</th>
<th></th> <th>废证数量</th>
</tr> <th></th>
</thead> </tr>
<tbody> </thead>
<tr ng-repeat="task in type.countyList"> <tbody ng-repeat="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td> <tr>
<td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td> <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</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> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> <tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<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>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 54f4059c
...@@ -37,33 +37,68 @@ ...@@ -37,33 +37,68 @@
<th>地区</th> <th>地区</th>
<th>组数</th> <th>组数</th>
<th>组号</th> <th>组号</th>
<th>数据核验数</th> <th>核验数量</th>
<th>电写入数</th> <th>证件数量</th>
<th>废证数</th> <th>电写入数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th>复核数量</th> <th>复核数量</th>
<th></th> <th></th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody ng-repeat="task in type.countyList">
<tr ng-repeat="task in type.countyList"> <tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td> <td><input type="checkbox" ng-disabled="task.faileCount>0" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td> <td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-subject">{{task.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;">{{task.faileCount}}</td> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td> <td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.policeList,task.taskId)">派出所列表</a></td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td> <td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
</tr> </tr>
<tr ng-if="task.taskId==taskId">
<td></td>
<td colspan="10">
<table class="table">
<thead>
<th>组号</th>
<th>核验数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
<th></th>
</thead>
<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>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
</tr>
</tbody>
</table>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
......
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