Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 1073ec52 authored by dahai's avatar dahai
Browse files
Options

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

parents 193732c8 18939e7a
Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 84 deletions
src/main/java/com/yxproject/start/api/FailedCardApi.java
View file @ 1073ec52
......@@ -112,20 +112,19 @@ public class FailedCardApi {
String name =jsonObject.get("name").toString();
TaskEntity taskEntity = new TaskEntity();
for (int i=0;i<jsonarray.size();i++) {
/*查询生成任务单需要的数据*/
// JSONObject jsonObject2 =(JSONObject)o;
Map<String,Object> resultMap= failedCardService.selectTaskListDate((String) jsonarray.get(i));
System.out.println();
//TODO 会报空指针异常
String countyCode = resultMap.get("COUNTY_CODE").toString();
Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE_ID")+"");
Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE")+"");
String acceptNo = (String) resultMap.get("ACCEPT_NO");
taskEntity.setCountyCode(countyCode);
taskEntity.setCardType(cardType);
taskEntity.setTaskStateId((long) 1);
taskEntity.setSubmitName(name);
/*特证数+1*/
failedCardService.specialCardAdd(acceptNo);
/*生成新任务单*/
taskListService.saveTask(taskEntity);
/*特证表添加特证*/
SpecialCardEntity specialCardEntity = new SpecialCardEntity() ;
......@@ -134,9 +133,6 @@ public class FailedCardApi {
specialCardEntity.setTaskId(taskEntity.getTaskId());
specialCardEntity.setGroupNo(acceptNo.substring(0,8));
failedCardService.addSpecialCard(specialCardEntity);
/*特证数+1*/
failedCardService.specialCardAdd(acceptNo);
}
return true;
}
......
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ 1073ec52
......@@ -73,10 +73,10 @@ public interface FailedCardMapper {
@Select("select SPECIAL_CARD.SPECIAL_TYPE,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,SPECIAL_CARD.INITIATOR,PREPRO_PERSON.CARD_TYPE_ID\n" +
@Select("select prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,task.CARD_TYPE\n" +
"from prod_card_t@prod_link\n" +
"left join SPECIAL_CARD on prod_card_t.accept_no = SPECIAL_CARD.accept_no\n" +
"left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH=prod_card_t.UPLOAD_NO\n" +
"left join group_no on subStr(prod_card_t.ACCEPT_NO,0,8)=group_no.group_no "+
"left join task on group_no.task_id = task.task_id "+
"where prod_card_t.accept_no=#{acceptNo} or prod_card_t.ID_NO=#{acceptNo}")
public Map<String,Object> selectTaskListDate(@Param("acceptNo") String acceptNo);
......
src/main/resources/static/js/app.js
View file @ 1073ec52
......@@ -162,20 +162,26 @@ angular.module('AvatarCheck', [
console.log($rootScope.tab)
}
$scope.doSearch = function (searchInput) {
$scope.msg="";
$scope.alertMsg="";
var pattern = /^[0-9]*$/
if(angular.isUndefined(searchInput)||!pattern.test(searchInput)){
$scope.disabledAdd=false;
// var pattern = /^[0-9]*$/
if(angular.isUndefined(searchInput)){
$location.path("/searchCard");
$scope.msg = "请输入正确的受理号/身份证号/任务单编号";
}else{
HttpService.searchCards(searchInput, function (data) {
if(data==''){
$scope.searchResult={}
$scope.msg="";
$scope.alertMsg = "暂无数据";
}else{
$scope.searchResult = data;
if($scope.searchResult.workOrderData[0].CARD_TYPE==1){
$scope.disabledAdd=true;
}
console.log($scope.searchResult,"searchResult")
console.log($scope.searchResult.workOrderData,"searchResult.workOrderData")
console.log($scope.searchResult.ACCdata,"searchResult.ACCdata")
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ 1073ec52
......@@ -6,16 +6,16 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">废证添加</strong>
<div class="box-primary">
<div class="box box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">废证数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="failedCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 15px;">
<div style="padding: 7px;">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
......
src/main/resources/static/views/addRest/addRest.html
View file @ 1073ec52
......@@ -9,16 +9,16 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">余证添加</strong>
<div class="box-primary">
<div class="box box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">余证数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="restCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<form style="padding: 15px; " name="form">
<form style="padding: 7px; " name="form">
<ul class="cl">
<li ng-repeat="item in arr" style="float: left;margin:0 10px 10px 0">
<input type="text" style="height: 34px;" class="rest" placeholder="请输入身份证号或受理号">
......
src/main/resources/static/views/addTag/addTag.html
View file @ 1073ec52
......@@ -6,16 +6,16 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">添加详单备注</strong>
<div class="box-primary">
<div class="box box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">证件数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="tagCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 15px;">
<div style="padding: 7px;">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ 1073ec52
......@@ -52,6 +52,7 @@
</td>
</tr>
</table>
<div class="box-info"style="margin:7px;margin-top:0px;">
<table class="table table-bordered table-hover postTable" ng-if="analyseLog.length>0">
<thead>
<tr>
......@@ -89,5 +90,7 @@
</div>
</div>
</div>
</div>
</div>
</div>
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ 1073ec52
......@@ -29,9 +29,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box ">
<strong class="box-header">制证信息打包</strong>
<div class="box-info">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>上传受理号:</td>
......@@ -87,7 +87,7 @@
</div>
<div class="box box-default">
<strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 10px;">
<div class="box-info" style="padding: 7px; padding-top: 0px;">
<div ng-if="packageData.length>0">
<table class="table table-bordered table-hover">
<thead>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ 1073ec52
......@@ -29,9 +29,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box ">
<strong class="box-header">制证信息管理</strong>
<div class="box-info">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>文件ID:</td>
......@@ -81,8 +81,8 @@
</div>
<div class="box box-default">
<strong class="box-header with-border">查询结果</strong>
<div class="box-info" style="padding: 10px;">
<strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover" ng-if="xmlDatas.length>0">
<thead>
<tr>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ 1073ec52
......@@ -68,7 +68,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
MessageService.showAlert("请选择起始日期和结束日期")
}else{
console.log($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
HttpService.selectXmlDataCount($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,function(data){
$scope.paginationConf.totalItems=data;
console.log($scope.paginationConf.totalItems,"count")
})
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 1073ec52
......@@ -29,7 +29,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>创建任务单</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box ">
<div class="box-header with-border">
<strong>请选择下发任务单</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ 1073ec52
......@@ -26,9 +26,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box">
<strong class="box-header with-border">打包日志</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<div class="box box-primary" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>新包名:</td>
......@@ -65,9 +65,13 @@
</td>
<td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
</tr>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<strong class="box-header with-border">打包信息详情</strong>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="packageLogData.length>0">
<thead>
<tr>
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ 1073ec52
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header">
查询结果
</strong>
<div class="box-info" style="padding:0px 10px 7px 10px;">
<!--初始化-->
<div class="box" ng-if="msg!=''" >
<div class="box-primary" style="padding: 7px 0px 7px 7px;">
<h4 ng-if="alertMsg">{{alertMsg}}</h4>
<h4 ng-if="msg">{{msg}}</h4>
<h4 ng-if="!searchResult">
请输入要查询的受理号/身份证号/任务单编号
请输入：受理号/身份证号/任务单编号
</h4>
</div>
</div>
<!--任务单-->
<div class="panel panel-info" ng-if="searchResult.workOrderData.length>0">
<div class="box-info" ng-if="searchResult.workOrderData.length>0">
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">
任务单
......@@ -37,7 +38,6 @@
<td>{{item.COUNTYNAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td>{{item.VALID_COUNT}}</td>
<td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
......@@ -49,8 +49,10 @@
</table>
</div>
</div>
</div>
<!--受理库-->
<div class="panel panel-info" ng-if="searchResult.ACCdata.length>0">
<div class="box-info" ng-if="searchResult.ACCdata.length>0">
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">
受理库
......@@ -74,7 +76,9 @@
</thead>
<tbody>
<tr ng-repeat="item in searchResult.ACCdata">
<td><input ng-checked="searchResult.ACCdata.length==1" type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="accu"></td>
<td><input ng-checked="searchResult.ACCdata.length==1" type="checkbox"
value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}"
class="accu"></td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td>
......@@ -89,13 +93,15 @@
</tbody>
</table>
</div>
<div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info" ng-click="addQuickCardAccu()">添加快证</button>
<div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1">
<button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardAccu()">添加快证</button>
<button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
</div>
</div>
</div>
<!--制证库-->
<div class="panel panel-info" ng-if="searchResult.PRODData.length>0">
<div class="box-info" ng-if="searchResult.PRODData.length>0">
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">
制证库
......@@ -120,7 +126,9 @@
</thead>
<tbody>
<tr ng-repeat="item in searchResult.PRODData">
<td><input ng-checked="searchResult.PRODData.length==1" type="checkbox" value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}" class="prod"></td>
<td><input ng-checked="searchResult.PRODData.length==1" type="checkbox"
value="{{item.ACCEPT_NO}}+{{item.COUNTY_CODE}}+{{item.CARD_TYPE_ID}}"
class="prod"></td>
<td>{{item.ACCEPT_NO}}</td>
<td>{{item.COUNTYNAME}}</td>
<td>{{item.NAME}}</td>
......@@ -136,17 +144,18 @@
</tbody>
</table>
</div>
<div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info" ng-click="addQuickCardProd()">添加快证</button>
<div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1">
<button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardProd()">添加快证</button>
<button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
</div>
</div>
<div ng-if="searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0">
</div>
<!---没查到数据-->
<div class="box-info"
ng-if="searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0">
<div>
<h4>没有查询到相关信息</h4>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 1073ec52
......@@ -13,11 +13,11 @@
</style>
<section class="content row">
<div class="col-md-12 no-padding" style="margin-top:20px;">
<div class="box box-primary ">
<div class="box">
<div class="box-header with-border">
<strong >封条标签</strong>
</div>
<div class="box-info" style="padding: 15px;padding-top: 0;">
<div class="box box-primary" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="10%" style="text-align: center;vertical-align: middle!important;">身份证号:</td>
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/task/taskListPushing.html
View file @ 1073ec52
......@@ -3,7 +3,7 @@
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<div class="box-tools pull-right">
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 1073ec52
<div class="content row">
<!-- /.col -->
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box ">
<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;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
<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="searchTaskList()">当前
</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;"
ng-click="searchHistory()">查询历史
</button>
</div>
<!-- /.box-tools -->
</div>
......@@ -30,11 +36,13 @@
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages"
ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)"
ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>核验日期</th>
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
......@@ -52,7 +60,10 @@
</thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
<tr>
<td ng-if="task.faileCount==0"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td ng-if="task.faileCount==0"><input type="checkbox" class="checkOneBox"
ng-checked="isSelected(task)"
value="{{task.taskId}}"
ng-click="updateSelection($event,task)"></td>
<td ng-if="task.faileCount>0"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
......@@ -63,11 +74,16 @@
<td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.eWriteCount}}</td>
<td class="mailbox-subject">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">
{{task.faileCount}}
</td>
<td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-subject">{{task.recheckCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.policeList,task.taskId)">组号列表</a></td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
<td class="mailbox-date"><a
ng-click="getPoliceList(task.policeList,task.taskId)">派出所列表</a></td>
<td class="mailbox-subject">
<button class="btn btn-primary">打印封条</button>
</td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
......@@ -92,7 +108,9 @@
<td>{{item.E_WRITER_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.FAILECOUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
<td>
<a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a>
</td>
</tr>
</tbody>
</table>
......@@ -126,7 +144,8 @@
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages"
ng-show="currentTab==$index">
<table class="table table-hover table-striped">
<thead>
<tr>
......@@ -154,8 +173,11 @@
<td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-subject">{{task.specialCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
<td class="mailbox-date"><a
ng-click="getPoliceList(task.groupList,task.taskId)">组号列表</a></td>
<td class="mailbox-subject">
<button class="btn btn-primary">打印封条</button>
</td>
</tr>
<tr ng-if="task.taskId==taskId">
<td></td>
......@@ -174,7 +196,9 @@
<td>{{item.VALID_COUNT}}</td>
<td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
<td>{{item.SPECIAL_CARD_COUNT}}</td>
<td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>
<td>
<a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a>
</td>
</tr>
</tbody>
</table>
......@@ -193,8 +217,8 @@
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
</div>
</div>
<!-- /.col -->
<!-- /.col -->
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ 1073ec52
......@@ -29,9 +29,9 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<div class="box ">
<strong class="box-header with-border">制证包上传</strong>
<div class="box-primary">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%">选择XML文件：</td>
......@@ -48,9 +48,9 @@
</table>
</div>
</div>
<div class="box box-primary">
<div class="box ">
<strong class="box-header with-border ">制证包管理</strong>
<div class="box-primary" style="padding: 15px;padding-top: 0;">
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="15%">XML导入时间:</td>
......@@ -67,6 +67,7 @@
</td>
</tr>
</table>
<div class="box-info" style="padding: 7px;padding-top: 0;">
<table class="table table-bordered table-hover postTable" ng-if="xmlPackageData.length>0">
<thead>
<tr>
......@@ -103,5 +104,7 @@
</div>
</div>
</div>
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment