Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 0c4daab6 authored by liboyang's avatar liboyang
Browse files
Options

创建任务单

parent 2ed268e1
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 29 deletions
src/main/resources/static/dialogs/policeList.html
View file @ 0c4daab6
......@@ -28,7 +28,7 @@
<table class="table" style="border-color: black;">
<thead>
<tr>
<!--<th><input type="checkbox" ng-click="selectAll(policeList,$event)" ng-checked="isSelectedAll()"></th>-->
<th><input type="checkbox" ng-click="selectAll(policeList,$event)" ng-checked="isSelectedAll()"></th>
<th>组号</th>
<th>合格数量</th>
<th>不合格数量</th>
......@@ -40,7 +40,7 @@
</thead>
<tbody>
<tr ng-repeat="groups in policeList">
<!--<td><input type="checkbox" ng-checked="isSelected(groups)" ng-click="updateSelection($event,groups)"></td>-->
<td><input type="checkbox" ng-checked="isSelected(groups)" ng-click="updateSelection($event,groups)"></td>
<td>{{groups.GROUP_NO}}</td>
<td>{{groups.VALID_COUNT}}</td>
<td>{{groups.INVALID_COUNT}}</td>
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 0c4daab6
......@@ -61,7 +61,6 @@
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>保存日期</th>
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>合格数量</th>
......@@ -75,7 +74,6 @@
<td ng-if="task.dealFlag==3"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.valid}}" ng-click="updateSelection($event,task)"></td>
<td ng-if="task.dealFlag!=3"></td>
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
......@@ -119,7 +117,6 @@
<thead>
<tr>
<th>保存日期</th>
<th>地区</th>
<th>组数</th>
<th>受理组号</th>
<th>证件数量</th>
......@@ -132,7 +129,6 @@
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td>
<td class="mailbox-name"><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.countyValidCount-task.specialCount}}</td>
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 0c4daab6
......@@ -198,22 +198,21 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
console.log("for",$rootScope.selectCount)
var go = function () {
if($scope.selected.length>0||$rootScope.selectedGroup.length>0){
var arr = [];
var groupList = [];
for (var i=0;i<$scope.selected.length;i++){
var json = {
countyCode:$scope.selected[i].countyCode,
typeCode:typeCode
var arr = [];
for(var j=0;j<$scope.selected[i].groupList.length;j++){
arr.push($scope.selected[i].groupList[j].GROUP_NO)
}
arr.push(json);
groupList.push(arr)
}
var groupList = [];
for (var i=0;i<$scope.selectedGroup.length;i++){
groupList.push($scope.selectedGroup[i].GROUP_NO)
}
var map = {
date:$('#datepicker').val(),
name:$rootScope.loginData.name,
countyList:arr,
groupList:groupList
}
console.log(map)
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 0c4daab6
......@@ -35,7 +35,6 @@
<tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>证件数量</th>
......@@ -49,7 +48,6 @@
<tr>
<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-name"><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.countyValidCount-task.specialCount}}</td>
......@@ -114,7 +112,6 @@
<thead>
<tr>
<th>任务单编号</th>
<th>地区</th>
<th>组数</th>
<th>受理组号</th>
<th>合格数量</th>
......@@ -126,7 +123,6 @@
<tbody ng-repeat="task in type.countyList">
<tr>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-name"><a>{{task.countyName}}</a></td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-attachment">{{task.countyValidCount}}</td>
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ 0c4daab6
......@@ -48,11 +48,10 @@
</thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
<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 ng-if="task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount"><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></td>
<td ng-if="task.faileCount>0||(task.countyValidCount-task.specialCount)!=task.eWriteCount"></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>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
......@@ -136,7 +135,6 @@
<tr>
<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>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
......
src/main/resources/static/views/task/taskListPreLocating.html
View file @ 0c4daab6
......@@ -36,7 +36,6 @@
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>核验日期</th>
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>证件数量</th>
......@@ -51,7 +50,6 @@
<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>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 0c4daab6
......@@ -44,6 +44,7 @@
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>核验数量</th>
<th>卸载数量</th>
<th>证件数量</th>
<th>特殊证件数量</th>
<th>废证数量</th>
......@@ -52,14 +53,15 @@
</thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc">
<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 ng-if="task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.downloadCount"><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||(task.countyValidCount-task.specialCount)!=task.downloadCount"></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>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount}}</td>
<td class="mailbox-subject">{{task.downloadCount}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
<td class="mailbox-attachment">{{task.specialCount}}</td>
<td ng-if="task.faileCount!=0" class="mailbox-subject" style="color: red;">{{task.faileCount}}</td>
......
src/main/resources/static/views/task/taskListPushing.html
View file @ 0c4daab6
......@@ -36,7 +36,6 @@
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th>
<th>核验日期</th>
<th><a ng-click="countyCode='countyCode';desc=!desc">地区</a></th>
<th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th>
<th>证件数量</th>
......@@ -51,7 +50,6 @@
<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>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
......@@ -117,7 +115,6 @@
<tr>
<th>任务单编号</th>
<th>核验日期</th>
<th>地区</th>
<th>组数</th>
<th>组号</th>
<th>证件数量</th>
......@@ -129,7 +126,6 @@
<tr>
<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>
<td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</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