Skip to content

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

更新页面

parent 14ace7f2
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 85 deletions
src/main/resources/static/js/app.js
View file @ b1a5966a
......@@ -110,6 +110,12 @@ angular.module('AvatarCheck', [
$rootScope.tab = '/tagPrint';
$("body").addClass("sidebar-collapse");
}
if ($location.path() == "/analysisLog") {
$rootScope.tab = '/cardProdUpdate';
}
if ($location.path() == "/packageLog") {
$rootScope.tab = '/cardProdUpdate';
}
......
src/main/resources/static/js/service.js
View file @ b1a5966a
......@@ -228,6 +228,45 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}).then(function successCallback(response) {
success(response.data)
})
},
getPackageData:function(uploadNo,idCard,oldPackageNo,newPackageNo,sljg,
typeCode,packageType,date,success){
var json ={
uploadNo:uploadNo,
idCard:idCard,
oldPackageNo:oldPackageNo,
newPackageNo:newPackageNo,
sljg:sljg,
typeCode:typeCode,
packageType:packageType,
date:date
}
var arr = [];
arr.push(json);
var body = JSON.stringify(arr);
$http({
method: 'POST',
url: "../PackageInformation/selectInformation",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
console.log(response)
success(response.data)
})
},
selectPackageLog:function(newPackageName,idCard,date,county,success){
$http({
method: 'GET',
url: "../CreatePackageApi/selectPackageData"+urlTimeStamp(),
params:{
newPackageName:newPackageName,
idCard:idCard,
createDate:date,
readCounty:county
}
}).then(function successCallback(response) {
success(response.data)
})
}
}
});
\ No newline at end of file
src/main/resources/static/views/analysisLog/analysisLog.html
View file @ b1a5966a
......@@ -74,8 +74,8 @@
<td>{{$index+1}}</td>
<td>{{item.oldPackageName}}</td>
<td>{{item.count}}</td>
<td>{{item.recordNumber}}</td>
<td>{{item.countyNo}}</td>
<td>{{item.formStateTime}}</td>
<td>{{item.formDeadline}}</td>
<td>{{item.fileName}}</td>
<td>{{item.parsingDate}}</td>
<td>{{item.commonCardCount}}</td>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ b1a5966a
......@@ -38,17 +38,18 @@
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>上传受理号:</td>
<td><input type="text" class="form-control" ng-model="applicantName" placeholder="上传受理号"></td>
<td><input type="text" class="form-control" ng-model="uploadNo" placeholder="上传受理号"></td>
<td>身份证号:</td>
<td><input type="text" class="form-control" ng-model="orderNo" placeholder="身份证号"></td>
<td><input type="text" class="form-control" ng-model="idCard" placeholder="身份证号"></td>
<td>原包号:</td>
<td><input type="text" class="form-control" ng-model="number" placeholder="原包号"></td>
<td><input type="text" class="form-control" ng-model="oldPackageNo" placeholder="原包号"></td>
</tr>
<tr>
<td>新包号:</td>
<td><input type="text" class="form-control" ng-model="number" placeholder="新包号"></td>
<td><input type="text" class="form-control" ng-model="newPackageNo" placeholder="新包号"></td>
<td>受理机关:</td>
<td><input type="text" class="form-control" ng-model="gkxx" placeholder="受理机关"></td><td>制证类型:</td>
<td><input type="text" class="form-control" ng-model="sljg" placeholder="受理机关"></td>
<td>制证类型:</td>
<td style="text-align: left;">
<select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择制证类型--"
style="width: 100%;" ng-model="typeCode">
......@@ -72,7 +73,7 @@
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker1" readonly/>
<input type="text" class="form-control pull-right" ng-model="choseDate" id="datepicker" readonly/>
</div>
</td>
......@@ -80,14 +81,14 @@
</table>
</div>
<div class="box-footer" style="text-align: right;padding-bottom: 0;">
<button class="btn btn-primary" ng-click="doQuery()">查询</button>
<button class="btn btn-primary" ng-click="doPackageQuery()">查询</button>
<button type="submit" class="btn btn-info" ng-click="downloadXml()">下载制证包</button>
</div>
</div>
<div class="box box-default">
<strong class="box-header">制证信息详情</strong>
<div class="box-info" style="padding: 10px;">
<table class="table table-bordered table-hover">
<table class="table table-bordered table-hover" ng-if="packageData">
<thead>
<tr>
<th>NO.</th>
......@@ -101,7 +102,7 @@
</tr>
</thead>
<tbody>
<tr>
<tr ng-repeat="item in packageData">
<td>1</td>
<td>411032546565445</td>
<td>张三</td>
......@@ -114,34 +115,10 @@
<input type="radio" name="isPackage" value="2">否
</td>
</tr>
<tr>
<td>2</td>
<td>411032546565445</td>
<td>里斯</td>
<td>130133195608240013</td>
<td>1321454113</td>
<td>1213134556</td>
<td>邮寄证</td>
<td>
<input type="radio" name="isPackage1" value="1" checked>是
<input type="radio" name="isPackage1" value="2">否
</td>
</tr>
<tr ng-repeat="item in postData | orderBy:item.id" ng-click="showDetail(item)" style="cursor: pointer;">
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.printTime | date:"yyyy-MM-dd hh:mm:ss"}}</td>
</tr>
</tbody>
</table>
<p style="color:#9f191f;"><span style="margin-right: 15px;">普通证：3000</span><span style="margin-right: 15px;">邮寄证：2000</span><span>禁用数：2</span></p>
<div style="padding-left: 27%;">
<p style="color:#9f191f;" ng-if="packageData"><span style="margin-right: 15px;">普通证：3000</span><span style="margin-right: 15px;">邮寄证：2000</span><span>禁用数：2</span></p>
<div style="padding-left: 27%;" ng-if="packageData">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
<h3 ng-if="postData.length==0">暂无记录。</h3>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ b1a5966a
......@@ -19,14 +19,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
});
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$('#datepicker2').datetimepicker({
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
......@@ -44,4 +37,12 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
};
$scope.paginationConf.totalItems = 50;
$scope.doPackageQuery=function(){
HttpService.getPackageData($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
$scope.typeCode,$scope.packageType,$("#datepicker").val(),function(data) {
$scope.packageData = data;
console.log(data)
})
}
});
\ No newline at end of file
src/main/resources/static/views/packageLog/packageLog.html
View file @ b1a5966a
......@@ -37,12 +37,12 @@
<tr>
<td width="10%">新包名:</td>
<td width="15%">
<input type="text" class="form-control" placeholder="原始包数据"/>
<input type="text" class="form-control" placeholder="新包名" ng-model="newPackageName"/>
</td>
<td width="10%">身份证:
<td width="10%">身份证号:
</td>
<td width="15%">
<input type="text" class="form-control" placeholder="身份证号"/>
<input type="text" class="form-control" placeholder="身份证号" ng-model="idCard"/>
</td>
<td width="10%">
生成时间:
......@@ -57,13 +57,13 @@
</td>
<td width="10%">上传地区:</td>
<td width="15%">
<input type="text" class="form-control" placeholder="上传地区名称"/>
<input type="text" class="form-control" placeholder="上传地区名称" ng-model="county"/>
</td>
<td><button class="btn btn-primary">查询</button></td>
<td><button class="btn btn-primary" ng-click="getPackageLog()">查询</button></td>
</tr>
</table>
<table class="table table-bordered table-hover postTable">
<table class="table table-bordered table-hover postTable" ng-if="packageLogData">
<thead>
<tr>
<th>NO.</th>
......@@ -75,43 +75,17 @@
</tr>
</thead>
<tbody>
<tr>
<td>1</td>
<td>123420190302001</td>
<td>20190302</td>
<td>300</td>
<td>110012</td>
<td>朝阳区</td>
</tr>
<tr>
<td>2</td>
<td>123420190302002</td>
<td>20190301</td>
<td>400</td>
<td>110013</td>
<td>海淀区</td>
<tr ng-repeat="item in packageLogData">
<td>{{$index+1}}</td>
<td>{{item.newPackageName}}</td>
<td>{{item.createDate}}</td>
<td>{{item.cardCount}}</td>
<td>{{item.readCountyCode}}</td>
<td>{{item.readCountyName}}</td>
</tr>
<tr ng-repeat="item in postMsgDetail">
<td>
<input ng-if="$index==0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)" checked="checked">
<input ng-if="$index!=0" type="radio" name="r1" class="minimal" value="{{item.id}}" ng-click="changeIndex($index)">
</td>
<td>{{item.id}}</td>
<td>{{item.ddh}}</td>
<td>{{item.yjh}}</td>
<td>{{item.fxyjh}}</td>
<td>{{item.sbsll}}</td>
<td>{{item.sjrxm}}</td>
<td>{{item.sjrlxfs}}</td>
<td>{{item.sjrdz}}</td>
<td>{{item.sqrxm}}</td>
<td>{{item.printTime | date:'yyyy-MM-dd hh:mm:ss'}}</td>
</tr>
</tbody>
</table>
<div style="padding-left: 27%;">
<div style="padding-left: 27%;" ng-if="packageLogData">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div>
......
src/main/resources/static/views/packageLog/packageLog.js
View file @ b1a5966a
......@@ -30,6 +30,13 @@ angular.module('AvatarCheck.packageLog', ['ngRoute', 'AvatarCheck.http', 'tm.pag
};
$scope.paginationConf.totalItems = 50;
$scope.getPackageLog = function(){
HttpService.selectPackageLog($scope.newPackageName,$scope.idCard,$('#datepicker').val(),$scope.county,function(data){
$scope.packageLogData = data;
console.log($scope.packageLogData)
})
}
});
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