Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit c02b176c authored by liboyang's avatar liboyang
Browse files
Options

标签打印

parent 63685753
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 17 deletions
src/main/resources/static/js/service.js
View file @ c02b176c
......@@ -212,7 +212,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
selectXmlPackage:function(date,currentPage,itemsPerPage,success){
if(date==''){
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(date,currentPage,itemsPerPage)
......@@ -235,6 +235,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)||state==''){
state=-1;
}
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,date)
$http({
method: 'GET',
......@@ -255,6 +258,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(state)||state==''){
state=-1;
}
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd");
}
console.log(fileName,state,currentPage,itemsPerPage,date)
$http({
method: 'GET',
......@@ -344,6 +350,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(oldPackageName,date)
$http({
method: 'GET',
......@@ -360,6 +369,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(angular.isUndefined(oldPackageName)){
oldPackageName='';
}
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(oldPackageName,date,currentPage,itemsPerPage)
$http({
method: 'GET',
......@@ -420,6 +432,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(county==''){
county = -1;
}
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(newPackageName,idCard,date,county)
$http({
method: 'GET',
......@@ -444,6 +459,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
if(county==''){
county = -1;
}
if(date=='{{choseDate}}'){
date=$filter("date")(new Date(), "yyyy-MM-dd")
}
console.log(newPackageName,idCard,date,county,currentPage,itemsPerPage)
$http({
method: 'GET',
......
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ c02b176c
......@@ -43,7 +43,7 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</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>
</div>
</td>
......
src/main/resources/static/views/analysisLog/analysisLog.js
View file @ c02b176c
......@@ -23,7 +23,7 @@ angular.module('AvatarCheck.analysisLog', ['ngRoute', 'AvatarCheck.http', 'tm.pa
$(".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 = {
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ c02b176c
......@@ -69,7 +69,7 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</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>
</div>
</td>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ c02b176c
......@@ -27,6 +27,8 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
......@@ -59,6 +61,9 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
if(packageType==''){
packageType=-1;
}
if(date=='{{choseDate}}'){
date=$scope.choseDate
}
if($scope.paginationConf.currentPage==0){
$scope.paginationConf.currentPage=1
}
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ c02b176c
......@@ -55,7 +55,7 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</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>
</div>
</td>
......@@ -65,7 +65,7 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</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>
</div>
</td>
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js
View file @ c02b176c
......@@ -44,7 +44,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
$(".d2").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.paginationConf = {
currentPage: 1,
......@@ -64,6 +64,15 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
if(angular.isUndefined($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=='')){
MessageService.showAlert("请选择起始日期和结束日期")
}else{
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ c02b176c
......@@ -90,7 +90,7 @@
</div>
<input type="text"
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>
</div>
</td>
......
src/main/resources/static/views/packageLog/packageLog.html
View file @ c02b176c
......@@ -52,7 +52,7 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</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>
</div>
</td>
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ c02b176c
......@@ -23,6 +23,7 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ c02b176c
......@@ -68,7 +68,7 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</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>
</div>
</td>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ c02b176c
......@@ -24,7 +24,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$('.select2').select2();
//Initialize Select2 Elements
$('.select2').select2({
......@@ -43,6 +43,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
};
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getCountJson = function(){
var date=$('#datepicker').val();
var json={};
if (angular.isDefined($scope.applicantName)) {
json.applicantName=$scope.applicantName;
......@@ -70,10 +71,15 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{
json.getToCounty=[];
}
json.uploadDate = $("#datepicker").val();
if(date=='{{choseDate}}'){
json.uploadDate=$scope.choseDate;
}else {
json.uploadDate = $("#datepicker").val();
}
return json;
}
var getJson = function () {
var date=$('#datepicker').val();
var json={};
if (angular.isDefined($scope.applicantName)) {
json.applicantName=$scope.applicantName;
......@@ -101,9 +107,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{
json.getToCounty=[];
}
if($("#datepicker").val()==''){
json.uploadDate = '';
}else{
if(date=='{{choseDate}}'){
json.uploadDate=$scope.choseDate;
}else {
json.uploadDate = $("#datepicker").val();
}
if($scope.paginationConf.currentPage==0){
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ c02b176c
......@@ -59,7 +59,8 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</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>
</td>
<td style="text-align: left;">
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ c02b176c
......@@ -27,7 +27,10 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
todayBtn: 1,
autoclose: 1
});
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$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