Skip to content

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

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

parents edb9a18c 5b6ad07d
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 26 deletions
src/main/resources/static/dialogs/updateNote.html
View file @ 04db94e3
...@@ -19,6 +19,12 @@ ...@@ -19,6 +19,12 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="ui-dialog-confirm"> <div class="ui-dialog-confirm clearfix">
<div class="pull-left" ng-if="consoleMsg" style="color: red;margin-left: 69px;">
{{consoleMsg}}
</div>
<div class="pull-right">
<button type="submit" class="btn btn-info" ng-click="updateNoteData()">更新</button> <button type="submit" class="btn btn-info" ng-click="updateNoteData()">更新</button>
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">关闭</button>
</div>
</div> </div>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 04db94e3
...@@ -246,6 +246,7 @@ angular.module('AvatarCheck', [ ...@@ -246,6 +246,7 @@ angular.module('AvatarCheck', [
HttpService.logout(function(data) { HttpService.logout(function(data) {
$rootScope.loginData = {userid:'用户未登录', login:false}; $rootScope.loginData = {userid:'用户未登录', login:false};
localStorage.clear(); localStorage.clear();
$location.path("/login");
}); });
} }
$scope.enterEvent = function(e,search) { $scope.enterEvent = function(e,search) {
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 04db94e3
...@@ -62,14 +62,14 @@ ...@@ -62,14 +62,14 @@
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></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><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th> <th>受理组号</th>
<th>合格数量</th> <th>合格数量</th>
<th>不合格数量</th> <th>不合格数量</th>
<th>状态</th> <th>状态</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<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"><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 ng-if="task.dealFlag!=3"></td>
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 04db94e3
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th> <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>组数</th> <th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th> <th>受理组号</th>
<th>证件数量</th> <th>证件数量</th>
<th>合格数量</th> <th>合格数量</th>
<th>不合格数量</th> <th>不合格数量</th>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="task in type.countyList| orderBy:countyCode:desc"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></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>
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ 04db94e3
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th> <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>核验日期</th> <th>核验日期</th>
<th>组数</th> <th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th> <th>受理组号</th>
<th>证件数量</th> <th>证件数量</th>
<th>电写入数量</th> <th>电写入数量</th>
<th>电质检数量</th> <th>电质检数量</th>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td><input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" ng-click="updateSelection($event,task)"></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>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 04db94e3
...@@ -38,10 +38,10 @@ ...@@ -38,10 +38,10 @@
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th> <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>核验日期</th> <th>核验日期</th>
<th>组数</th> <th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th> <th>受理组号</th>
<th>核验数量</th> <th>核验数量</th>
<th>卸载数量</th> <th>卸载数量</th>
<th>证件数量</th> <th>证件数量</th>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td><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><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 class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 04db94e3
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" <th><input type="checkbox" ng-click="selectAll(type.countyList,$event)"
ng-checked="isSelectedAll($index)"></th> ng-checked="isSelectedAll($index)"></th>
<th><a ng-click="countyCode='taskId';desc=!desc">任务单编号</a></th> <th>任务单编号</th>
<th>核验日期</th> <th>核验日期</th>
<th>组数</th> <th>组数</th>
<th><a ng-click="countyCode='groupNum';desc=!desc">受理组号</a></th> <th>受理组号</th>
<th>证件数量</th> <th>证件数量</th>
<th>电写入数量</th> <th>电写入数量</th>
<th>电质检数量</th> <th>电质检数量</th>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<!--<th></th>--> <!--<th></th>-->
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="task in type.countyList | orderBy:countyCode:desc"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)"> <td ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)">
<input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" <input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}"
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 04db94e3
...@@ -109,10 +109,11 @@ ...@@ -109,10 +109,11 @@
<th>联系方式</th> <th>联系方式</th>
<th>地址</th> <th>地址</th>
<th>打印时间</th> <th>打印时间</th>
<th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;"> <tr ng-repeat="item in postData | orderBy:item.id">
<td>{{item.id}}</td> <td>{{item.id}}</td>
<td>{{item.orderNumber}}</td> <td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td> <td>{{item.waybillNumber}}</td>
...@@ -120,14 +121,15 @@ ...@@ -120,14 +121,15 @@
<td>{{item.firstWhite}}</td> <td>{{item.firstWhite}}</td>
<td>{{item.applicantName}}</td> <td>{{item.applicantName}}</td>
<td>{{item.recipientPhone}}</td> <td>{{item.recipientPhone}}</td>
<td>{{item.recipientAddress}}</td> <td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td> <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
<td ng-click="addNote(item.id)"><a>备注</a></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="box-footer" ng-if="postData.length>0"> <!--<div class="box-footer" ng-if="postData.length>0">
<button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button> <button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
</div> </div>-->
<div style="padding-left: 27%;" ng-if="postData.length>0"> <div style="padding-left: 27%;" ng-if="postData.length>0">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination> <tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div> </div>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ 04db94e3
...@@ -339,11 +339,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -339,11 +339,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
} }
$scope.addNote = function () { $scope.addNote = function (id) {
var arr = []; var arr = [];
for (var i=0;i<$scope.postData.length;i++){ arr.push(id);
arr.push($scope.postData[i].id)
}
ngDialog.open({ ngDialog.open({
template: 'dialogs/updateNote.html' + urlTimeStamp(), template: 'dialogs/updateNote.html' + urlTimeStamp(),
width: 800, width: 800,
...@@ -353,7 +351,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -353,7 +351,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
console.log(arr) console.log(arr)
HttpService.getNoteToUpdate(arr,function(data) { HttpService.getNoteToUpdate(arr,function(data) {
$scope.idAndNote = data; $scope.idAndNote = data;
console.log( $scope.idAndNote) console.log($scope.idAndNote)
}) })
$scope.updateNoteData = function(){ $scope.updateNoteData = function(){
...@@ -367,8 +365,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -367,8 +365,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
} }
HttpService.updateTheseNote(arr,function(data) { HttpService.updateTheseNote(arr,function(data) {
if(data){ if(data){
$scope.closeThisDialog(); $scope.consoleMsg = "更新成功";
MessageService.showAlert("更新成功")
} }
}) })
} }
......
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