EMS添加备注

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

@@ -19,6 +19,12 @@
         </tbody>
     </table>
 </div>
-<div class="ui-dialog-confirm">
-    <button type="submit" class="btn btn-info" ng-click="updateNoteData()">更新</button>
+<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-danger" ng-click="closeThisDialog()">关闭</button>
+    </div>
 </div>
\ No newline at end of file

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

@@ -109,10 +109,11 @@
                             <th>联系方式</th>
                             <th>地址</th>
                             <th>打印时间</th>
+                            <th>操作</th>
                         </tr>
                         </thead>
                         <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.orderNumber}}</td>
                             <td>{{item.waybillNumber}}</td>
@@ -120,14 +121,15 @@
                             <td>{{item.firstWhite}}</td>
                             <td>{{item.applicantName}}</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 ng-click="addNote(item.id)"><a>备注</a></td>
                         </tr>
                         </tbody>
                     </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>
-                    </div>
+                    </div>-->
                     <div style="padding-left: 27%;" ng-if="postData.length>0">
                         <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                     </div>

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

@@ -339,11 +339,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
 
         }
         
-        $scope.addNote = function () {
+        $scope.addNote = function (id) {
             var arr = [];
-            for (var i=0;i<$scope.postData.length;i++){
-                arr.push($scope.postData[i].id)
-            }
+            arr.push(id);
             ngDialog.open({
                 template: 'dialogs/updateNote.html' + urlTimeStamp(),
                 width: 800,
@@ -353,7 +351,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                     console.log(arr)
                     HttpService.getNoteToUpdate(arr,function(data) {
                         $scope.idAndNote = data;
-                        console.log( $scope.idAndNote)
+                        console.log($scope.idAndNote)
                     })
                     
                     $scope.updateNoteData = function(){
@@ -367,8 +365,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                         }
                         HttpService.updateTheseNote(arr,function(data) {
                             if(data){
-                                $scope.closeThisDialog();
-                                MessageService.showAlert("更新成功")
+                                $scope.consoleMsg = "更新成功";
                             }
                         })
                     }