Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 62750a6f authored by liboyang's avatar liboyang
Browse files
Options

新增页面

parent cc82eaf3
Show whitespace changes
Inline Side-by-side
Showing with 1251 additions and 61 deletions
src/main/resources/static/js/app.js
View file @ 62750a6f
...@@ -108,12 +108,16 @@ angular.module('AvatarCheck', [ ...@@ -108,12 +108,16 @@ angular.module('AvatarCheck', [
} }
if ($location.path() == "/tagPrint") { if ($location.path() == "/tagPrint") {
$rootScope.tab = '/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 @ 62750a6f
...@@ -67,7 +67,7 @@ ...@@ -67,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/login/login.js
View file @ 62750a6f
...@@ -38,18 +38,14 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -38,18 +38,14 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
console.log(resp) console.log(resp)
var userAgent = window.navigator.userAgent; var userAgent = window.navigator.userAgent;
if(resp.data.status==200){ if(resp.data.status==200){
if(userAgent.indexOf('.NET')!=-1){
window.location.reload();
}else{
browserName(userAgent)
}
$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/tagPrint/tagPrint.html
View file @ 62750a6f
...@@ -45,7 +45,11 @@ ...@@ -45,7 +45,11 @@
</td> </td>
</tr> </tr>
</table> </table>
<table class="table table-bordered table-hover postTable"> <div class="row">
<div class="col-lg-5" >
<div class="col-lg-12">
<table class="table table-bordered table-hover postTable ">
<thead> <thead>
<tr> <tr>
<th>NO.</th> <th>NO.</th>
...@@ -64,11 +68,11 @@ ...@@ -64,11 +68,11 @@
<td></td> <td></td>
</tr> </tr>
<tr ng-click="showDetail(2)"> <tr ng-click="showDetail(2)">
<td>1</td> <td>2</td>
<td>110021</td> <td>110021</td>
<td>东城派出所</td> <td>东城派出所</td>
<td>3</td> <td>3</td>
<td>复刻一致</td> <td>复核一致</td>
</tr> </tr>
<tr ng-repeat="item in postMsgDetail"> <tr ng-repeat="item in postMsgDetail">
<td> <td>
...@@ -89,8 +93,40 @@ ...@@ -89,8 +93,40 @@
</tbody> </tbody>
</table> </table>
<div style="padding-left: 27%;"> </div>
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</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>
</div> </div>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 62750a6f
...@@ -31,12 +31,6 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -31,12 +31,6 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
$scope.paginationConf.totalItems = 50; $scope.paginationConf.totalItems = 50;
$scope.showDetail = function(index){ $scope.showDetail = function(index){
ngDialog.open({
template: 'dialogs/policeDetail.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', function ($scope) {
if(index==1){ if(index==1){
$scope.policeCardsList = [ $scope.policeCardsList = [
{ {
...@@ -44,7 +38,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -44,7 +38,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
username:'伯阳', username:'伯阳',
idCard:'130133199605250012', idCard:'130133199605250012',
qfjg:'成寿寺派出所', qfjg:'成寿寺派出所',
isPrint:1, isPrint:0,
isEwrite:1 isEwrite:1
}, },
{ {
...@@ -82,12 +76,981 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -82,12 +76,981 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
isPrint:1, isPrint:1,
isEwrite: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 @ 62750a6f
...@@ -54,7 +54,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -54,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',
...@@ -64,7 +64,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -64,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',
...@@ -74,7 +74,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -74,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
} }
] ]
}, },
...@@ -92,7 +92,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -92,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',
...@@ -102,7 +102,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -102,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
} }
] ]
} }
...@@ -182,7 +182,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -182,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',
...@@ -192,7 +192,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -192,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',
...@@ -202,7 +202,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -202,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
} }
] ]
}, },
...@@ -220,7 +220,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -220,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',
...@@ -230,7 +230,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -230,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
} }
] ]
} }
...@@ -277,9 +277,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -277,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", //选择日期后，不会再跳转去选择时分秒
...@@ -310,8 +307,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -310,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',
...@@ -320,8 +318,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -320,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',
...@@ -330,8 +329,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -330,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
} }
] ]
}, },
...@@ -348,8 +348,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -348,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',
...@@ -358,8 +359,9 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -358,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
} }
] ]
} }
...@@ -403,6 +405,186 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -403,6 +405,186 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}); });
} }
$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)
})
})
}
$scope.cancelEnterStoreSum = 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);
}
}
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.leaveStore = 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/addLeaveStore.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.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);
}
}
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;
})
}
}
}]
})
})
}
}
}) })
.controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('taskListSortingCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
...@@ -439,7 +621,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -439,7 +621,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0, failedCount:0,
checkCount:160 checkCount:160
}, },
{ {
...@@ -450,7 +632,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -450,7 +632,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0, failedCount:0,
checkCount:150 checkCount:150
}, },
{ {
...@@ -461,7 +643,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -461,7 +643,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0, failedCount:0,
checkCount:160 checkCount:160
} }
] ]
...@@ -480,7 +662,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -480,7 +662,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:1, failedCount:1,
checkCount:140 checkCount:140
}, },
{ {
...@@ -491,7 +673,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -491,7 +673,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
groupCount:160, groupCount:160,
dataCheckCount:160, dataCheckCount:160,
electricCount:160, electricCount:160,
failedCards:0, failedCount:0,
checkCount:0 checkCount:0
} }
] ]
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 62750a6f
...@@ -61,7 +61,8 @@ ...@@ -61,7 +61,8 @@
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</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 @ 62750a6f
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</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/taskListQualityCheck.html
View file @ 62750a6f
...@@ -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>
...@@ -60,9 +62,12 @@ ...@@ -60,9 +62,12 @@
<td class="mailbox-subject">{{task.groupCount}}</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-subject">{{task.dataCheckCount}}</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 @ 62750a6f
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</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-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.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>
......
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