下载交接单

src/main/resources/static/dialogs/updateNote.html

+<div class="ui-dialog-title">
+    更新备注
+</div>
+<div class="ui-dialog-content">
+    <table class="table" style="border-color: black;">
+        <thead>
+            <tr>
+                <th>上传受理号</th>
+                <th>申请人姓名</th>
+                <th>备注</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr ng-repeat="item in idAndNote">
+                <td>{{item.FIRST_WHITE}}</td>
+                <td>{{item.APPLICANT_NAME}}</td>
+                <td><input type="text" ng-model="item.NOTE"></td>
+            </tr>
+        </tbody>
+    </table>
+</div>
+<div class="ui-dialog-confirm">
+    <button type="submit" class="btn btn-info" ng-click="">复核一致</button>
+    <button type="submit" class="btn btn-primary" ng-click="">打印条形码</button>
+</div>
\ No newline at end of file

src/main/resources/static/index.html

@@ -119,6 +119,9 @@
                           <span class="hidden-xs" ng-bind="loginData.name"></span>
                         </a>
                       </li>
+                    <li class="dropdown user user-menu">
+                          <a  ng-click="logout()" class="btn btn-flat" style="background-color: #0c6ba2;border: 0">退出当前用户</a>
+                    </li>
                 </ul>
             </div>
 
@@ -140,12 +143,6 @@
                         <span ng-bind="menu.name"></span>
                     </a>
                 </li>
-                <li>
-                    <a ng-click="logout()">
-                        <i class="glyphicon glyphicon-user"></i>
-                        <span>退出当前用户</span>
-                    </a>
-                </li>
             </ul>
         </section>
         <!-- /.sidebar -->

src/main/resources/static/js/service.js

@@ -883,6 +883,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 }).then(function successCallback(response) {
                     success(response.data)
                 })
+            },
+            getNoteToUpdate:function(data,success) {
+                var body = JSON.stringify(data);
+                $http({
+                    method: 'POST',
+                    url: "../personPostApi/selectNote",
+                    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/uploadExcelAndSearch/uploadExcelAndSearch.html

@@ -72,7 +72,15 @@
                            <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
                      </div>
                  </td>
-                   <td colspan="4">
+                 <td>数据状态:</td>
+                  <td style="text-align: left;">
+                      <select class="form-control select2" id="notNull" ng-model="isValid">
+                          <option value="">--请选择数据状态--</option>
+                          <option value="1">有效记录</option>
+                          <option value="0">无效记录</option>
+                      </select>
+                  </td>
+                   <td colspan="2">
                        <div style="float: left">
                           <button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button>
                           <button class="btn btn-primary" style="margin-right: 7px;" ng-click="subSomething()">读卡查询</button>
@@ -88,8 +96,8 @@
         <div class="box-header with-border"><strong>邮寄单详情</strong>
                 (<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共
                     {{paginationConf.totalItems}}条</span>)</div>
-            <div class="box-info" style="padding: 7px;">
-                <table class="table table-bordered table-hover" ng-if="postData.length>0">
+                <div class="box-info" style="padding: 7px;">
+                    <table class="table table-bordered table-hover" ng-if="postData.length>0">
                         <thead>
                         <tr>
                             <th>NO.</th>
@@ -117,10 +125,13 @@
                         </tr>
                         </tbody>
                     </table>
-                <div style="padding-left: 27%;" ng-if="postData.length>0">
-                    <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
-                </div>
-                <h4 ng-if="postData.length==0">暂无记录。</h4>
+                    <div class="box-footer">
+                        <button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
+                    </div>
+                    <div style="padding-left: 27%;" ng-if="postData.length>0">
+                        <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
+                    </div>
+                    <h4 ng-if="postData.length==0">暂无记录。</h4>
             </div>
         </div>
 </div>

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js

@@ -85,6 +85,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
         }
         var getJson = function () {
             var date=$('#datepicker').val();
+            var notNull = $("#notNull").val();
             var json={};
             if (angular.isDefined($scope.applicantName)) {
                 json.applicantName=$scope.applicantName;
@@ -122,6 +123,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else {
                 json.uploadDate = $("#datepicker").val();
             }
+            if(notNull==''){
+                json.notNull = -1;
+            }else{
+                json.notNull=notNull
+            }
             if($scope.paginationConf.currentPage==0){
                 $scope.paginationConf.currentPage=1
             }
@@ -301,6 +307,28 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             });
 
         }
+        
+        $scope.addNote = function () {
+            var arr = [];
+            for (var i=0;i<$scope.postData.length;i++){
+                arr.push($scope.postData[i].id)
+            }
+            ngDialog.open({
+                template: 'dialogs/updateNote.html' + urlTimeStamp(),
+                width: 800,
+                cache: false,
+                closeByDocument: false,
+                controller: ['$scope', 'HttpService', 'MessageService', function ($scope, HttpService, MessageService) {
+                    console.log(arr)
+                    HttpService.getNoteToUpdate(arr,function(data) {
+                        $scope.idAndNote = data;
+                    })
+
+
+                }]
+            });
+
+        }
 
 
     });
\ No newline at end of file