Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 431ee011 authored by suichenguang's avatar suichenguang
Browse files
Options

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

parents 94ec71ea 62750a6f
Show whitespace changes
Inline Side-by-side
Showing with 1639 additions and 437 deletions
src/main/resources/static/dialogs/policeDetail.html 0 → 100644
View file @ 431ee011
<div class="ui-dialog-title">
派出所证件详情
</div>
<div class="ui-dialog-content">
<table class="table table-responsive" style="border-color: black;">
<thead>
<tr>
<th>No.</th>
<th>受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>签发机关</th>
<th>打印卸载标记</th>
<th>电写入标记</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in policeCardsList">
<td>{{$index+1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.username}}</td>
<td>{{item.idCard}}</td>
<td>{{item.qfjg}}</td>
<td>{{item.isPrint}}</td>
<td>{{item.isEwrite}}</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="">复核一致</button>
<button type="submit" class="btn btn-primary" ng-click="">打印条形码</button>
</div>
\ No newline at end of file
src/main/resources/static/dialogs/policeList.html
View file @ 431ee011
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<th>数据核验数量</th> <th>数据核验数量</th>
<th>打印卸载数量</th> <th>打印卸载数量</th>
<th>质检数量</th> <th>质检数量</th>
<th>废证数量</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
<td>{{item.dataCheckCount}}</td> <td>{{item.dataCheckCount}}</td>
<td>{{item.printCount}}</td> <td>{{item.printCount}}</td>
<td>{{item.qualityCheckCount}}</td> <td>{{item.qualityCheckCount}}</td>
<td>{{item.failedCount}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/index.html
View file @ 431ee011
...@@ -192,10 +192,10 @@ ...@@ -192,10 +192,10 @@
<span>分拣任务单</span> <span>分拣任务单</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListStorage']" ng-click="getFocus('/taskListStorage')"> <li ng-class="{true: 'active', false: ''}[tab =='/tagPrint']" ng-click="getFocus('/tagPrint')">
<a href="#!/taskListStorage"> <a href="#!/tagPrint">
<i class="fa fa-dashboard"></i> <i class="fa fa-dashboard"></i>
<span>仓库任务单</span> <span>打印封条</span>
</a> </a>
</li> </li>
<li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')"> <li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')">
...@@ -266,5 +266,6 @@ ...@@ -266,5 +266,6 @@
<script src="views/historyCards/historyBack.js"></script> <script src="views/historyCards/historyBack.js"></script>
<script src="views/analysisLog/analysisLog.js"></script> <script src="views/analysisLog/analysisLog.js"></script>
<script src="views/packageLog/packageLog.js"></script> <script src="views/packageLog/packageLog.js"></script>
<script src="views/tagPrint/tagPrint.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 431ee011
...@@ -22,6 +22,7 @@ angular.module('AvatarCheck', [ ...@@ -22,6 +22,7 @@ angular.module('AvatarCheck', [
'AvatarCheck.historyBack', 'AvatarCheck.historyBack',
'AvatarCheck.analysisLog', 'AvatarCheck.analysisLog',
'AvatarCheck.packageLog', 'AvatarCheck.packageLog',
'AvatarCheck.tagPrint',
'tm.pagination' 'tm.pagination'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) { ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!'); $locationProvider.hashPrefix('!');
...@@ -105,11 +106,18 @@ angular.module('AvatarCheck', [ ...@@ -105,11 +106,18 @@ angular.module('AvatarCheck', [
if ($location.path() == "/historyBack") { if ($location.path() == "/historyBack") {
$rootScope.tab = '/historyBack'; $rootScope.tab = '/historyBack';
} }
if ($location.path() == "/tagPrint") {
$rootScope.tab = '/tagPrint';
$("body").addClass("sidebar-collapse");
}
console.log($rootScope.tab) console.log($rootScope.tab)
$scope.getFocus = function (index) { $scope.getFocus = function (index) {
if(index=='/tagPrint'){
$("body").addClass("sidebar-collapse");
}
$rootScope.tab = index; $rootScope.tab = index;
$rootScope.close = 0; $rootScope.close = 0;
console.log($rootScope.tab) console.log($rootScope.tab)
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 431ee011
...@@ -37,24 +37,27 @@ ...@@ -37,24 +37,27 @@
<thead> <thead>
<tr> <tr>
<th><input type="checkbox"></th> <th><input type="checkbox"></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>
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.saveDate}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td> <td class="mailbox-name"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
...@@ -64,7 +67,7 @@ ...@@ -64,7 +67,7 @@
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<button class="btn btn-primary">创建任务单</button> <button class="btn btn-primary">创建任务单</button>
<button class="btn btn-primary">创建并下发任务单</button> <button class="btn btn-primary">下发任务单</button>
</div> </div>
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 431ee011
...@@ -30,25 +30,28 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -30,25 +30,28 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
isActive: 'true', isActive: 'true',
countyList: [ countyList: [
{ {
taskId: '20190228001', saveDate: '20190228',
county: '西城区', county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, valid: 240,
invalid: 0 invalid: 0
}, },
{ {
taskId: '20190228001', saveDate: '20190228',
county: '东城区', county: '海淀区',
groupNo: '00234653-03687587', groupCount:6,
valid: 240, groupNo: '00234653-03687588',
invalid: 0 valid: 280,
invalid: 2
}, },
{ {
taskId: '20190228001', saveDate: '20190228',
county: '海淀区', county: '海淀区',
groupNo: '00234653-03687587', groupCount:6,
valid: 240, groupNo: '00234653-03687588',
invalid: 0 valid: 280,
invalid: 2
} }
] ]
}, },
...@@ -59,18 +62,20 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -59,18 +62,20 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
isActive: 'false', isActive: 'false',
countyList: [ countyList: [
{ {
taskId: '20190228001', saveDate: '20190228',
county: '朝阳区', county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, valid: 240,
invalid: 0 invalid: 0
}, },
{ {
taskId: '20190228001', saveDate: '20190228',
county: '昌平区', county: '海淀区',
groupNo: '00234653-03687587', groupCount:6,
valid: 240, groupNo: '00234653-03687588',
invalid: 0 valid: 280,
invalid: 2
} }
] ]
} }
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 431ee011
...@@ -37,24 +37,29 @@ ...@@ -37,24 +37,29 @@
<thead> <thead>
<tr> <tr>
<th><input type="checkbox"></th> <th><input type="checkbox"></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>
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue" value="{{task.taskId}}"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.saveDate}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td> <td class="mailbox-name"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date text-danger">{{task.state}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 431ee011
...@@ -30,25 +30,31 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -30,25 +30,31 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
isActive: 'true', isActive: 'true',
countyList: [ countyList: [
{ {
taskId: '20190228001', saveDate: '20190228',
county: '西城区', county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, valid: 240,
invalid: 0 invalid: 0,
state:'未下发'
}, },
{ {
taskId: '20190228002', saveDate: '20190228',
county: '东城区', county: '海淀区',
groupNo: '00234653-03687587', groupCount:6,
valid: 240, groupNo: '00234653-03687588',
invalid: 0 valid: 280,
invalid: 2,
state:'未下发'
}, },
{ {
taskId: '20190228003', saveDate: '20190228',
county: '海淀区', county: '海淀区',
groupNo: '00234653-03687587', groupCount:6,
valid: 240, groupNo: '00234653-03687588',
invalid: 0 valid: 280,
invalid: 2,
state:'未下发'
} }
] ]
}, },
...@@ -59,18 +65,22 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -59,18 +65,22 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
isActive: 'false', isActive: 'false',
countyList: [ countyList: [
{ {
taskId: '20190228004', saveDate: '20190228',
county: '朝阳区', county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, valid: 240,
invalid: 0 invalid: 0,
state:'未下发'
}, },
{ {
taskId: '20190228005', saveDate: '20190228',
county: '昌平区', county: '海淀区',
groupNo: '00234653-03687587', groupCount:6,
valid: 240, groupNo: '00234653-03687588',
invalid: 0 valid: 280,
invalid: 2,
state:'未下发'
} }
] ]
} }
......
src/main/resources/static/views/login/login.js
View file @ 431ee011
...@@ -18,6 +18,17 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -18,6 +18,17 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
} }
} }
var browserName = function (userAgent){
if (userAgent.index0f('Firefox')!= -1)
location.reload([true])
if (userAgent.index0f(" Chrome") !== -1){
location. reload([true])
}
}
$scope.user = {}; $scope.user = {};
$scope.doLogin = function(){ $scope.doLogin = function(){
var json = JSON.stringify($scope.user); var json = JSON.stringify($scope.user);
...@@ -25,15 +36,16 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -25,15 +36,16 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
// Try to login // Try to login
$http({method: 'post', url: "../user/login", data: json}).then(function (resp) { $http({method: 'post', url: "../user/login", data: json}).then(function (resp) {
console.log(resp) console.log(resp)
var userAgent = window.navigator.userAgent;
if(resp.data.status==200){ if(resp.data.status==200){
location.reload([true]);
$rootScope.loginData = resp.data.user; $rootScope.loginData = resp.data.user;
$rootScope.loginData.login =true; $rootScope.loginData.login =true;
localStorageService.set('loginData', resp.data.user); localStorageService.set('loginData', resp.data.user);
if($rootScope.loginData.username=='admin'){
$location.path('/xmlAndSearch') $location.path('/xmlAndSearch')
if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
}else{ }else{
$location.path('/excelAndSearch') browserName(userAgent)
} }
}else{ }else{
$scope.authError = resp.data.message; $scope.authError = resp.data.message;
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ 431ee011
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
<td>400</td> <td>400</td>
<td>110013</td> <td>110013</td>
<td>海淀区</td> <td>海淀区</td>
</tr> </tr>
<tr ng-repeat="item in postMsgDetail"> <tr ng-repeat="item in postMsgDetail">
<td> <td>
......
src/main/resources/static/views/tagPrint/tagPrint.html 0 → 100644
View file @ 431ee011
<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>
<section class="content-header" style="padding-top: 1px;">
<h4>
打印封条
</h4>
</section>
<div style="padding: 15px;">
<div class="box box-primary">
<strong class="box-header"></strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="10%">身份证号:</td>
<td colspan="2" width="35%">
<input type="text" class="form-control" placeholder="身份证号"/>
</td>
<td style="text-align: left;">
<button class="btn btn-primary">查询</button>
<button class="btn btn-primary">证件读取</button>
</td>
</tr>
</table>
<div class="row">
<div class="col-lg-5" >
<div class="col-lg-12">
<table class="table table-bordered table-hover postTable ">
<thead>
<tr>
<th>NO.</th>
<th>派出所代码</th>
<th>派出所名称</th>
<th>数量</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<tr ng-click="showDetail(1)">
<td>1</td>
<td>110021</td>
<td>东城派出所</td>
<td>2</td>
<td></td>
</tr>
<tr ng-click="showDetail(2)">
<td>2</td>
<td>110021</td>
<td>东城派出所</td>
<td>3</td>
<td>复核一致</td>
</tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="col-lg-7" style="padding-left: 0;" ng-if="policeCardsList">
<table class="table table-bordered">
<thead>
<tr>
<th>No.</th>
<th>受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>签发机关</th>
<th>打印标记</th>
<th>电写标记</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in policeCardsList">
<td>{{$index+1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.username}}</td>
<td>{{item.idCard}}</td>
<td>{{item.qfjg}}</td>
<td>
<span ng-if="item.isPrint==1" style="color:red;size: 6px">X</span>
<span ng-if="item.isPrint==0" style="color:lightseagreen;size: 6px">√</span>
</td>
<td><span ng-if="item.isEwrite==1" style="color:red;size: 6px">X</span>
<span ng-if="item.isEwrite==0" style="color:lightseagreen;size: 6px">√</span>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/tagPrint/tagPrint.js 0 → 100644
View file @ 431ee011
'use strict';
angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagination'])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/tagPrint', {
templateUrl: 'views/tagPrint/tagPrint.html' + urlTimeStamp(),
controller: 'tagPrintCtrl',
cache: false
});
}])
.controller('tagPrintCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) {
//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.paginationConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50]
};
$scope.paginationConf.totalItems = 50;
$scope.showDetail = function(index){
if(index==1){
$scope.policeCardsList = [
{
acceptNo:'E000201',
username:'伯阳',
idCard:'130133199605250012',
qfjg:'成寿寺派出所',
isPrint:0,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
]
}else{
$scope.policeCardsList=[
{
acceptNo:'E000201',
username:'伯阳',
idCard:'130133199605250012',
qfjg:'成寿寺派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
,
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'陈光',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
},
{
acceptNo:'E000202',
username:'大海',
idCard:'130133199605250022',
qfjg:'东城派出所',
isPrint:1,
isEwrite:1
}
]
}
}
});
src/main/resources/static/views/task/task.js
View file @ 431ee011
...@@ -2,11 +2,6 @@ ...@@ -2,11 +2,6 @@
angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider) { .config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/taskListDataCheck', {
templateUrl: 'views/task/taskListDataCheck.html' + urlTimeStamp(),
controller: 'taskListDataCheckCtrl',
cache: false
});
$routeProvider.when('/taskListPrint', { $routeProvider.when('/taskListPrint', {
templateUrl: 'views/task/taskListPrint.html' + urlTimeStamp(), templateUrl: 'views/task/taskListPrint.html' + urlTimeStamp(),
controller: 'taskListPrintCtrl', controller: 'taskListPrintCtrl',
...@@ -27,99 +22,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -27,99 +22,8 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
controller: 'taskListSortingCtrl', controller: 'taskListSortingCtrl',
cache: false cache: false
}); });
$routeProvider.when('/taskListStorage', {
templateUrl: 'views/task/taskListStorage.html' + urlTimeStamp(),
controller: 'taskListStorageCtrl',
cache: false
});
}]) }])
.controller('taskListDataCheckCtrl', 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.searchRecordsNotMatched = function () {
HttpService.getRecordsNotMatched($("#datepicker").val(), function (data) {
$scope.records = data;
})
}
$scope.cycleSheetData = [
{
typeCode: '1',
typeName: '普通证',
typeSum: 300,
isActive: 'true',
countyList: [
{
taskId: '20190228001',
county: '西城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '东城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '海淀区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
}
]
},
{
typeCode: '9',
typeName: '邮寄证',
typeSum: 500,
isActive: 'false',
countyList: [
{
taskId: '20190228001',
county: '朝阳区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '昌平区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 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;
}
})
.controller('taskListPrintCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('taskListPrintCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
...@@ -150,7 +54,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -150,7 +54,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -160,7 +64,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -160,7 +64,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -170,7 +74,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -170,7 +74,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
} }
] ]
}, },
...@@ -188,7 +92,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -188,7 +92,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:1 failedCount:1
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -198,7 +102,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -198,7 +102,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
} }
] ]
} }
...@@ -227,13 +131,15 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -227,13 +131,15 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
policeName:'东城派出所', policeName:'东城派出所',
dataCheckCount:100, dataCheckCount:100,
printCount:0, printCount:0,
qualityCheckCount:0 qualityCheckCount:0,
failedCount:0
}, },
{ {
policeName:'西城派出所', policeName:'西城派出所',
dataCheckCount:200, dataCheckCount:200,
printCount:0, printCount:0,
qualityCheckCount:0 qualityCheckCount:0,
failedCount:1
} }
] ]
}] }]
...@@ -276,7 +182,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -276,7 +182,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -286,7 +192,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -286,7 +192,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -296,7 +202,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -296,7 +202,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
} }
] ]
}, },
...@@ -314,7 +220,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -314,7 +220,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:1 failedCount:1
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -324,7 +230,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -324,7 +230,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0 failedCount:0
} }
] ]
} }
...@@ -342,13 +248,15 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -342,13 +248,15 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
policeName:'东城派出所', policeName:'东城派出所',
dataCheckCount:100, dataCheckCount:100,
printCount:0, printCount:0,
qualityCheckCount:0 qualityCheckCount:0,
failedCount:0
}, },
{ {
policeName:'西城派出所', policeName:'西城派出所',
dataCheckCount:200, dataCheckCount:200,
printCount:0, printCount:0,
qualityCheckCount:0 qualityCheckCount:0,
failedCount:1
} }
] ]
}] }]
...@@ -369,9 +277,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -369,9 +277,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}) })
.controller('taskListQualityCheckCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('taskListQualityCheckCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker //Date picker
$('#datepicker').datetimepicker({ $('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
...@@ -402,8 +307,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -402,8 +307,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
checkDate:'20190301', checkDate:'20190301',
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, outStoreCount:160,
failedCards:0 enterStoreCount:0,
failedCount:1
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -412,8 +318,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -412,8 +318,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
checkDate:'20190301', checkDate:'20190301',
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, outStoreCount:160,
failedCards:0 enterStoreCount:0,
failedCount:1
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -422,8 +329,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -422,8 +329,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
checkDate:'20190301', checkDate:'20190301',
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, outStoreCount:160,
failedCards:0 enterStoreCount:0,
failedCount:0
} }
] ]
}, },
...@@ -440,8 +348,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -440,8 +348,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
checkDate:'20190301', checkDate:'20190301',
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, outStoreCount:160,
failedCards:1 enterStoreCount:0,
failedCount:0
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
...@@ -450,8 +359,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -450,8 +359,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
checkDate:'20190301', checkDate:'20190301',
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, outStoreCount:160,
failedCards:0 enterStoreCount:0,
failedCount:2
} }
] ]
} }
...@@ -480,107 +390,203 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -480,107 +390,203 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
policeName:'东城派出所', policeName:'东城派出所',
dataCheckCount:100, dataCheckCount:100,
printCount:0, printCount:0,
qualityCheckCount:0 qualityCheckCount:0,
failedCount:0
}, },
{ {
policeName:'西城派出所', policeName:'西城派出所',
dataCheckCount:200, dataCheckCount:200,
printCount:0, printCount:0,
qualityCheckCount:0 qualityCheckCount:0,
failedCount:1
} }
] ]
}] }]
}); });
} }
$scope.enterStore = function(){
var cycleIdList = [];
var checks = $(".checkCkBox");
for (var i=0;i<checks.length;i++){
if(checks[i].checked == true){
cycleIdList.push(checks[i].name);
}
}
if(cycleIdList.length==0){
MessageService.showAlert("请先选择要操作的地市。")
}else{
console.log(cycleIdList)
HttpService.getCountyListDataAtCk(cycleIdList,function(data){
ngDialog.open({
template: 'dialogs/addEnterStore.html' + urlTimeStamp(),
width: '65%',
cache: false,
controller: ['$scope', '$rootScope', 'HttpService', function ($scope, $rootScope, HttpService) {
$scope.countyCode = 'countyCode';
$scope.countyList = data.respData;
console.log($scope.countyList)
$scope.updateEnterSum = function(countycode){
$scope.showSum = countycode;
$scope.saveEnterStoreSum = function(enterStoreSum,leaveStoreSum,cycleSheetId,countyCode){
var arr = [];
var string = cycleSheetId+"_"+countyCode+"_0_"+enterStoreSum+"_"+leaveStoreSum+"_0"
arr.push(string)
console.log(arr)
HttpService.updateEnterStoreSum(arr,function(data){
HttpService.getCountyListDataAtCk(cycleIdList,function(data){
$scope.countyList = data.respData;
$scope.showSum = -1;
var date = $("#wdate").val();
var card = $("#selectPing").val();
getCycleSheetData(date, 0,card)
}) })
.controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { })
}
$scope.cancelEnterStoreSum = function(){
$scope.showSum = -1;
}
}
//Date picker $scope.getAllCkCountyBox = function() {
$('#datepicker').datetimepicker({ var checks = $("#checkCkAllCountyBox");
minView: "month", //选择日期后，不会再跳转去选择时分秒 if(checks.prop("checked") == true){
language: 'zh-CN', $(".checkCkCountyBox").prop("checked",true);
format: 'yyyy-mm-dd', }else{
todayBtn: 1, $(".checkCkCountyBox").prop("checked",false);
autoclose: 1 }
}); }
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.saveTheseCountySum = function(){
$scope.searchRecordsNotMatched = function () { var countyList = [];
HttpService.getRecordsNotMatched($("#datepicker").val(), function (data) { var checksCounty = $(".checkCkCountyBox");
$scope.records = data; for (var i=0;i<checksCounty.length;i++){
if(checksCounty[i].checked == true){
countyList.push(checksCounty[i].value);
}
}
console.log(countyList)
$scope.showAlertCk = false;
$scope.showUpdateSuccessMsg = false;
if(countyList.length==0){
$scope.showAlertCk = true;
$scope.alertCk = '请先选择区县。'
}else{
HttpService.updateEnterStoreSum(countyList,function(data){
$("#checkCkAllCountyBox").prop("checked",false);
HttpService.getCountyListDataAtCk(cycleIdList,function(data){
$scope.countyList = data.respData;
$scope.showSum = -1;
var date = $("#wdate").val();
var card = $("#selectPing").val();
getCycleSheetData(date, 0,card)
})
$scope.showUpdateSuccessMsg = true;
$scope.updateSuccessMsg = data.respData.string;
})
}
}
}]
})
}) })
} }
$scope.cycleSheetData = [
{
typeCode: '1',
typeName: '普通证',
typeSum: 300,
isActive: 'true',
countyList: [
{
taskId: '20190228001',
county: '西城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '东城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '海淀区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
} }
]
}, $scope.leaveStore = function(){
{ var cycleIdList = [];
typeCode: '9', var checks = $(".checkCkBox");
typeName: '邮寄证', for (var i=0;i<checks.length;i++){
typeSum: 500, if(checks[i].checked == true){
isActive: 'false', cycleIdList.push(checks[i].name);
countyList: [
{
taskId: '20190228001',
county: '朝阳区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '昌平区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
} }
]
} }
] if(cycleIdList.length==0){
$scope.currentTab = 0; MessageService.showAlert("请先选择要操作的地市。")
$scope.func = function (index) { }else{
for (var idx in $scope.cycleSheetData) { console.log(cycleIdList)
if (index == idx) { HttpService.getCountyListDataAtCk(cycleIdList,function(data){
$scope.cycleSheetData[idx].isActive = true; ngDialog.open({
} else { template: 'dialogs/addLeaveStore.html' + urlTimeStamp(),
$scope.cycleSheetData[idx].isActive = false; width: '65%',
cache: false,
controller: ['$scope', '$rootScope', 'HttpService', function ($scope, $rootScope, HttpService) {
$scope.countyCode = 'countyCode';
$scope.countyList = data.respData;
console.log($scope.countyList)
$scope.updateLeaveSum = function(countycode){
$scope.showSum = countycode;
$scope.saveLeaveStoreSum = function(leaveStoreSum,enterStoreSum,cycleSheetId,countyCode){
var arr = [];
var string = cycleSheetId+"_"+countyCode+"_0_"+enterStoreSum+"_"+leaveStoreSum+"_0"
arr.push(string)
console.log(arr)
HttpService.updateEnterStoreSum(arr,function(data){
HttpService.getCountyListDataAtCk(cycleIdList,function(data){
$scope.countyList = data.respData;
$scope.showSum = -1;
var date = $("#wdate").val();
var card = $("#selectPing").val();
getCycleSheetData(date, 0,card)
})
})
} }
$scope.cancelLeaveStoreSum = function(){
$scope.showSum = -1;
}
}
$scope.getAllCkCountyBox = function() {
var checks = $("#checkCkAllCountyBox");
if(checks.prop("checked") == true){
$(".checkCkCountyBox").prop("checked",true);
}else{
$(".checkCkCountyBox").prop("checked",false);
}
}
$scope.saveTheseCountySum = function(){
var countyList = [];
var checksCounty = $(".checkCkCountyBox");
for (var i=0;i<checksCounty.length;i++){
if(checksCounty[i].checked == true){
countyList.push(checksCounty[i].value);
} }
$scope.currentTab = index;
} }
console.log(countyList)
$scope.showAlertCk = false;
$scope.showUpdateSuccessMsg = false;
if(countyList.length==0){
$scope.showAlertCk = true;
$scope.alertCk = '请先选择区县。'
}else{
HttpService.updateEnterStoreSum(countyList,function(data){
$("#checkCkAllCountyBox").prop("checked",false);
HttpService.getCountyListDataAtCk(cycleIdList,function(data){
$scope.countyList = data.respData;
$scope.showSum = -1;
var date = $("#wdate").val();
var card = $("#selectPing").val();
getCycleSheetData(date, 0,card)
}) })
.controller('taskListStorageCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { $scope.showUpdateSuccessMsg = true;
$scope.updateSuccessMsg = data.respData.string;
})
}
}
}]
})
})
}
}
})
.controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
...@@ -611,22 +617,34 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -611,22 +617,34 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
taskId: '20190228001', taskId: '20190228001',
county: '西城区', county: '西城区',
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, checkDate:'20190301',
invalid: 0 groupCount:160,
dataCheckCount:160,
electricCount:160,
failedCount:0,
checkCount:160
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
county: '东城区', county: '东城区',
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, checkDate:'20190301',
invalid: 0 groupCount:160,
dataCheckCount:160,
electricCount:160,
failedCount:0,
checkCount:150
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
county: '海淀区', county: '海淀区',
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, checkDate:'20190301',
invalid: 0 groupCount:160,
dataCheckCount:160,
electricCount:160,
failedCount:0,
checkCount:160
} }
] ]
}, },
...@@ -638,17 +656,25 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -638,17 +656,25 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
countyList: [ countyList: [
{ {
taskId: '20190228001', taskId: '20190228001',
county: '朝阳区', county: '东城区',
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, checkDate:'20190301',
invalid: 0 groupCount:160,
dataCheckCount:160,
electricCount:160,
failedCount:1,
checkCount:140
}, },
{ {
taskId: '20190228001', taskId: '20190228001',
county: '昌平区', county: '海淀区',
groupNo: '00234653-03687587', groupNo: '00234653-03687587',
valid: 240, checkDate:'20190301',
invalid: 0 groupCount:160,
dataCheckCount:160,
electricCount:160,
failedCount:0,
checkCount:0
} }
] ]
} }
...@@ -664,5 +690,30 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -664,5 +690,30 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
} }
$scope.currentTab = index; $scope.currentTab = index;
} }
$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
}
]
}]
});
}
}) })
\ No newline at end of file
src/main/resources/static/views/task/taskListDataCheck.html deleted 100644 → 0
View file @ 94ec71ea
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
<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="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<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">
<thead>
<tr>
<th><input type="checkbox"></th>
<th>任务单编号</th>
<th>地区</th>
<th>组号</th>
<th>合格数</th>
<th>不合格数</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a href="#">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 431ee011
...@@ -55,13 +55,14 @@ ...@@ -55,13 +55,14 @@
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject"><a>{{task.checkDate}}</a></td> <td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.county}}</a></td> <td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-subject"><a>{{task.groupCount}}</a></td> <td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject"><a>{{task.groupNo}}</a></td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td> <td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> </tbody>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 431ee011
...@@ -56,14 +56,15 @@ ...@@ -56,14 +56,15 @@
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject"><a>{{task.checkDate}}</a></td> <td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.county}}</a></td> <td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-subject"><a>{{task.groupCount}}</a></td> <td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject"><a>{{task.groupNo}}</a></td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td> <td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/task/taskListQualityCheck.html
View file @ 431ee011
...@@ -45,9 +45,11 @@ ...@@ -45,9 +45,11 @@
<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>
...@@ -55,14 +57,17 @@ ...@@ -55,14 +57,17 @@
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject"><a>{{task.checkDate}}</a></td> <td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.county}}</a></td> <td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-subject"><a>{{task.groupCount}}</a></td> <td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject"><a>{{task.groupNo}}</a></td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td ng-if="task.failedCount>0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td> <td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-attachment">{{task.outStoreCount}}</td>
<td class="mailbox-subject">{{task.enterStoreCount}}</td>
<td><button class="btn btn-primary">完成</button></td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -72,7 +77,8 @@ ...@@ -72,7 +77,8 @@
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;"> <div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button> <button class="btn btn-primary" ng-click="outStore()">出库</button>
<button class="btn btn-primary" ng-click="enterStore()">入库</button>
</div> </div>
</div> </div>
<!-- /. box --> <!-- /. box -->
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 431ee011
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<strong>任务单详情</strong> <strong>任务单详情</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<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="datepicker" 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="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
...@@ -38,10 +38,15 @@ ...@@ -38,10 +38,15 @@
<tr> <tr>
<th><input type="checkbox"></th> <th><input type="checkbox"></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>
...@@ -49,11 +54,17 @@ ...@@ -49,11 +54,17 @@
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td> <td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-date"><a href="#">组号列表</a></td> <td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -62,6 +73,9 @@ ...@@ -62,6 +73,9 @@
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/task/taskListStorage.html deleted 100644 → 0
View file @ 94ec71ea
<section class="content-header" style="padding-top: 1px;">
<h4>
任务单
</h4>
</section>
<section class="content" style="padding: 15px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
<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="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-right: 10px;" ng-click="searchCurrent()">查询</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index">
<a ng-click="func($index,tab.typeCode)">
<ul style="margin: 0;padding: 0;">
<li style="font-size: 16px;">{{tab.typeName}}</li>
<li style="text-align: center;">{{tab.typeSum}}</li>
</ul>
</a>
</li>
</ul>
</div>
<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">
<thead>
<tr>
<th><input type="checkbox"></th>
<th>任务单编号</th>
<th>地区</th>
<th>组号</th>
<th>合格数</th>
<th>不合格数</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a href="#">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</section>
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