Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 885a85bb authored by dahai's avatar dahai
Browse files
Options

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

parents 8428b523 07b90156
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 86 deletions
src/main/resources/static/dialogs/analysisDialog.html
View file @ 885a85bb
...@@ -17,70 +17,15 @@ ...@@ -17,70 +17,15 @@
<tbody> <tbody>
<tr ng-repeat="item in resultData"> <tr ng-repeat="item in resultData">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>2019-03-04 15:08</td> <td>{{item.UPLOAD_DATE|date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td>格口文件.xls</td> <td>{{item.FILE_NAME}}</td>
<td>400</td> <td>{{item.RECORD_NUMBER}}</td>
<td>2019-03-01</td> <td>{{item.FORM_START_TIME|date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td>2019-03-03</td> <td>{{item.FORM_DEADLINE|date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click=""> <td ng-click="">
<button class="btn">解析</button> <button class="btn">解析</button>
</td> </td>
</tr> </tr>
<tr>
<td>1</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>2</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>3</td>
<td>2019-03-04 15:08</td>
<td>格口文件.xls</td>
<td>400</td>
<td>2019-03-01</td>
<td>2019-03-03</td>
<td ng-click="">
<button class="btn">解析</button>
</td>
</tr>
<tr >
<td>4</td>
<td>
2019-03-04 15:08
</td>
<td>
格口文件.xls
</td>
<td>
400
</td>
<td>
2019-03-01
</td>
<td>
2019-03-03
</td>
<td ng-click="">
<button class="btn" ng-click="doAnalyse()">解析</button>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
......
src/main/resources/static/views/receitp/receitp.html
View file @ 885a85bb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- /.col --> <!-- /.col -->
<div class="col-md-12"> <div class="col-md-12">
<div class="box box-primary"> <div class="box box-primary">
<div class="box-header with-border"> <div class="box-header">
<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/>
...@@ -15,58 +15,69 @@ ...@@ -15,58 +15,69 @@
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="mailbox-messages" ng-if="receitpData.length>0"> <div ng-if="receitpData.length>0">
<table class="table table-hover postTable "> <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 receitpData 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 receitpData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<div class="mailbox-messages">
<table class="table table-hover postTable">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" class="checkAll" ng-click="checkAll($event)"></th> <th><input type="checkbox" class="checkAll" ng-click="checkAll($event)"></th>
<th>NO.</th> <th>NO.</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 ng-repeat="item in receitpData"> <tbody ng-repeat="item in type.countyList">
<tr style="background-color: #eee"> <tr style="background-color: #eee">
<td><input type="checkbox" class="checkAllPolice" ng-click="checkAllPolice($event,item.countyCode)"></td> <td><input type="checkbox" class="checkAllPolice" ng-click="checkAllPolice($event,item.countyCode)"></td>
<td></td> <td></td>
<td>{{item.countyCode}}</td> <td>{{item.countyCode}}</td>
<td style="color: #3c8dbc">{{item.countyName}}</td> <td style="color: #3c8dbc">{{item.countyName}}</td>
<td></td> <td>{{item.countyValidCount}}</td>
<td></td>
<td></td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
<tr ng-repeat="police in item.policeList"> <tr ng-repeat="police in item.policeList">
<td></td> <td></td>
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{police.policeCode}}</td> <td>{{police.GAJG_DM}}</td>
<td>{{police.policeName}}</td> <td>{{police.GAJG_MC}}</td>
<td>{{police.puSum+police.youSum}}</td> <td>{{police.FINISH_COUNT}}</td>
<td>{{police.puSum}}</td> <td>{{police.CHECK_DATE | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td>{{police.youSum}}</td> <td>{{police.CHECK_NAME}}</td>
<td>{{police.checkDate | limitTo : 10 }}</td>
<td>{{police.checkName}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
</div> </div>
<h4 ng-if="receitpData.length==0">暂无数据</h4> <!-- /.table -->
<!-- /.mail-box-messages --> <div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
</div> </div>
<!-- /.box-body -->
<div class="box-footer" ng-if="receitpData.length>0">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="printReceitp()">打印交接单</button>
<button class="btn btn-primary" ng-click="downloadGAinfo()">下载公安网反馈信息</button>
</div> </div>
<div ng-if="receitpData.length==0">
<h4>暂无数据</h4>
</div> </div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/receitp/receitp.js
View file @ 885a85bb
...@@ -31,6 +31,18 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -31,6 +31,18 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
a.click(); a.click();
} }
$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;
}
$scope.doSearchReceitp = function () { $scope.doSearchReceitp = function () {
var date=$('#datepicker').val(); var date=$('#datepicker').val();
if(date==''){ if(date==''){
...@@ -38,7 +50,14 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -38,7 +50,14 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
} }
HttpService.getReceitp(date,function(data){ HttpService.getReceitp(date,function(data){
$scope.receitpData=data; $scope.receitpData=data;
console.log(data); for(var i=0;i<$scope.receitpData.length;i++){
if(i==$scope.currentTab){
$scope.receitpData[i].isActive=true;
}else{
$scope.receitpData[i].isActive=false;
}
}
console.log($scope.receitpData);
}) })
} }
$scope.doSearchReceitp(); $scope.doSearchReceitp();
......
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