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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 345 additions and 251 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 @@
<th>数据核验数量</th>
<th>打印卸载数量</th>
<th>质检数量</th>
<th>废证数量</th>
</tr>
</thead>
<tbody>
......@@ -18,6 +19,7 @@
<td>{{item.dataCheckCount}}</td>
<td>{{item.printCount}}</td>
<td>{{item.qualityCheckCount}}</td>
<td>{{item.failedCount}}</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/index.html
View file @ 431ee011
......@@ -192,10 +192,10 @@
<span>分拣任务单</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/taskListStorage']" ng-click="getFocus('/taskListStorage')">
<a href="#!/taskListStorage">
<li ng-class="{true: 'active', false: ''}[tab =='/tagPrint']" ng-click="getFocus('/tagPrint')">
<a href="#!/tagPrint">
<i class="fa fa-dashboard"></i>
<span>仓库任务单</span>
<span>打印封条</span>
</a>
</li>
<li ng-class="{true: 'active', false: ''}[tab =='/receitp']" ng-click="getFocus('/receitp')">
......@@ -266,5 +266,6 @@
<script src="views/historyCards/historyBack.js"></script>
<script src="views/analysisLog/analysisLog.js"></script>
<script src="views/packageLog/packageLog.js"></script>
<script src="views/tagPrint/tagPrint.js"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 431ee011
......@@ -22,6 +22,7 @@ angular.module('AvatarCheck', [
'AvatarCheck.historyBack',
'AvatarCheck.analysisLog',
'AvatarCheck.packageLog',
'AvatarCheck.tagPrint',
'tm.pagination'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider', function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!');
......@@ -105,11 +106,18 @@ angular.module('AvatarCheck', [
if ($location.path() == "/historyBack") {
$rootScope.tab = '/historyBack';
}
if ($location.path() == "/tagPrint") {
$rootScope.tab = '/tagPrint';
$("body").addClass("sidebar-collapse");
}
console.log($rootScope.tab)
$scope.getFocus = function (index) {
if(index=='/tagPrint'){
$("body").addClass("sidebar-collapse");
}
$rootScope.tab = index;
$rootScope.close = 0;
console.log($rootScope.tab)
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 431ee011
......@@ -37,24 +37,27 @@
<thead>
<tr>
<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>
</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-star"><b>{{task.saveDate}}</b></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-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
......@@ -64,7 +67,7 @@
<!-- /.box-body -->
<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>
</div>
</div>
<!-- /. box -->
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 431ee011
......@@ -30,25 +30,28 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
isActive: 'true',
countyList: [
{
taskId: '20190228001',
county: '西城区',
saveDate: '20190228',
county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '东城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
saveDate: '20190228',
county: '海淀区',
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2
},
{
taskId: '20190228001',
saveDate: '20190228',
county: '海淀区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2
}
]
},
......@@ -59,18 +62,20 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
isActive: 'false',
countyList: [
{
taskId: '20190228001',
saveDate: '20190228',
county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
},
{
taskId: '20190228001',
county: '昌平区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
saveDate: '20190228',
county: '海淀区',
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2
}
]
}
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 431ee011
......@@ -37,24 +37,29 @@
<thead>
<tr>
<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>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue" value="{{task.taskId}}"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.saveDate}}</b></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-attachment">{{task.valid}}</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>
</tr>
</tbody>
</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
isActive: 'true',
countyList: [
{
taskId: '20190228001',
county: '西城区',
saveDate: '20190228',
county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
invalid: 0,
state:'未下发'
},
{
taskId: '20190228002',
county: '东城区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
saveDate: '20190228',
county: '海淀区',
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2,
state:'未下发'
},
{
taskId: '20190228003',
saveDate: '20190228',
county: '海淀区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
groupCount:6,
groupNo: '00234653-03687588',
valid: 280,
invalid: 2,
state:'未下发'
}
]
},
......@@ -59,18 +65,22 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
isActive: 'false',
countyList: [
{
taskId: '20190228004',
saveDate: '20190228',
county: '朝阳区',
groupCount:5,
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
invalid: 0,
state:'未下发'
},
{
taskId: '20190228005',
county: '昌平区',
groupNo: '00234653-03687587',
valid: 240,
invalid: 0
saveDate: '20190228',
county: '海淀区',
groupCount:6,
groupNo: '00234653-03687588',
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'])
}
}
var browserName = function (userAgent){
if (userAgent.index0f('Firefox')!= -1)
location.reload([true])
if (userAgent.index0f(" Chrome") !== -1){
location. reload([true])
}
}
$scope.user = {};
$scope.doLogin = function(){
var json = JSON.stringify($scope.user);
......@@ -25,15 +36,16 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
// Try to login
$http({method: 'post', url: "../user/login", data: json}).then(function (resp) {
console.log(resp)
var userAgent = window.navigator.userAgent;
if(resp.data.status==200){
location.reload([true]);
$rootScope.loginData = resp.data.user;
$rootScope.loginData.login =true;
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{
$location.path('/excelAndSearch')
browserName(userAgent)
}
}else{
$scope.authError = resp.data.message;
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ 431ee011
......@@ -90,6 +90,7 @@
<td>400</td>
<td>110013</td>
<td>海淀区</td>
</tr>
<tr ng-repeat="item in postMsgDetail">
<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
This diff is collapsed.
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 @@
<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-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.groupCount}}</a></td>
<td class="mailbox-subject"><a>{{task.groupNo}}</a></td>
<td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</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>
</tr>
</tbody>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 431ee011
......@@ -38,35 +38,36 @@
</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>
<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-subject"><a>{{task.checkDate}}</a></td>
<td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-subject"><a>{{task.groupCount}}</a></td>
<td class="mailbox-subject"><a>{{task.groupNo}}</a></td>
<td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td>
<td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
</table>
<thead>
<tr>
<th><input type="checkbox"></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>数据核验数量</th>
<th>电写入数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="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-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.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 ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.mail-box-messages -->
......
src/main/resources/static/views/task/taskListQualityCheck.html
View file @ 431ee011
......@@ -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>
</tr>
</thead>
......@@ -55,14 +57,17 @@
<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-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.groupCount}}</a></td>
<td class="mailbox-subject"><a>{{task.groupNo}}</a></td>
<td class="mailbox-subject"><a>{{task.dataCheckCount}}</a></td>
<td class="mailbox-attachment">{{task.electricCount}}</td>
<td class="mailbox-subject">{{task.failedCards}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</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-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>
</tbody>
</table>
......@@ -72,7 +77,8 @@
</div>
<!-- /.box-body -->
<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>
<!-- /. box -->
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 431ee011
......@@ -12,8 +12,8 @@
<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;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;margin-right: 10px;" ng-click="searchCurrent()">查询</button>
</div>
<!-- /.box-tools -->
</div>
......@@ -38,10 +38,15 @@
<tr>
<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>
</thead>
......@@ -49,11 +54,17 @@
<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.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-attachment">{{task.valid}}</td>
<td class="mailbox-date">{{task.invalid}}</td>
<td class="mailbox-date"><a href="#">组号列表</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 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>
</tbody>
</table>
......@@ -62,6 +73,9 @@
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
</div>
<!-- /. box -->
</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