新增页面

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

@@ -5,44 +5,43 @@
 <div class="ui-dialog-content">
     <table class="table table-responsive" style="border-color: black;">
         <tr>
-            <td style="text-align:left;"><strong>邮件号:</strong>{{item.yjh}}</td>
-            <td style="text-align:left;"><strong>反向邮件号:</strong>{{item.fxyjh}}</td>
-            <td style="text-align:left;"><strong>订单号:</strong>{{item.ddh}}</td>
+            <td style="text-align:left;"><strong>邮件号:</strong>{{item.waybillNumber}}</td>
+            <td style="text-align:left;"><strong>反向邮件号:</strong>{{item.backWaybillNumber}}</td>
+            <td style="text-align:left;"><strong>订单号:</strong>{{item.orderNumber}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>订单生成时间:</strong>{{item.ddscrq}}</td>
-            <td style="text-align:left;"><strong>微信支付订单号:</strong>{{item.wxzfddh}}</td>
-            <td style="text-align:left;"><strong>支付状态:</strong>{{item.zfzt}}</td>
+            <td style="text-align:left;"><strong>订单生成时间:</strong>{{item.createDate}}</td>
+            <td style="text-align:left;"><strong>微信支付订单号:</strong>{{item.wcPlayOrderNumber}}</td>
+            <td style="text-align:left;"><strong>支付状态:</strong>{{item.playState}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>订单状态:</strong>{{item.ddzt}}</td>
+            <td style="text-align:left;"><strong>订单状态:</strong>{{item.orderState}}</td>
             <td style="text-align:left;"><strong>openid:</strong>{{item.openid}}</td>
-            <td style="text-align:left;"><strong>申请人姓名:</strong>{{item.sqrxm}}</td>
+            <td style="text-align:left;"><strong>申请人姓名:</strong>{{item.applicantName}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>*寄件人姓名:</strong>{{item.jjrxm}}</td>
-            <td style="text-align:left;"><strong>*寄件人联系方式:</strong>{{item.jjrlxfs}}</td>
-            <td style="text-align:left;"><strong>*寄件人地址:</strong>{{item.jjrdz}}</td>
+            <td style="text-align:left;"><strong>*寄件人姓名:</strong>{{item.senderName}}</td>
+            <td style="text-align:left;"><strong>*寄件人联系方式:</strong>{{item.senderPhone}}</td>
+            <td style="text-align:left;"><strong>*寄件人地址:</strong>{{item.senderAddress}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>*收件人姓名:</strong>{{item.sjrxm}}</td>
-            <td style="text-align:left;"><strong>*收件人联系方式:</strong>{{item.sjrlxfs}}</td>
-            <td style="text-align:left;"><strong>*收件人地址:</strong>{{item.sjrdz}}</td>
+            <td style="text-align:left;"><strong>*收件人姓名:</strong>{{item.recipientName}}</td>
+            <td style="text-align:left;"><strong>*收件人联系方式:</strong>{{item.recipientPhone}}</td>
+            <td style="text-align:left;"><strong>*收件人地址:</strong>{{item.recipientAddress}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>*配货单号:</strong>{{item.pxdh}}</td>
-            <td style="text-align:left;"><strong>到件省/直辖市:</strong>{{item.djs}}</td>
-            <td style="text-align:left;"><strong>到件城市:</strong>{{item.djcs}}</td>
+            <td style="text-align:left;"><strong>*配货单号:</strong>{{item.orderBlankNumber}}</td>
+            <td style="text-align:left;"><strong>到件省/直辖市:</strong>{{item.getToProvince}}</td>
+            <td style="text-align:left;"><strong>到件城市:</strong>{{item.getToCity}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>到件县/区:</strong>{{item.djx}}</td>
-            <td style="text-align:left;"><strong>业务类型:</strong>{{item.ywlx}}</td>
-            <td style="text-align:left;"><strong>格口信息:</strong>{{item.gkxx}}</td>
+            <td style="text-align:left;"><strong>到件县/区:</strong>{{item.getToCounty}}</td>
+            <td style="text-align:left;"><strong>业务类型:</strong>{{item.businessType}}</td>
+            <td style="text-align:left;"><strong>格口信息:</strong>{{item.latticeMouthInformation}}</td>
         </tr>
         <tr>
-            <td style="text-align:left;"><strong>内件性质:</strong>{{item.njxz}}</td>
-            <td style="text-align:left;"><strong>内件信息:</strong>{{item.njxx}}</td>
-            <td style="text-align:left;"><strong>保价金额:</strong>{{item.bjje}}</td>
+            <td style="text-align:left;"><strong>内件性质:</strong>{{item.natureOfTheInternal}}</td>
+            <td style="text-align:left;"><strong>内件信息:</strong>{{item.natureOfTheInformation}}</td>
         </tr>
     </table>
 </div>
\ No newline at end of file

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

@@ -59,8 +59,8 @@ angular.module('AvatarCheck.login', ['ngRoute', 'AvatarCheck.http'])
                     $rootScope.tab = '/receitp';
                     break;
                 case 8:
-                    $location.path("/searchCardMsg");
-                    $rootScope.tab = '/searchCardMsg';
+                    $location.path("/uploadExcelAndSearch");
+                    $rootScope.tab = '/uploadExcelAndSearch';
                     break;
                 case 9:
                     $location.path("/createTaskList");

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

@@ -804,9 +804,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
         $scope.isSelected = function (task) {
             return $scope.selected.indexOf(task) >= 0;
         };
-        $scope.isSelectedAll = function (index) {
-            return $scope.selected.length === $scope.cycleSheetData[index].countyList.length > 0;
-        };
 
         $scope.taskId=1;
         $scope.getPoliceList = function(policeList,taskId){
@@ -830,6 +827,25 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
             }
             $scope.currentTab = index;
         }
+        $scope.getSpecialCardsInfo = function(groupNo,specialCardCount){
+            if(parseInt(specialCardCount)>0){
+                ngDialog.open({
+                    template: 'dialogs/specailCardInfo.html' + urlTimeStamp(),
+                    width: 600,
+                    cache: false,
+                    closeByDocument:false,
+                    controller: ['$scope', function ($scope) {
+                        HttpService.getSpecialCardData(groupNo,function(data) {
+                            $scope.specailCardData = data;
+                            console.log(data)
+                        })
+                    }]
+                });
+            }else{
+                MessageService.showAlert("该组中没有特殊证件")
+            }
+
+        }
 
         $scope.goes = function(){
             var checks = $(".checkOneBox:checked");

src/main/resources/static/views/task/taskListSorting.html

@@ -54,7 +54,7 @@
                     <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"></td>
                     <td class="mailbox-subject">{{task.countyValidCount}}</td>
                     <td class="mailbox-subject">{{task.task.countyValidCount-task.specialCount}}</td>
                     <td class="mailbox-subject">{{task.eWriteCount}}</td>
@@ -70,18 +70,20 @@
                           <td colspan="10">
                               <table class="table">
                                   <thead>
-                                     <th>组号</th>
+                                     <th>派出所名称</th>
                                      <th>核验数量</th>
                                      <th>证件数量</th>
+                                     <th>电写入数量</th>
                                      <th>特殊证件数量</th>
                                      <th>废证数量</th>
                                      <th></th>
                                   </thead>
                                   <tbody>
                                        <tr ng-repeat="item in policeList">
-                                            <td>{{item.GROUP_NO}}</td>
+                                            <td>{{item.GAJG_MC}}</td>
                                             <td>{{item.VALID_COUNT}}</td>
                                             <td>{{item.VALID_COUNT-item.SPECIAL_CARD_COUNT}}</td>
+                                            <td>{{item.E_WRITER_COUNT}}</td>
                                             <td>{{item.SPECIAL_CARD_COUNT}}</td>
                                             <td>{{item.FAILECOUNT}}</td>
                                             <td><a ng-click="getSpecialCardsInfo(item.GROUP_NO,item.SPECIAL_CARD_COUNT)">特殊证件详情</a></td>

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

@@ -105,14 +105,14 @@
                         <tbody>
                         <tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;">
                             <td>{{item.id}}</td>
-                            <td>{{item.ddh}}</td>
-                            <td>{{item.yjh}}</td>
-                            <td>{{item.fxyjh}}</td>
-                            <td>{{item.sbsll}}</td>
-                            <td>{{item.sqrxm}}</td>
-                            <td>{{item.sjrlxfs}}</td>
-                            <td>{{item.sjrdz}}</td>
-                            <td>{{item.printTime | date:"yyyy-MM-dd hh:mm:ss"}}</td>
+                            <td>{{item.orderNumber}}</td>
+                            <td>{{item.waybillNumber}}</td>
+                            <td>{{item.backWaybillNumber}}</td>
+                            <td>{{item.firstWhite}}</td>
+                            <td>{{item.recipientName}}</td>
+                            <td>{{item.recipientPhone}}</td>
+                            <td>{{item.recipientAddress}}</td>
+                            <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
                         </tr>
                         </tbody>
                     </table>

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

@@ -98,7 +98,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             if ($("#county").val() != null) {
                 json.getToCounty=$("#county").val();
             }else{
-                json.getToCounty='';
+                json.getToCounty=[];
             }
             json.uploadDate = $("#datepicker").val();
             json.firstIndex=$scope.paginationConf.currentPage;