Skip to content

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

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

parents e6110f02 96be5c0e
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 114 deletions
src/main/resources/static/dialogs/confirmFailedCards.html
View file @ e11f3ea9
......@@ -16,12 +16,13 @@
<td>{{item.NAME}}</td>
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</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-info" ng-disabled="can" ng-click="confirmAdd()">确定添加</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/dialogs/confirmRestCards.html
View file @ e11f3ea9
......@@ -16,12 +16,13 @@
<td>{{item.NAME}}</td>
<td ng-if="item.SEX_NO==1">男</td>
<td ng-if="item.SEX_NO==2">女</td>
<td ng-if="item.SEX_NO==-1">错误</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-info" ng-disabled="can" ng-click="confirmAdd()">确定添加</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/dialogs/confirmTagCards.html
View file @ e11f3ea9
......@@ -12,16 +12,17 @@
<tbody>
<tr ng-repeat="item in personInfo">
<td>{{$index + 1}}</td>
<td>{{item.cardId}}</td>
<td>{{item.name}}</td>
<td ng-if="item.sex==1">男</td>
<td ng-if="item.sex==2">女</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>
<td ng-if="item.SEX_NO==-1">错误</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-info" ng-disabled="can" ng-click="confirmAdd()">确定添加</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">取消</button>
</div>
src/main/resources/static/views/addFailed/addFailed.js
View file @ e11f3ea9
......@@ -12,14 +12,19 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
.controller('addFailedCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.createInputs = function(){
var count = $scope.failedCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
if($scope.failedCount>0){
var count = $scope.failedCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
}
}else{
MessageService.showAlert("请输入正确的数字")
}
}
......@@ -36,41 +41,58 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
}
}
var result = [];
console.log(array)
for (var i = 0, j = array.length; i < j; i += 3) {
result.push(array.slice(i, i + 3));
}
var list=[];
var count=0;
for (var i=0;i<result.length;i++){
var json = {};
json.cardId=result[i][0];
json.note=result[i][1];
json.failedCardReasonId=result[i][2];
json.initiator = $rootScope.loginData.roleList[0].process
list.push(json)
if(result[i][0]==''){
count=count+1;
}else{
var json = {};
json.cardId=result[i][0];
json.note=result[i][1];
json.failedCardReasonId=result[i][2];
json.initiator = $rootScope.loginData.roleList[0].process
list.push(json)
}
}
console.log(list)
ngDialog.open({
template: 'dialogs/confirmFailedCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[];
for(var i=0;i<list.length;i++){
idCardArr.push(list[i].cardId);
}
HttpService.getPersonInfo(idCardArr,function(data){
$scope.personInfo = data;
console.log($scope.personInfo)
})
$scope.confirmAdd = function(){
HttpService.addFailedCard(list,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
console.log(data)
if(count>0){
MessageService.showAlert("身份证或者受理号不能为空")
}else{
console.log(list)
ngDialog.open({
template: 'dialogs/confirmFailedCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[];
for(var i=0;i<list.length;i++){
idCardArr.push(list[i].cardId);
}
HttpService.getPersonInfo(idCardArr,function(data){
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
$scope.can = true;
}
}
console.log($scope.personInfo)
})
}
}]
});
$scope.confirmAdd = function(){
HttpService.addFailedCard(list,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
console.log(data)
})
}
}]
});
}
}
});
\ No newline at end of file
src/main/resources/static/views/addRest/addRest.html
View file @ e11f3ea9
......@@ -18,7 +18,7 @@
<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;">
<form style="padding: 15px; " 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="请输入身份证号或受理号">
......@@ -28,7 +28,7 @@
<button class="btn btn-primary" ng-click="addRest()">添加</button>
<button class="btn btn-danger" ng-click="cancelAddRest()">取消</button>
</div>
</div>
</form>
</div>
</div>
</div>
......
src/main/resources/static/views/addRest/addRest.js
View file @ e11f3ea9
......@@ -12,13 +12,17 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
.controller('addRestCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.createInputs = function(){
var count = $scope.restCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
if($scope.restCount>0){
var count = $scope.restCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
}
}else{
MessageService.showAlert("请输入正确的数字")
}
}
......@@ -29,32 +33,48 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
$scope.addRest = function(){
var array = [];
var count = 0;
for(var i=0;i<$scope.arr.length;i++){
array.push($(".rest")[i].value)
if($(".rest")[i].value==''){
count=count+1;
}else{
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)
if(count>0){
MessageService.showAlert("内容不能为空")
}else{
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;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
$scope.can = true;
}
}
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/addTag/addTag.js
View file @ e11f3ea9
......@@ -12,13 +12,17 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
.controller('addTagCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.createInputs = function(){
var count = $scope.tagCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
if($scope.tagCount>0){
var count = $scope.tagCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<count;i++){
$scope.arr.push(i);
}
}else{
MessageService.showAlert("请输入正确的数字")
}
}
......@@ -40,39 +44,54 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
result.push(array.slice(i, i + 2));
}
var list=[];
var count=0;
for (var i=0;i<result.length;i++){
var json = {};
json.acceptNo=result[i][0];
json.note=result[i][1];
// json.initiator = $rootScope.loginData.roleList[0].process
list.push(json)
if(result[i][0]==''){
count=count+1;
}else{
var json = {};
json.acceptNo=result[i][0];
json.note=result[i][1];
// json.initiator = $rootScope.loginData.roleList[0].process
list.push(json)
}
}
console.log(list)
var cancel = $scope.cancelAdd;
ngDialog.open({
template: 'dialogs/confirmTagCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[];
for(var i=0;i<list.length;i++){
idCardArr.push(list[i].acceptNo);
}
HttpService.getPersonInfoData(idCardArr,function(data){
$scope.personInfo = data;
console.log($scope.personInfo)
})
$scope.confirmAdd = function(){
HttpService.addTagCard(list,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
cancel();
if(count>0) {
MessageService.showAlert("身份证或者受理号不能为空")
}else{
var cancel = $scope.cancelAdd;
ngDialog.open({
template: 'dialogs/confirmTagCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[];
for(var i=0;i<list.length;i++){
idCardArr.push(list[i].acceptNo);
}
HttpService.getPersonInfo(idCardArr,function(data){
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
$scope.can = true;
}
}
console.log($scope.personInfo)
})
}
}]
});
$scope.confirmAdd = function(){
HttpService.addTagCard(list,function(data){
$scope.closeThisDialog();
MessageService.showAlert("添加成功");
cancel();
})
}
}]
});
}
}
});
\ No newline at end of file
src/main/resources/static/views/task/taskListEwriting.html
View file @ e11f3ea9
......@@ -27,9 +27,6 @@
</ul>
</a>
</li>
<li style="float: right; padding-right: 30px;">
<h4>任务总数:{{total}}</h4>
</li>
</ul>
</div>
<div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
......@@ -53,6 +50,7 @@
<tbody ng-repeat="task in type.countyList">
<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"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ e11f3ea9
......@@ -52,6 +52,7 @@
<tbody ng-repeat="task in type.countyList">
<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"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ e11f3ea9
......@@ -53,6 +53,7 @@
<tbody ng-repeat="task in type.countyList">
<tr>
<td ng-if="task.faileCount==0"><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}" 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>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
src/main/resources/static/views/task/taskListPushing.html
View file @ e11f3ea9
......@@ -52,6 +52,7 @@
<tbody ng-repeat="task in type.countyList">
<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"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ e11f3ea9
......@@ -50,6 +50,7 @@
<tbody ng-repeat="task in type.countyList">
<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"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject"><a>{{task.countyName}}</a></td>
......
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