Skip to content

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

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

parents 7550fcb8 a131b559
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 586 additions and 285 deletions
src/main/java/com/yxproject/start/api/PersonPostApi.java
View file @ e91c975b
...@@ -43,6 +43,25 @@ public class PersonPostApi { ...@@ -43,6 +43,25 @@ public class PersonPostApi {
return null; return null;
} }
/**
* 按条件查询个人邮寄信息
* @param jsonStr
* @return
*/
@RequestMapping("findPersonalDataCount")
public int findPersonalDataCount(@RequestBody String jsonStr){
JSONObject jsonObject = JSONObject.fromObject(jsonStr);
String applicantName = jsonObject.getString("applicantName");
String orderNumber = jsonObject.getString("orderNumber");
String state = jsonObject.getString("state");
String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
List<String> getToCounty = new ArrayList<>();
getToCounty.add(jsonObject.getString("getToCounty"));
String uploadDate = jsonObject.getString("uploadDate");
int count = personPostService.findPersonalDataCount(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate);
return count;
}
/** /**
* 按条件查询个人邮寄信息 * 按条件查询个人邮寄信息
* @param jsonStr * @param jsonStr
......
src/main/java/com/yxproject/start/service/PersonPostService.java
View file @ e91c975b
...@@ -30,4 +30,6 @@ public interface PersonPostService { ...@@ -30,4 +30,6 @@ public interface PersonPostService {
public List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto); public List<PersonPostEntity> getPostInfo(ReadCardDto readCardDto);
public boolean printPostList(int id, Date printDateTime); public boolean printPostList(int id, Date printDateTime);
public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String uploadDate);
} }
src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java
View file @ e91c975b
...@@ -84,6 +84,11 @@ public class PersonPostServiceImpl implements PersonPostService { ...@@ -84,6 +84,11 @@ public class PersonPostServiceImpl implements PersonPostService {
return true; return true;
} }
@Override
public int findPersonalDataCount(String applicantName, String orderNumber, String state, String latticeMouthInformation, List<String> getToCounty, String uploadDate) {
return 0;
}
// /** // /**
// * 查询个人邮寄信息 // * 查询个人邮寄信息
// * @param fileName 文件名 // * @param fileName 文件名
......
src/main/resources/static/dialogs/confirmRestCards.html 0 → 100644
View file @ e91c975b
<div class="ui-dialog-title">
确认信息
</div>
<div class="ui-dialog-content">
<table class="table table-responsive table-hover">
<thead>
<th>NO.</th>
<th>身份证号</th>
<th>姓名</th>
<th>性别</th>
</thead>
<tbody>
<tr ng-repeat="item in personInfo">
<td>{{$index + 1}}</td>
<td>{{item.ID_NO}}</td>
<td>{{item.NAME}}</td>
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmAdd()">确定添加</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/js/app.js
View file @ e91c975b
...@@ -100,8 +100,11 @@ angular.module('AvatarCheck', [ ...@@ -100,8 +100,11 @@ angular.module('AvatarCheck', [
if ($location.path() == "/taskListPrint") { if ($location.path() == "/taskListPrint") {
$rootScope.tab = '/taskListPrint'; $rootScope.tab = '/taskListPrint';
} }
if ($location.path() == "/taskListQualityCheck") { if ($location.path() == "/taskListPushing") {
$rootScope.tab = '/taskListQualityCheck'; $rootScope.tab = '/taskListPushing';
}
if ($location.path() == "/taskListCutting") {
$rootScope.tab = '/taskListCutting';
} }
if ($location.path() == "/taskListSorting") { if ($location.path() == "/taskListSorting") {
$rootScope.tab = '/taskListSorting'; $rootScope.tab = '/taskListSorting';
...@@ -195,6 +198,11 @@ angular.module('AvatarCheck', [ ...@@ -195,6 +198,11 @@ angular.module('AvatarCheck', [
$location.path("/createTaskList"); $location.path("/createTaskList");
} }
$scope.addQuickCard = function(){
}
}).filter('myDateFilter', function() { //可以注入依赖 }).filter('myDateFilter', function() { //可以注入依赖
return function(permanentPositionDate) { return function(permanentPositionDate) {
......
src/main/resources/static/js/service.js
View file @ e91c975b
...@@ -88,10 +88,14 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -88,10 +88,14 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
searchPostData: function (url, success) { searchPostData: function (data, success) {
var body = JSON.stringify(data);
console.log(body)
$http({ $http({
method: 'GET', method: 'POST',
url: url url: "../personPostApi/findPersonalData",
data:body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
...@@ -126,10 +130,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -126,10 +130,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
getRecordsCount: function (url, success) { getRecordsCount: function (data, success) {
var body = JSON.stringify(data);
$http({ $http({
method: 'GET', method: 'GET',
url: url url: "../personPostApi/findPersonalDataCount",
data:body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
...@@ -453,7 +460,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -453,7 +460,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
addFailedCard:function(data,succuss){ addFailedCard:function(data,success){
var body = JSON.stringify(data); var body = JSON.stringify(data);
$http({ $http({
method: 'POST', method: 'POST',
...@@ -461,7 +468,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -461,7 +468,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
data: body, data: body,
headers: {'Content-Type': 'application/json'} headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) { }).then(function successCallback(response) {
succuss(response.data) success(response.data)
})
},
addRestCard:function(data,success) {
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../FailedCardApi/insertRemaining",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
}) })
}, },
getTaskListByProcess:function(success){ getTaskListByProcess:function(success){
...@@ -498,6 +516,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -498,6 +516,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
},
updateTaskListProcess:function(json,success){
var body = JSON.stringify(json);
$http({
method: 'POST',
url: "../TaskList/updateState",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
} }
} }
}); });
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.html
View file @ e91c975b
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
<div style="padding: 15px;"> <div style="padding: 15px;">
<ul class="cl"> <ul class="cl">
<li ng-repeat="item in arr" style="float: left;margin:0 10px 10px 0"> <li ng-repeat="item in arr" style="float: left;margin:0 10px 10px 0">
<input type="text" style="height: 34px;" placeholder="请输入身份证号或受理号"> <input type="text" style="height: 34px;" class="rest" placeholder="请输入身份证号或受理号">
</li> </li>
</ul> </ul>
<div ng-if="arr.length>0" style="text-align: right;"> <div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary">添加</button> <button class="btn btn-primary" ng-click="addRest()">添加</button>
<button class="btn btn-danger" ng-click="cancelAddRest()">取消</button> <button class="btn btn-danger" ng-click="cancelAddRest()">取消</button>
</div> </div>
</div> </div>
......
src/main/resources/static/views/addRest/addRest.js
View file @ e91c975b
...@@ -22,4 +22,35 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http']) ...@@ -22,4 +22,35 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
$scope.cancelAddRest =function(){ $scope.cancelAddRest =function(){
$scope.arr = []; $scope.arr = [];
} }
$scope.addRest = function(){
var array = [];
for(var i=0;i<$scope.arr.length;i++){
array.push($(".rest")[i].value)
}
var json={};
json.name=$rootScope.loginData.name;
json.list = array;
console.log(array)
ngDialog.open({
template: 'dialogs/confirmRestCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
HttpService.getPersonInfo(array,function(data){
$scope.personInfo = data;
console.log($scope.personInfo)
})
$scope.confirmAdd = function(){
HttpService.addRestCard(json,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
console.log(data)
})
}
}]
});
}
}); });
\ No newline at end of file
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ e91c975b
...@@ -15,57 +15,65 @@ ...@@ -15,57 +15,65 @@
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div ng-if="cycleSheetData.length>0">
<ul class="nav nav-tabs"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;" >
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]" <ul class="nav nav-tabs">
ng-repeat="tab in cycleSheetData track by $index"> <li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
<a ng-click="func($index,tab.typeCode)"> ng-repeat="tab in cycleSheetData track by $index">
<ul style="margin: 0;padding: 0;"> <a ng-click="func($index,tab.typeCode)">
<li style="font-size: 16px;">{{tab.typeName}}</li> <ul style="margin: 0;padding: 0;">
<li style="text-align: center;">{{tab.typeSum}}</li> <li style="font-size: 16px;">{{tab.typeName}}</li>
</ul> <li style="text-align: center;">{{tab.typeSum}}</li>
</a> </ul>
</li> </a>
</ul> </li>
</ul>
</div> </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"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox"></th> <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></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>
<th>状态</th> <th>废证数量</th>
<th>特殊证件数量</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.saveDate}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.county}}</a></td> <td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.valid}}</td> <td class="mailbox-attachment">{{task.countyValidCount}}</td>
<td class="mailbox-date">{{task.invalid}}</td> <td class="mailbox-date">{{task.countyInvalidCount}}</td>
<td class="mailbox-date text-danger">{{task.state}}</td> <td class="mailbox-date" ng-if="task.faileCount==0">{{task.faileCount}}</td>
<td class="mailbox-date text-danger" ng-if="task.faileCount!=0">{{task.faileCount}}</td>
<td class="mailbox-date">{{task.specialCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
</div> </div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">下发任务单</button>
</div>
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ e91c975b
...@@ -100,6 +100,66 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -100,6 +100,66 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
// ] // ]
// } // }
// ] // ]
//创建变量用来保存选中结果
$scope.selected = [];
var updateSelected = function (action, task) {
if (action === 'add' && $scope.selected.indexOf(task) === -1) {
$scope.selected.push(task);
}
if (action === 'remove' && $scope.selected.indexOf(task) !== -1) $scope.selected.splice($scope.selected.indexOf(task), 1);
};
//更新某一列数据的选择
var temp = 0;
$rootScope.cardsTotal = 0;
$scope.updateSelection = function ($event, task) {
var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove');
updateSelected(action, task);
var sum = 0;
var checks = document.getElementsByClassName("checkOneBox");
for (var i=0;i<checks.length;i++){
if (checks[i].checked) {
sum += parseInt(checks[i].value);
}
}
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
temp = sum;
};
//全选操作
$scope.selectAll = function (task,$event) {
var checkbox = $event.target;
var action = (checkbox.checked ? 'add' : 'remove');
for (var i = 0; i < task.length; i++) {
var contact = task[i];
updateSelected(action, contact);
}
if(checkbox.checked){
var sum = 0;
var checks = document.getElementsByClassName("checkOneBox");
for (var i = 0; i < checks.length; i++) {
sum += parseInt(checks[i].value);
}
$rootScope.cardsTotal = $rootScope.cardsTotal + sum - temp;
temp = sum;
}else{
$rootScope.cardsTotal =0;
temp = 0;
}
};
$scope.isSelected = function (task) {
return $scope.selected.indexOf(task) >= 0;
};
$scope.isSelectedAll = function (index) {
return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
};
$scope.currentTab = 0; $scope.currentTab = 0;
$scope.func = function (index) { $scope.func = function (index) {
for (var idx in $scope.cycleSheetData) { for (var idx in $scope.cycleSheetData) {
...@@ -138,11 +198,21 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -138,11 +198,21 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
} }
$scope.goes = function(){ $scope.goes = function(){
console.log(">>>>>") var checks = $(".checkOneBox:checked");
var checks = $(".icheckbox_flat-blue:checked"); var arr = [];
for (var i=0;i<checks.length;i++){ for (var i=0;i<checks.length;i++){
console.log(checks[i].value) arr.push(checks[i].value)
} }
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
MessageService.showAlert("下发完成")
})
} }
}); });
......
src/main/resources/static/views/login/login.js
View file @ e91c975b
...@@ -47,8 +47,12 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http']) ...@@ -47,8 +47,12 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
$rootScope.tab = '/taskListSorting'; $rootScope.tab = '/taskListSorting';
break; break;
case 5: case 5:
$location.path("/taskListCutting");
$rootScope.tab = '/taskListCutting';
break; break;
case 4: case 4:
$location.path("/taskListPushing");
$rootScope.tab = '/taskListPushing';
break; break;
case 7: case 7:
$location.path("/receitp"); $location.path("/receitp");
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ e91c975b
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</table> </table>
</div> </div>
<div style="text-align:right;padding: 10px;padding-top: 0;"> <div style="text-align:right;padding: 10px;padding-top: 0;">
<button class="btn btn-info">添加快证</button> <button class="btn btn-info" ng-click="addQuickCard()">添加快证</button>
<button class="btn btn-danger">退证</button> <button class="btn btn-danger">退证</button>
</div> </div>
</div> </div>
......
src/main/resources/static/views/task/taskListCutting.html 0 → 100644
View file @ e91c975b
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<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="searchToday()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="cycleSheetData.length>0">
<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 cycleSheetData 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>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
</li>
</ul>
</div>
<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>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>数据核验数量</th>
<th>电写入数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</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-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
src/main/resources/static/views/task/taskListPreLocating.html
View file @ e91c975b
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div ng-if="cycleSheetData.length>0">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]" <li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
ng-repeat="tab in cycleSheetData track by $index"> ng-repeat="tab in cycleSheetData track by $index">
...@@ -31,11 +32,11 @@ ...@@ -31,11 +32,11 @@
</li> </li>
</ul> </ul>
</div> </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"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox"></th> <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th> <th>任务单编号</th>
<th>核验日期</th> <th>核验日期</th>
<th>地区</th> <th>地区</th>
...@@ -49,28 +50,33 @@ ...@@ -49,28 +50,33 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td> <td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.county}}</a></td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div> </div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ e91c975b
...@@ -15,28 +15,29 @@ ...@@ -15,28 +15,29 @@
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div ng-if="cycleSheetData.length>0">
<ul class="nav nav-tabs"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]" <ul class="nav nav-tabs">
ng-repeat="tab in cycleSheetData track by $index"> <li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
<a ng-click="func($index,tab.typeCode)"> ng-repeat="tab in cycleSheetData track by $index">
<ul style="margin: 0;padding: 0;"> <a ng-click="func($index,tab.typeCode)">
<li style="font-size: 16px;">{{tab.typeName}}</li> <ul style="margin: 0;padding: 0;">
<li style="text-align: center;">{{tab.typeSum}}</li> <li style="font-size: 16px;">{{tab.typeName}}</li>
</ul> <li style="text-align: center;">{{tab.typeSum}}</li>
</a> </ul>
</li> </a>
<li class="pull-right" style="padding-right: 20px;"> </li>
<h5>任务总数:8001</h5> <li class="pull-right" style="padding-right: 20px;">
<h4>余证数:1</h4> <h5>任务总数:8001</h5>
</li> <h4>余证数:1</h4>
</ul> </li>
</div> </ul>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> </div>
<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"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox"></th> <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th> <th>任务单编号</th>
<th>核验日期</th> <th>核验日期</th>
<th>地区</th> <th>地区</th>
...@@ -50,38 +51,40 @@ ...@@ -50,38 +51,40 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="task in type.countyList"> <tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td> <td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.county}}</a></td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<!-- /.table --> <!-- /.table -->
</div> <div class="box-footer">
<!-- /.mail-box-messages --> <div class="pull-right" style="margin-left: 10px;">
</div> <button class="btn btn-primary" ng-click="goes()">转出任务单</button>
<!-- /.box-body --> </div>
<div class="box-footer"> <div class="pull-right">
<select class="form-control select2" id="print" style="border-radius:5px">
<div class="pull-right" style="margin-left: 10px;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
<div class="pull-right">
<select class="form-control select2" id="print" style="border-radius:5px">
<option value="1">一号打印机</option> <option value="1">一号打印机</option>
<option value="2">二号打印机</option> <option value="2">二号打印机</option>
</select> </select>
</div>
</div> </div>
</div>
</div>
<!-- /.mail-box-messages -->
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
</div> </div>
<!-- /.box-body -->
</div> </div>
<!-- /. box --> <!-- /. box -->
</div> </div>
......
src/main/resources/static/views/task/taskListPushing.html 0 → 100644
View file @ e91c975b
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="row">
<!-- /.col -->
<div class="col-md-12">
<div class="box box-primary">
<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="searchToday()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<div ng-if="cycleSheetData.length>0">
<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 cycleSheetData 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>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
</li>
</ul>
</div>
<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>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>数据核验数量</th>
<th>电写入数量</th>
<th>废证数量</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</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-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="goes()">转出任务单</button>
</div>
</div>
</div>
<div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4>
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
</div>
<!-- /. box -->
</div>
<!-- /.col -->
</div>
<!-- /.row -->
</div>
</div>
src/main/resources/static/views/task/taskListQualityCheck.html deleted 100644 → 0
View file @ 7550fcb8
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<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="searchToday()">当前</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div class="box-body">
<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 cycleSheetData 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>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:8001</h4>
</li>
</ul>
</div>
<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"></th>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>数据核验</th>
<th>废证数量</th>
<th>出库数量</th>
<th>入库数量</th>
<th>操作</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="task in type.countyList">
<td><input type="checkbox" class="icheckbox_flat-blue"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject"><a>{{task.county}}</a></td>
<td class="mailbox-subject">{{task.groupCount}}</td>
<td class="mailbox-subject">{{task.groupNo}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td ng-if="task.failedCount>0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td>
<td class="mailbox-attachment">{{task.outStoreCount}}</td>
<td class="mailbox-subject">{{task.enterStoreCount}}</td>
<td><button class="btn btn-primary">完成</button></td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">组号列表</a></td>
</tr>
</tbody>
</table>
<!-- /.table -->
</div>
<!-- /.mail-box-messages -->
</div>
<!-- /.box-body -->
<div class="box-footer" style="text-align: right;">
<button class="btn btn-primary" ng-click="outStore()">出库</button>
<button class="btn btn-primary" ng-click="enterStore()">入库</button>
</div>
</div>
<!-- /. box -->
</div>
<!-- /.col -->
<!-- /.row -->
</div>
src/main/resources/static/views/task/taskListSorting.html
View file @ e91c975b
...@@ -13,58 +13,60 @@ ...@@ -13,58 +13,60 @@
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="nav-tabs-custom clearfix" style="margin-bottom: 0;"> <div ng-if="cycleSheetData.length>0">
<ul class="nav nav-tabs"> <div class="nav-tabs-custom clearfix" style="margin-bottom: 0;">
<li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]" <ul class="nav nav-tabs">
ng-repeat="tab in cycleSheetData track by $index"> <li ng-class="{true: 'active', false: 'inactive'}[tab.isActive]"
<a ng-click="func($index,tab.typeCode)"> ng-repeat="tab in cycleSheetData track by $index">
<ul style="margin: 0;padding: 0;"> <a ng-click="func($index,tab.typeCode)">
<li style="font-size: 16px;">{{tab.typeName}}</li> <ul style="margin: 0;padding: 0;">
<li style="text-align: center;">{{tab.typeSum}}</li> <li style="font-size: 16px;">{{tab.typeName}}</li>
</ul> <li style="text-align: center;">{{tab.typeSum}}</li>
</a> </ul>
</li> </a>
</ul> </li>
</div> </ul>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index"> </div>
<table class="table table-hover table-striped"> <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
<thead> <table class="table table-hover table-striped">
<tr> <thead>
<th><input type="checkbox"></th> <tr>
<th>任务单编号</th> <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></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>
<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="task in type.countyList"> <tbody>
<td><input type="checkbox" class="icheckbox_flat-blue"></td> <tr ng-repeat="task in type.countyList">
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-subject">{{task.checkDate}}</td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject"><a>{{task.county}}</a></td> <td class="mailbox-subject">{{task.checkDate}}</td>
<td class="mailbox-subject">{{task.groupCount}}</td> <td class="mailbox-subject"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupNo}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.dataCheckCount}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.electricCount}}</td> <td class="mailbox-subject">{{task.dataCheckCount}}</td>
<td ng-if="task.failedCount!=0" class="mailbox-subject" style="color: red;">{{task.failedCount}}</td> <td class="mailbox-attachment">{{task.electricCount}}</td>
<td ng-if="task.failedCount==0" class="mailbox-subject">{{task.failedCount}}</td> <td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
<td class="mailbox-subject">{{task.checkCount}}</td> <td ng-if="task.faileCount==0" class="mailbox-subject">{{task.faileCount}}</td>
<td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td> <td class="mailbox-subject">{{task.checkCount}}</td>
<td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td> <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
</tr> <td class="mailbox-subject"><button class="btn btn-primary">打印封条</button></td>
</tbody> </tr>
</table> </tbody>
<!-- /.table --> </table>
</div> <!-- /.table -->
<!-- /.mail-box-messages --> </div>
<!-- /.mail-box-messages -->
</div>
</div> </div>
<!-- /.box-body --> <!-- /.box-body -->
</div> </div>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ e91c975b
...@@ -41,84 +41,78 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -41,84 +41,78 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
$scope.show = true; $scope.show = true;
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getUrl = function(url){ var getCountJson = function(){
var json={};
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
url = url + 'sqrxm=' + $scope.applicantName + '&'; json.applicantName=$scope.applicantName;
}else{
json.applicantName='';
} }
if (angular.isDefined($scope.orderNo)) { if (angular.isDefined($scope.orderNo)) {
url = url + 'ddh=' + $scope.orderNo + '&';
} json.orderNumber=$scope.orderNo;
if (angular.isDefined($scope.number)) { }else{
url = url + 'sequence=' + $scope.number + '&'; json.orderNumber='';
} }
if ($("#print").val() == 1 || $("#print").val() == -1) { if ($("#print").val() == 1 || $("#print").val() == -1) {
url = url + 'hasPrinted=' + $("#print").val() + '&'; json.state=$("#print").val();
}else {
json.state='';
} }
if (angular.isDefined($scope.gkxx)) { if (angular.isDefined($scope.gkxx)) {
url = url + 'gkxx=' + $scope.gkxx + '&'; json.latticeMouthInformation = $scope.gkxx
}else {
json.latticeMouthInformation = '';
} }
if ($("#county").val() != null) { if ($("#county").val() != null) {
for (var i = 0; i < $("#county").val().length; i++) { json.getToCounty=$("#county").val();
url = url + 'djx=' + ($("#county").val())[i] + '&'; }else{
} json.getToCounty='';
}
if ($("#datepicker").val() == '') {
url = url + 'gmtCreat=' + $scope.choseDate + '&';
} }
if ($("#datepicker").val() != '') { json.uploadDate = $("#datepicker").val();
url = url + 'gmtCreat=' + $("#datepicker").val() + '&'; return json;
}
if ($scope.paginationConf.currentPage == 0) {
url = url + 'index=' + ($scope.paginationConf.currentPage * $scope.paginationConf.itemsPerPage) + '&pageSize=' + $scope.paginationConf.itemsPerPage;
}
if ($scope.paginationConf.currentPage > 0) {
url = url + 'index=' + (($scope.paginationConf.currentPage - 1) * $scope.paginationConf.itemsPerPage) + '&pageSize=' + $scope.paginationConf.itemsPerPage;
}
return url + '&t=' + Math.floor(Date.now());
} }
var getCountAndDownloadUrl = function (url) { var getJson = function () {
var json={};
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
url = url + 'sqrxm=' + $scope.applicantName + '&'; json.applicantName=$scope.applicantName;
}else{
json.applicantName='';
} }
if (angular.isDefined($scope.orderNo)) { if (angular.isDefined($scope.orderNo)) {
url = url + 'ddh=' + $scope.orderNo + '&';
} json.orderNumber=$scope.orderNo;
if (angular.isDefined($scope.number)) { }else{
url = url + 'sequence=' + $scope.number + '&'; json.orderNumber='';
} }
if ($("#print").val() == 1 || $("#print").val() == -1) { if ($("#print").val() == 1 || $("#print").val() == -1) {
url = url + 'hasPrinted=' + $("#print").val() + '&'; json.state=$("#print").val();
}else {
json.state='';
} }
if (angular.isDefined($scope.gkxx)) { if (angular.isDefined($scope.gkxx)) {
url = url + 'gkxx=' + $scope.gkxx + '&'; json.latticeMouthInformation = $scope.gkxx
}else {
json.latticeMouthInformation = '';
} }
if ($("#county").val() != null) { if ($("#county").val() != null) {
for (var i = 0; i < $("#county").val().length; i++) { json.getToCounty=$("#county").val();
url = url + 'djx=' + ($("#county").val())[i] + '&'; }else{
} json.getToCounty='';
} }
if ($("#datepicker").val() == '') { json.uploadDate = $("#datepicker").val();
url = url + 'gmtCreat=' + $scope.choseDate + '&'; json.firstIndex=$scope.paginationConf.currentPage;
} json.pageSize=$scope.paginationConf.itemsPerPage;
if ($("#datepicker").val() != '') { return json;
url = url + 'gmtCreat=' + $("#datepicker").val() + '&';
}
return url + 't=' + Math.floor(Date.now());
} }
$scope.postData = []; $scope.postData = [];
$scope.paginationConf.totalItems = 0 $scope.paginationConf.totalItems = 0
$scope.doQuery = function () { $scope.doQuery = function () {
$scope.show = true; $scope.show = true;
var url = '../api/idCard/recordsByPaging?'; // HttpService.getRecordsCount(getCountJson, function (data) {
var getCountUrl = '../api/idCard/recordCount?'; // $scope.paginationConf.totalItems = data;
console.log($scope.applicantName, $scope.orderNo, $scope.number, $("#print").val(), $scope.gkxx, $("#county").val(), $("#datepicker").val(), ($scope.paginationConf.currentPage * $scope.paginationConf.itemsPerPage), $scope.paginationConf.itemsPerPage) // })
console.log(encodeURI(getUrl(url))); HttpService.searchPostData(getJson(), function (data) {
console.log(encodeURI(getCountAndDownloadUrl(getCountUrl)));
HttpService.getRecordsCount(encodeURI(getCountAndDownloadUrl(getCountUrl)), function (data) {
$scope.paginationConf.totalItems = data;
})
HttpService.searchPostData(encodeURI(getUrl(url)), function (data) {
$scope.postData = data; $scope.postData = data;
console.log(data) console.log(data)
}) })
......
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