Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 07e580c0 authored by dahai's avatar dahai
Browse files
Options

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

parents 83ab4336 59716515
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 53 deletions
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 07e580c0
......@@ -26,28 +26,28 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">组号筛选</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>制证组号：</td>
<td>
<input type="text" class="form-control" name="groupNo1" ng-model="groupNo1" ng-minlength="8" ng-maxlength="8" placeholder="起始组号" >
</td>
<td>至</td>
<td>
<input type="text" class="form-control" ng-model="groupNo2" ng-minlength="8" ng-maxlength="8" placeholder="截止组号">
<div class="box">
<strong class="box-header">组号筛选</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>制证组号：</td>
<td>
<input type="text" class="form-control" name="groupNo1" ng-model="groupNo1" ng-minlength="8" ng-maxlength="8" placeholder="起始组号" >
</td>
<td style="text-align: left;">
<div style="text-align: right;">
<button type="submit" class="btn btn-primary" ng-click="searchCurrentFromProd()">查询</button>
</div>
</td>
</tr>
</table>
</form>
</div>
<td>至</td>
<td>
<input type="text" class="form-control" ng-model="groupNo2" ng-minlength="8" ng-maxlength="8" placeholder="截止组号">
</td>
<td style="text-align: left;">
<div style="text-align: left;">
<button type="submit" class="btn btn-primary" ng-click="searchCurrentFromProd()">查询</button>
</div>
</td>
</tr>
</table>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="box">
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 07e580c0
......@@ -245,7 +245,6 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
groupList.push(arrGroup);
}
var map = {
date:$('#datepicker').val(),
name:$rootScope.loginData.name,
groupList:groupList
}
......
src/main/resources/static/views/login/login.js
View file @ 07e580c0
......@@ -13,8 +13,8 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
var whereToGo = function(process){
switch (process){
case 1:
$location.path("/xmlAndSearch");
$rootScope.tab = '/xmlAndSearch';
$location.path("/createTaskList");
$rootScope.tab = '/createTaskList';
break;
case 2:
$location.path("/taskListPrint");
......
src/main/resources/static/views/queryQualityCheckReport/queryQualityCheckReport.html
View file @ 07e580c0
......@@ -26,17 +26,26 @@
<table class="table table-hover postTable table-bordered">
<thead>
<tr>
<th style="text-align: center;" colspan="2">日期</th>
<th style="text-align: center;" colspan="2">普通证</th>
<th style="text-align: center;" colspan="2">邮寄证</th>
<th style="text-align: center;" colspan="2">军人证</th>
<th style="text-align: center;">日期</th>
<th style="text-align: center;" colspan="2">快证</th>
<th style="text-align: center;" colspan="2">退回重制</th>
<th style="text-align: center;" >补证</th>
<th style="text-align: center;" colspan="2">制证数</th>
<th style="text-align: center;" colspan="2">重做登记</th>
<th style="text-align: center;" colspan="2">港澳证</th>
<th style="text-align: center;" colspan="2">台湾证</th>
<th style="text-align: center;" colspan="2">异地证</th>
<th style="text-align: center;" colspan="2">补证</th>
</tr>
<tr class="tr">
<td colspan="2"></td>
<td></td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>成品</td>
......@@ -47,39 +56,29 @@
<td class="text-danger">废品</td>
<td>成品</td>
<td class="text-danger">废品</td>
<td>数量</td>
<td>数量</td>
</tr>
</thead>
<tbody ng-repeat="item in qualityCheckReportList | orderBy:date" style="border-top: 1px solid #f4f4f4;">
<tr ng-if="item.date!='合计'">
<td colspan="2">{{item.date | myDateFilter}}</td>
<!--普通证-->
<td>{{item.list[0].VALID_COUNT}}</td>
<td>{{item.list[0].FAILED_COUNT}}</td>
<!--邮寄证-->
<td>{{item.list[7].VALID_COUNT}}</td>
<td>{{item.list[7].FAILED_COUNT}}</td>
<!--军人证-->
<td>{{item.list[4].VALID_COUNT}}</td>
<td>{{item.list[4].FAILED_COUNT}}</td>
<!--快证-->
<td>{{item.date | myDateFilter}}</td>
<td>{{item.list[1].VALID_COUNT}}</td>
<td>{{item.list[1].FAILED_COUNT}}</td>
<!--退回重制-->
<td>{{item.list[2].VALID_COUNT}}</td>
<td>{{item.list[2].FAILED_COUNT}}</td>
<!--补证-->
<td>{{item.list[3].VALID_COUNT}}</td>
<td>{{item.list[3].FAILED_COUNT}}</td>
<td>{{item.list[5].VALID_COUNT}}</td>
<td>{{item.list[5].FAILED_COUNT}}</td>
<td>{{item.list[6].VALID_COUNT}}</td>
<td>{{item.list[6].FAILED_COUNT}}</td>
<td>{{item.list[8].FAILED_COUNT}}</td>
<!--制证数-->
<td>{{item.list[0].VALID_COUNT+item.list[7].VALID_COUNT+item.list[4].VALID_COUNT+
item.list[1].VALID_COUNT+item.list[2].VALID_COUNT+item.list[8].FAILED_COUNT}}</td>
</tr>
<tr ng-if="item.date=='合计'" class="bg-gray">
<td colspan="2">{{item.date}}</td>
<td>{{item.date}}：</td>
<td colspan="4">成品证：{{item.list.validCount}}</td>
<td colspan="4">废品证：{{item.list.failedCount}}</td>
<td colspan="4">补证：{{item.list.buCount}}</td>
<td colspan="3">补证：{{item.list.buCount}}</td>
</tr>
</tbody>
</table>
......@@ -99,4 +98,4 @@
</div>
<!-- /.row -->
</div>
</div>
\ No newline at end of file
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment