完善页面

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

@@ -47,7 +47,7 @@
               </thead>
               <tbody>
               <tr ng-repeat="task in type.countyList">
-                <td><input type="checkbox" class="icheckbox_flat-blue"></td>
+                <td><input type="checkbox" class="icheckbox_flat-blue" value="{{task.taskId}}"></td>
                 <td class="mailbox-star"><b>{{task.taskId}}</b></td>
                 <td class="mailbox-name"><a>{{task.county}}</a></td>
                 <td class="mailbox-subject">{{task.groupNo}}</td>
@@ -63,7 +63,7 @@
         </div>
         <!-- /.box-body -->
         <div class="box-footer" style="text-align: right;">
-            <button class="btn btn-primary">下发任务单</button>
+            <button class="btn btn-primary" ng-click="goes()">下发任务单</button>
         </div>
       </div>
       <!-- /. box -->

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

@@ -37,14 +37,14 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
                         invalid: 0
                     },
                     {
-                        taskId: '20190228001',
+                        taskId: '20190228002',
                         county: '东城区',
                         groupNo: '00234653-03687587',
                         valid: 240,
                         invalid: 0
                     },
                     {
-                        taskId: '20190228001',
+                        taskId: '20190228003',
                         county: '海淀区',
                         groupNo: '00234653-03687587',
                         valid: 240,
@@ -59,14 +59,14 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
                 isActive: 'false',
                 countyList: [
                     {
-                        taskId: '20190228001',
+                        taskId: '20190228004',
                         county: '朝阳区',
                         groupNo: '00234653-03687587',
                         valid: 240,
                         invalid: 0
                     },
                     {
-                        taskId: '20190228001',
+                        taskId: '20190228005',
                         county: '昌平区',
                         groupNo: '00234653-03687587',
                         valid: 240,
@@ -112,5 +112,13 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
             });
         }
 
+        $scope.goes = function(){
+            console.log(">>>>>")
+            var checks = $(".icheckbox_flat-blue:checked");
+            for (var i=0;i<checks.length;i++){
+                console.log(checks[i].value)
+            }
+        }
+
     });
 

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

@@ -7,6 +7,10 @@
     <p class="login-box-msg">用户登录</p>
 
     <form>
+        <div class="text-danger wrapper text-center" ng-show="authError" style="margin-bottom: 5px;">
+            {{authError}}
+        </div>
+
       <div class="form-group has-feedback">
         <input type="text" class="form-control" ng-model="user.username" placeholder="用户名" required>
         <span class="glyphicon glyphicon-user form-control-feedback"></span>

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

@@ -123,7 +123,6 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
     .controller('taskListPrintCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
 
 
-
         //Date picker
         $('#datepicker').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
@@ -134,11 +133,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
         });
 
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
-        $scope.searchRecordsNotMatched = function () {
-            HttpService.getRecordsNotMatched($("#datepicker").val(), function (data) {
-                $scope.records = data;
-            })
-        }
+
 
         $scope.cycleSheetData = [
             {

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

@@ -12,6 +12,7 @@
           <strong>任务单详情</strong>
           <div class="box-tools pull-right">
             <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker" readonly/>
+            <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchToday()">当前</button>
             <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
           </div>
           <!-- /.box-tools -->
@@ -29,6 +30,10 @@
                       </ul>
                   </a>
               </li>
+               <li style="float: right; padding-right: 30px;">
+                    <h5>任务总数:8001</h5>
+                    <h4>余证数:1</h4>
+                </li>
             </ul>
           </div>
           <div ng-repeat="type in cycleSheetData track by $index" class="table-responsive mailbox-messages" ng-show="currentTab==$index">
@@ -52,7 +57,7 @@
                 <td class="mailbox-subject">{{task.groupNo}}</td>
                 <td class="mailbox-attachment">{{task.valid}}</td>
                 <td class="mailbox-date">{{task.invalid}}</td>
-                <td class="mailbox-date"><a ng-click="getPoliceList(task.taskId)">派出所列表</a></td>
+                <td class="mailbox-date"><a href="#">组号列表</a></td>
               </tr>
               </tbody>
             </table>
@@ -61,8 +66,18 @@
           <!-- /.mail-box-messages -->
         </div>
         <!-- /.box-body -->
-        <div class="box-footer" style="text-align: right;">
-            <button class="btn btn-primary">下发任务单</button>
+        <div class="box-footer">
+
+            <div class="pull-right" style="margin-left: 10px;">
+                <button class="btn btn-primary" ng-click="goes()">下发任务单</button>
+            </div>
+            <div class="pull-right">
+                <select class="form-control select2" id="print" style="border-radius:5px">
+                        <option value="1">一号打印机</option>
+                        <option value="2">二号打印机</option>
+                </select>
+            </div>
+
         </div>
       </div>
       <!-- /. box -->

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

@@ -80,6 +80,7 @@
                     <thead>
                     <tr>
                         <th>NO.</th>
+                        <th>上传时间</th>
                         <th>制证包数量</th>
                         <th>证件数量</th>
                         <th>普通证数量</th>
@@ -90,6 +91,7 @@
                     <tbody>
                     <tr>
                         <td>1</td>
+                        <td>20190301</td>
                         <td>300</td>
                         <td>24000</td>
                         <td></td>
@@ -101,6 +103,7 @@
                     </tr>
                     <tr>
                         <td>2</td>
+                        <td>20190228</td>
                         <td>100</td>
                         <td>8000</td>
                         <td>8000</td>