新增页面

src/main/resources/static/index.html

@@ -96,7 +96,7 @@
                 <li class="sidebar no-padding navbar-left" style="width: 230px;margin-left:27px;height: auto;">
                     <form style="margin-top: 6px;" name="form">
                         <div class="input-group input-group-sm">
-                            <input type="text" class="form-control input-sm bg-light no-border padder" ng-keyup="enterEvent($event,searchInput)" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单id...">
+                            <input type="text" class="form-control input-sm bg-light no-border padder" ng-keyup="enterEvent($event,searchInput)" style="height: 35px;background-color: #fff;" ng-model="searchInput" placeholder="身份证号/受理号/任务单编号...">
                             <span class="input-group-btn">
                                 <button type="button" style="height: 35px;background-color: #fff;border-left:0;outline:none;" ng-click="doSearch(searchInput)" class="btn btn-sm bg-light">
                                     <i class="fa fa-search"></i>
@@ -240,9 +240,9 @@
     <div class="content-wrapper" ng-view style="min-height: 589px;"></div>
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>联系电话:</b>(010)88516568
+            <b>版本:</b>1.0
         </div>
-        <strong>北京盈信信息科技所有</strong>
+        <strong>北京制证辅助平台</strong>
     </footer>
 </div>
 <div ng-if="loginData.login == false" class="wrapper" style="background-color: #EEEEEE;">

src/main/resources/static/js/app.js

@@ -156,14 +156,22 @@ angular.module('AvatarCheck', [
         }
 
         $scope.doSearch = function (searchInput) {
-            if(angular.isUndefined(searchInput)){
+            $rootScope.searchResult={};
+            $scope.msg="";
+            $scope.alertMsg="";
+            var pattern = /^[0-9]*$/
+            if(angular.isUndefined(searchInput)||!pattern.test(searchInput)){
                 $location.path("/searchCard");
-                $scope.alertMsg = "请输入要查询的受理号/身份证号/任务单id";
+                $scope.msg = "请输入正确的受理号/身份证号/任务单编号";
             }else{
-                console.log(searchInput,"//")
                 HttpService.searchCards(searchInput, function (data) {
-                    $rootScope.searchResult = data;
-                    console.log($rootScope.searchResult)
+                    if(data==''){
+                        $scope.alertMsg = "暂无数据";
+                    }else{
+                        $rootScope.searchResult = data;
+                        console.log($rootScope.searchResult)
+                    }
+
                 })
                 $location.path("/searchCard");
             }
@@ -177,12 +185,15 @@ angular.module('AvatarCheck', [
             });
         }
         $scope.enterEvent = function(e,search) {
-            console.log(search)
             var keycode = window.event?e.keyCode:e.which;
             if(keycode==13){
                 $scope.doSearch(search)
             }
         }
 
+        $scope.goBack = function () {
+            $location.path("/createTaskList");
+        }
+
     });
 

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

@@ -128,18 +128,19 @@
                     <tbody>
                     <tr ng-repeat="item in postPackageData">
                         <td>{{$index+1}}</td>
-                        <td>{{item.beginDate}}</td>
-                        <td>{{item.deadline}}</td>
+                        <td>{{item.formStartTime}}</td>
+                        <td>{{item.formDeadline}}</td>
                         <td>{{item.fileName}}</td>
                         <td>{{item.uploadDate}}</td>
-                        <td>{{item.state}}</td>
+                        <td ng-if="item.state==0">未解析</td>
+                        <td ng-if="item.state==1">已解析</td>
                         <td>
                             <button class="btn btn-danger">删除</button>
                         </td>
                     </tr>
                     </tbody>
                 </table>
-                <div style="padding-left: 27%;" ng-if="postPackageData">
+                <div style="padding-left: 27%;" >
                     <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
                 </div>
                 <h3 ng-if="postMsgDetail.length==0">暂无记录。</h3>

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

@@ -65,18 +65,18 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
         $scope.paginationConf = {
             currentPage: 1,
             itemsPerPage: 10,
-            perPageOptions: [10, 20, 30, 40, 50]
+            perPageOptions: [5 ,10 ,15 ,20 ,25]
         };
 
 
         $scope.getPostPackage = function(){
             console.log($scope.fileName,$scope.state,$("#datepicker3").val())
             HttpService.selectPostPackageCount($scope.fileName,$scope.state,$("#datepicker3").val(),function (data) {
-                $scope.paginationConf.totalItems = data;
-                console.log(data)
+                $scope.paginationConf.totalItems = data.respData.string;
+                console.log($scope.paginationConf.totalItems)
             })
             HttpService.selectPostPackage($scope.fileName,$scope.state,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,$("#datepicker3").val(),function(data){
-                $scope.postPackageData = data;
+                $scope.postPackageData = data.respData;
                 console.log($scope.postPackageData)
             })
         }

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

@@ -6,8 +6,12 @@
         </strong>
         <div class="box-info" style="padding:0px 10px 7px 10px;">
             <h4 ng-if="alertMsg">{{alertMsg}}</h4>
+            <h4 ng-if="msg">{{msg}}</h4>
+            <h4 ng-if="!searchResult">
+                请输入要查询的受理号/身份证号/任务单编号
+            </h4>
             <!--任务单-->
-            <div class="panel panel-info" ng-if="searchResult.workOrderDate.length>0">
+            <div class="panel panel-info" ng-if="searchResult.workOrderData.length>0">
                     <div class="panel-heading">
                         <h3 class="panel-title">
                             任务单
@@ -28,17 +32,17 @@
                             <th>仓库</th>
                             </thead>
                             <tbody>
-                            <tr>
-                                <td>20190228001</td>
-                                <td>海淀区</td>
-                                <td>普通证</td>
-                                <td>20190221</td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
+                            <tr ng-repeat="item in searchResult.workOrderData">
+                                <td>{{item.TASK_ID}}</td>
+                                <td>{{item.COUNTYNAME}}</td>
+                                <td>{{item.CARD_TYPE}}</td>
+                                <td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{item.SORT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{item.QUALITY_TEST_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{item.OUT_STORAGE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             </tr>
                             </tbody>
                         </table>

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

@@ -4,15 +4,7 @@ angular.module('AvatarCheck.searchCard', ['ngRoute', 'AvatarCheck.http'])
     .config(['$routeProvider', function ($routeProvider) {
         $routeProvider.when('/searchCard', {
             templateUrl: 'views/searchCard/searchCard.html' + urlTimeStamp(),
-            controller: 'searchCardCtrl',
+            controller: 'appCtrl',
             cache: false
         });
-    }])
-
+    }]);
\ No newline at end of file
-    .controller('searchCardCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter, $location) {
-
-        $scope.goBack = function () {
-            $location.path("/dataCheckTask");
-        }
-
-    });
\ No newline at end of file