Commit 05ac72f8 authored by liboyang's avatar liboyang

EMS角色的功能完成

parent b2c9a8e1
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
<select class="form-control select2" id="packageType" <select class="form-control select2" id="packageType"
ng-model="packageType"> ng-model="packageType">
<option value="">--请选择禁用状态--</option> <option value="">--请选择禁用状态--</option>
<option value="1"></option> <option value="0"></option>
<option value="-1"></option> <option value="1"></option>
</select> </select>
</td> </td>
<td>制证包上传时间:</td> <td>制证包上传时间:</td>
...@@ -87,40 +87,42 @@ ...@@ -87,40 +87,42 @@
<div class="box box-default"> <div class="box box-default">
<strong class="box-header with-border">制证信息详情</strong> <strong class="box-header with-border">制证信息详情</strong>
<div class="box-info" style="padding: 10px;"> <div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover" ng-if="packageData"> <div ng-if="packageData.length>0">
<thead> <table class="table table-bordered table-hover">
<tr> <thead>
<th>NO.</th> <tr>
<th>上传受理号</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> <th>禁用</th>
</thead> </tr>
<tbody> </thead>
<tr ng-repeat="item in packageData"> <tbody>
<td>1</td> <tr ng-repeat="item in packageData">
<td>411032546565445</td> <td>1</td>
<td>张三</td> <td>411032546565445</td>
<td>130133195608240013</td> <td>张三</td>
<td>1321454113</td> <td>130133195608240013</td>
<td>1213134556</td> <td>1321454113</td>
<td>普通证</td> <td>1213134556</td>
<td> <td>普通证</td>
<input type="radio" name="isPackage" value="1" checked> <td>
<input type="radio" name="isPackage" value="2"> <input type="radio" name="isPackage" value="1" checked>
</td> <input type="radio" name="isPackage" value="2">
</tr> </td>
</tbody> </tr>
</table> </tbody>
<p style="color:#9f191f;" ng-if="packageData"><span style="margin-right: 15px;">普通证:3000</span><span style="margin-right: 15px;">邮寄证:2000</span><span>禁用数:2</span></p> </table>
<div style="padding-left: 27%;" ng-if="packageData"> <p style="color:#9f191f;"><span style="margin-right: 15px;">普通证:3000</span><span style="margin-right: 15px;">邮寄证:2000</span><span>禁用数:2</span></p>
<div style="padding-left: 27%;">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
<h3 ng-if="postData.length==0">暂无记录。</h3> </div>
<h4 ng-if="packageData.length==0">暂无记录。</h4>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -35,9 +35,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -35,9 +35,10 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
itemsPerPage: 10, itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50]
}; };
$scope.paginationConf.totalItems = 50;
$scope.doPackageQuery=function(){ $scope.doPackageQuery=function(){
var date = $("#datepicker").val();
var packageType = $("#packageType").val();
if(angular.isUndefined($scope.uploadNo)){ if(angular.isUndefined($scope.uploadNo)){
$scope.uploadNo=''; $scope.uploadNo='';
} }
...@@ -56,19 +57,27 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -56,19 +57,27 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(angular.isUndefined($scope.typeCode)){ if(angular.isUndefined($scope.typeCode)){
$scope.typeCode=''; $scope.typeCode='';
} }
if(angular.isUndefined($scope.packageType)){ if(angular.isUndefined(packageType)){
$scope.packageType=''; packageType='';
} }
var date = $("#datepicker").val();
if (date==''){ if (date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd"); date=$filter("date")(new Date(), "yyyy-MM-dd");
} }
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg, HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
$scope.typeCode,$scope.packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) { $scope.typeCode,packageType,date,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data) {
$scope.paginationConf.totalItems=data.total; $scope.paginationConf.totalItems=data.total;
$scope.simpleCardCount = data.puSum;
$scope.postCardCount = data.youSum;
$scope.packageData = data.list; $scope.packageData = data.list;
console.log(data) console.log(data)
}) })
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候,重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doPackageQuery);
$scope.downloadXml = function(){
}
}); });
\ No newline at end of file
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