Commit a744ac7f authored by dahai's avatar dahai

push

parent 131b8ff9
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
<div class="row"> <div class="row">
<!-- /.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"> <div class="box-header">
<strong>膜打印数据报表</strong> <strong ng-if="state==2">膜打印数据报表</strong>
<strong ng-if="state==3">工作组数据报表</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span></span> <span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span></span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" 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="choseDate2" id="datepicker2" readonly/>
...@@ -26,7 +27,8 @@ ...@@ -26,7 +27,8 @@
<table class="table table-hover postTable"> <table class="table table-hover postTable">
<thead> <thead>
<tr> <tr>
<th>打印日期</th> <th ng-if="2">打印日期</th>
<th ng-if="3">预定位日期</th>
<th>大批证</th> <th>大批证</th>
<th>邮寄证</th> <th>邮寄证</th>
<th>军人证</th> <th>军人证</th>
...@@ -50,13 +52,64 @@ ...@@ -50,13 +52,64 @@
<!-- /.table --> <!-- /.table -->
</div> </div>
</div> </div>
<div ng-if="receitpData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
<!--<div class="box box-primary" >-->
<!--<div class="box-header">-->
<!--<strong>工作组数据报表</strong>-->
<!--<div class="box-tools pull-right">-->
<!--<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span>-->
<!--<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate2" id="datepicker2" readonly/>-->
<!--<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchReport()">查询</button>-->
<!--</div>-->
<!--&lt;!&ndash; /.box-tools &ndash;&gt;-->
<!--</div>-->
<!--&lt;!&ndash; /.box-header &ndash;&gt;-->
<!--<div class="box-body">-->
<!--<div ng-if="reportData.length==1">-->
<!--<h4>暂无数据</h4>-->
<!--</div>-->
<!--<div ng-if="reportData.length>1">-->
<!--<div class="table-responsive mailbox-messages" >-->
<!--<div class="mailbox-messages">-->
<!--<table class="table table-hover postTable">-->
<!--<thead>-->
<!--<tr>-->
<!--<th>打印日期</th>-->
<!--<th>大批证</th>-->
<!--<th>邮寄证</th>-->
<!--<th>军人证</th>-->
<!--<th>快证</th>-->
<!--<th>废证</th>-->
<!--</tr>-->
<!--</thead>-->
<!--<tbody ng-repeat="item in reportData">-->
<!--<tr style="background-color: #eee">-->
<!--<td>{{item.date}}</td>-->
<!--<td style="color: #3c8dbc">{{item.pu}}</td>-->
<!--<td>{{item.you}}</td>-->
<!--<td>{{item.jun}}</td>-->
<!--<td>{{item.kuai}}</td>-->
<!--<td>{{item.fei}}</td>-->
<!--</tr>-->
<!--</tbody>-->
<!--</table>-->
<!--&lt;!&ndash; /.table &ndash;&gt;-->
<!--</div>-->
<!--&lt;!&ndash; /.table &ndash;&gt;-->
<!--</div>-->
<!--</div>-->
<!--&lt;!&ndash; /.mail-box-messages &ndash;&gt;-->
<!--</div>-->
<!--&lt;!&ndash; /.box-body &ndash;&gt;-->
<!--</div>-->
<!-- /. box --> <!-- /. box -->
</div> </div>
<!-- /.col --> <!-- /.col -->
......
...@@ -10,7 +10,7 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http']) ...@@ -10,7 +10,7 @@ angular.module('AvatarCheck.report', ['ngRoute', 'AvatarCheck.http'])
}]) }])
.controller('reportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) { .controller('reportCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.state = 3;
//Date picker //Date picker
$('#datepicker1').datetimepicker({ $('#datepicker1').datetimepicker({
minView: "month", //选择日期后,不会再跳转去选择时分秒 minView: "month", //选择日期后,不会再跳转去选择时分秒
......
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