Commit c02b176c authored by liboyang's avatar liboyang

标签打印

parent 63685753
...@@ -212,7 +212,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -212,7 +212,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
selectXmlPackage:function(date,currentPage,itemsPerPage,success){ selectXmlPackage:function(date,currentPage,itemsPerPage,success){
if(date==''){ if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd"); date=$filter("date")(new Date(), "yyyy-MM-dd");
} }
console.log(date,currentPage,itemsPerPage) console.log(date,currentPage,itemsPerPage)
...@@ -235,6 +235,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -235,6 +235,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)||state==''){ if(angular.isUndefined(state)||state==''){
state=-1; state=-1;
} }
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,date) console.log(fileName,state,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -255,6 +258,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -255,6 +258,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)||state==''){ if(angular.isUndefined(state)||state==''){
state=-1; state=-1;
} }
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,currentPage,itemsPerPage,date) console.log(fileName,state,currentPage,itemsPerPage,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -344,6 +350,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -344,6 +350,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){ if(angular.isUndefined(oldPackageName)){
oldPackageName=''; oldPackageName='';
} }
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(oldPackageName,date) console.log(oldPackageName,date)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -360,6 +369,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -360,6 +369,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){ if(angular.isUndefined(oldPackageName)){
oldPackageName=''; oldPackageName='';
} }
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(oldPackageName,date,currentPage,itemsPerPage) console.log(oldPackageName,date,currentPage,itemsPerPage)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -420,6 +432,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -420,6 +432,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(county==''){ if(county==''){
county = -1; county = -1;
} }
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(newPackageName,idCard,date,county) console.log(newPackageName,idCard,date,county)
$http({ $http({
method: 'GET', method: 'GET',
...@@ -444,6 +459,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -444,6 +459,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(county==''){ if(county==''){
county = -1; county = -1;
} }
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage) console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage)
$http({ $http({
method: 'GET', method: 'GET',
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" id="datepicker" readonly/> <input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
......
...@@ -23,7 +23,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa ...@@ -23,7 +23,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
}) })
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
// $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); // $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = { $scope.paginationConf = {
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" id="datepicker" readonly/> <input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
......
...@@ -27,6 +27,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -27,6 +27,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码 //清除的代码
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
...@@ -59,6 +61,9 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -59,6 +61,9 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(packageType==''){ if(packageType==''){
packageType=-1; packageType=-1;
} }
if(date=='{{choseDate}}'){
date=$scope.choseDate
}
if($scope.paginationConf.currentPage==0){ if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1 $scope.paginationConf.currentPage=1
} }
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" id="datepicker1" readonly/> <input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker1" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove d1"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove d1"></span></span>
</div> </div>
</td> </td>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" id="datepicker2" readonly/> <input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker2" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove d2"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove d2"></span></span>
</div> </div>
</td> </td>
......
...@@ -44,7 +44,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -44,7 +44,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$(".d2").click(function(){ $(".d2").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
}) })
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = { $scope.paginationConf = {
currentPage: 1, currentPage: 1,
...@@ -64,6 +64,15 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http']) ...@@ -64,6 +64,15 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if(angular.isUndefined($scope.pcs_name)){ if(angular.isUndefined($scope.pcs_name)){
$scope.pcs_name=''; $scope.pcs_name='';
} }
if(startDate=='{{choseDate}}'){
startDate=$scope.choseDate;
}
if(endDate=='{{choseDate}}'){
endDate=$scope.choseDate;
}
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1
}
if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){ if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){
MessageService.showAlert("请选择起始日期和结束日期") MessageService.showAlert("请选择起始日期和结束日期")
}else{ }else{
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</div> </div>
<input type="text" <input type="text"
class="form-control pull-right" class="form-control pull-right"
id="datepicker3" readonly/> id="datepicker3" value="{{choseDate}}" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" id="datepicker" readonly/> <input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
......
...@@ -23,6 +23,7 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag ...@@ -23,6 +23,7 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码 //清除的代码
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" id="datepicker" readonly/> <input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span> <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
......
...@@ -24,7 +24,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -24,7 +24,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
}) })
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$('.select2').select2(); $('.select2').select2();
//Initialize Select2 Elements //Initialize Select2 Elements
$('.select2').select2({ $('.select2').select2({
...@@ -43,6 +43,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -43,6 +43,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 json={}; var json={};
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
json.applicantName=$scope.applicantName; json.applicantName=$scope.applicantName;
...@@ -70,10 +71,15 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -70,10 +71,15 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
json.getToCounty=[]; json.getToCounty=[];
} }
json.uploadDate = $("#datepicker").val(); if(date=='{{choseDate}}'){
json.uploadDate=$scope.choseDate;
}else {
json.uploadDate = $("#datepicker").val();
}
return json; return json;
} }
var getJson = function () { var getJson = function () {
var date=$('#datepicker').val();
var json={}; var json={};
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
json.applicantName=$scope.applicantName; json.applicantName=$scope.applicantName;
...@@ -101,9 +107,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -101,9 +107,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
json.getToCounty=[]; json.getToCounty=[];
} }
if($("#datepicker").val()==''){ if(date=='{{choseDate}}'){
json.uploadDate = ''; json.uploadDate=$scope.choseDate;
}else{ }else {
json.uploadDate = $("#datepicker").val(); json.uploadDate = $("#datepicker").val();
} }
if($scope.paginationConf.currentPage==0){ if($scope.paginationConf.currentPage==0){
......
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/> <input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div> </div>
</td> </td>
<td style="text-align: left;"> <td style="text-align: left;">
......
...@@ -27,7 +27,10 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -27,7 +27,10 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = { $scope.paginationConf = {
......
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