Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2,7 +2,7 @@
     提示
 </div>
 <div class="ui-dialog-content">
-    <div>确认下载{{count}}条记录吗？</div>
+    <div>下载格口文件导入日期为：{{importDate}} 的<strong>{{count}}</strong>条记录</div>
 </div>
 <div class="ui-dialog-confirm">
     <button type="submit" class="btn btn-info" ng-click="confirmDownload()">确认</button>

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

@@ -42,15 +42,14 @@
                     <td><input type="text" class="form-control"  ng-model="emailNo" placeholder="邮件号"></td>
                </tr>
                <tr>
-                   <td>打印状态:</td>
-                   <td style="text-align: left;">
-                        <select class="form-control select2" id="print"
-                          ng-model="isPrint">
-                                <option value="">--请选择打印状态--</option>
-                                <option value="1">已打印</option>
-                                <option value="0">未打印</option>
-                            </select>
-                   </td>
+                   <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 >格口:</td>
                      <td><input type="text" class="form-control" ng-model="gkxx" placeholder="格口"></td>
                      <td>区县:</td>
@@ -72,14 +71,15 @@
                            <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
                      </div>
                  </td>
-                 <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>打印状态:</td>
+                   <td style="text-align: left;">
+                        <select class="form-control select2" id="print"
+                          ng-model="isPrint">
+                                <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>

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

@@ -205,6 +205,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             })
         }
         $scope.downloadExcel = function(){
+            var date =$('#datepicker').val();
             ngDialog.open({
                 template: 'dialogs/confirmToDownload.html' + urlTimeStamp(),
                 width: 800,
@@ -212,6 +213,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                 closeByDocument:false,
                 controller: ['$scope',function ($scope) {
                     getCount()
+                    $scope.importDate = date;
                     $scope.confirmDownload = function () {
                         var url = '../personPostApi/download?';
                         var a = document.createElement("a");