Commit c6ffdae6 authored by liboyang's avatar liboyang

下载弹框确认

parent ab589263
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="box-footer"> <div class="box-footer" ng-if="postData.length>0">
<button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button> <button class="pull-right btn btn-primary" ng-click="addNote()">添加备注</button>
</div> </div>
<div style="padding-left: 27%;" ng-if="postData.length>0"> <div style="padding-left: 27%;" ng-if="postData.length>0">
......
...@@ -44,6 +44,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -44,6 +44,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getCountJson = function(){ var getCountJson = function(){
var date=$('#datepicker').val(); var date=$('#datepicker').val();
var notNull = $("#notNull").val();
var json={}; var json={};
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
json.applicantName=$scope.applicantName; json.applicantName=$scope.applicantName;
...@@ -76,6 +77,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -76,6 +77,11 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
json.getToCounty=[]; json.getToCounty=[];
} }
if(notNull==''){
json.notNull = -1;
}else{
json.notNull=notNull
}
if(date=='{{choseDate}}'){ if(date=='{{choseDate}}'){
json.uploadDate=$scope.choseDate; json.uploadDate=$scope.choseDate;
}else { }else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment