Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit c01619ba authored by wuzhilong's avatar wuzhilong
Browse files
Options

WEB页面

parent 67df6366
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 195 deletions
src/main/resources/static/dialogs/analysisDialog.html
View file @ c01619ba
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<th>数量</th> <th>数量</th>
<th>订单起始日期</th> <th>订单起始日期</th>
<th>订单截至日期</th> <th>订单截至日期</th>
<th>状态</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -22,8 +23,10 @@ ...@@ -22,8 +23,10 @@
<td>{{item.COUNT}}</td> <td>{{item.COUNT}}</td>
<td>{{item.FORM_START_TIME|myDateFilter}}</td> <td>{{item.FORM_START_TIME|myDateFilter}}</td>
<td>{{item.FORM_DEADLINE|myDateFilter}}</td> <td>{{item.FORM_DEADLINE|myDateFilter}}</td>
<td ><span ng-if="item.STATE==1">已解析</span></td>
<td> <td>
<button class="btn" ng-click="analyseToUpdateIfPost(item.FILE_ID)">解析</button> <button class="btn btn-soundcloud" ng-click="UpdateIdcard(item.FILE_ID)">清除标记</button>
<button class="btn btn-info" ng-click="analyseToUpdateIfPost(item.FILE_ID)">解析</button>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
src/main/resources/static/dialogs/checkDialog.html 0 → 100644
View file @ c01619ba
<div class="ui-dialog-title" ng-if="list.length>0">
受理信息不符合
</div>
<div class="ui-dialog-title" ng-if="list.length==0">
暂无受理信息不符合的信息
</div>
<div class="ui-dialog-content">
<div ng-if="list.length==0">
<h4>暂无数据</h4>
</div>
<table class="table table-hover" ng-if="list.length>0">
<thead>
<th>受理号</th>
<th>原包名</th>
<th>姓名</th>
<th>身份证号</th>
<th>包内派出所</th>
<th>受理号派出所</th>
</thead>
<tbody>
<tr ng-repeat="item in list">
<td>{{item.ACCEPTNO}}</td>
<td>{{item.FILENAME}}</td>
<td>{{item.NAME}}</td>
<td>{{item.CARDID}}</td>
<td>{{item.FILEPOLICECODE}}</td>
<td>{{item.ACCEPTPOLICECODE}}</td>
</tr>
</tbody>
</table>
</div>
<div class="ui-dialog-confirm">
<button type="submit" class="btn btn-danger" ng-click="closeThisDialog()">关闭</button>
</div>
src/main/resources/static/dialogs/confirm.html
View file @ c01619ba
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
提示 提示
</div> </div>
<div class="ui-dialog-content"> <div class="ui-dialog-content">
<div>确认删除{{importDate}}导入的{{total}}条记录吗？</div> <div>确认删除{{importStartDate}}到{{importEndDate}}时间段内导入的{{total}}条记录吗？</div>
</div> </div>
<div class="ui-dialog-confirm"> <div class="ui-dialog-confirm">
<p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p> <p ng-if="wrongMsg!=-1" style="color: red;">{{wrongMsg}}</p>
......
src/main/resources/static/dialogs/confirmToDownload.html
View file @ c01619ba
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
提示 提示
</div> </div>
<div class="ui-dialog-content"> <div class="ui-dialog-content">
<div>下载格口文件导入日期为：{{importDate}}到{{importDate1}} 时间段内的<strong>{{count}}</strong>条记录</div> <div>下载<strong>{{count}}</strong>条记录</div>
</div> </div>
<div class="ui-dialog-confirm"> <div class="ui-dialog-confirm">
<button type="submit" class="btn btn-info" ng-click="confirmDownload()">确认</button> <button type="submit" class="btn btn-info" ng-click="confirmDownload()">确认</button>
......
src/main/resources/static/dialogs/specailCardInfo.html
View file @ c01619ba
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
<td>{{groups.ACCEPT_NO}}</td> <td>{{groups.ACCEPT_NO}}</td>
<td ng-if="groups.SPECIAL_TYPE==2">快证</td> <td ng-if="groups.SPECIAL_TYPE==2">快证</td>
<td ng-if="groups.SPECIAL_TYPE==1">余证</td> <td ng-if="groups.SPECIAL_TYPE==1">余证</td>
<td ng-if="groups.SPECIAL_TYPE==3">退证</td>
<td>{{groups.TASK_STATE}}</td> <td>{{groups.TASK_STATE}}</td>
</tr> </tr>
</tbody> </tbody>
......
src/main/resources/static/js/app.js
View file @ c01619ba
...@@ -300,7 +300,7 @@ angular.module('AvatarCheck', [ ...@@ -300,7 +300,7 @@ angular.module('AvatarCheck', [
$scope.addQuickCardAccu = function(){ $scope.addQuickCardAccu = function(){
if($(".accu:checked").length>0){ if($(".accu:checked").length>0){
if(angular.isUndefined($scope.searchResult.workOrderData[0])){ if(angular.isUndefined($scope.searchResult.workOrderData[0].CARD_TYPE_ID)){
MessageService.showAlert("无制证类型记录，请创建任务单后再添加快证") MessageService.showAlert("无制证类型记录，请创建任务单后再添加快证")
}else{ }else{
var idx = $(".accu:checked").val(); var idx = $(".accu:checked").val();
...@@ -351,8 +351,8 @@ angular.module('AvatarCheck', [ ...@@ -351,8 +351,8 @@ angular.module('AvatarCheck', [
} }
$scope.giveBackCardAccu = function () { $scope.giveBackCardAccu = function () {
if($(".accu:checked").length>0){ if($(".accu:checked").length>0){
if(angular.isUndefined($scope.searchResult.workOrderData[0])) { if(angular.isUndefined($scope.searchResult.workOrderData[0].TASK_ID)) {
MessageService.showAlert("无任务单记录，请创建任务单后再添加退证") MessageService.showAlert("无任务单记录，请创建任务单后再添加快证")
}else{ }else{
var idx = $(".accu:checked").val(); var idx = $(".accu:checked").val();
var check = idx.split("+"); var check = idx.split("+");
......
src/main/resources/static/js/service.js
View file @ c01619ba
angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
.service('DebugService', function () { .service('DebugService', function () {
var debug = true var debug = true;
return { return {
debug: function (label, content) { debug: function (label, content) {
content = content === undefined ? "" : content; content = content === undefined ? "" : content;
...@@ -21,7 +21,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -21,7 +21,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
cache: false, cache: false,
data: msg, data: msg,
controller: ['$scope', function ($scope) { controller: ['$scope', function ($scope) {
$scope.msgText = $scope.ngDialogData $scope.msgText = $scope.ngDialogData;
DebugService.debug($scope.ngDialogData) DebugService.debug($scope.ngDialogData)
}] }]
}); });
...@@ -35,7 +35,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -35,7 +35,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
controller: ['$scope','$rootScope','$location','localStorageService','HttpService', function ($scope,$rootScope,$location,localStorageService,HttpService) { controller: ['$scope','$rootScope','$location','localStorageService','HttpService', function ($scope,$rootScope,$location,localStorageService,HttpService) {
$scope.msgText = $scope.ngDialogData; $scope.msgText = $scope.ngDialogData;
$scope.confirmYes = function() { $scope.confirmYes = function() {
HttpService.logout(function(data) { HttpService.logout(function() {
$scope.closeThisDialog(); $scope.closeThisDialog();
localStorage.clear(); localStorage.clear();
$rootScope.loginData = {userid:'用户未登录', login:false}; $rootScope.loginData = {userid:'用户未登录', login:false};
...@@ -71,7 +71,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -71,7 +71,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
setPrintTime: function (id, printTime, success) { setPrintTime: function (id, printTime, success) {
console.log(id)
$http({ $http({
method: 'GET', method: 'GET',
url: "../personPostApi/updatePrintDate" + urlTimeStamp(), url: "../personPostApi/updatePrintDate" + urlTimeStamp(),
...@@ -109,7 +108,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -109,7 +108,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}, },
searchPostData: function (data, success) { searchPostData: function (data, success) {
var body = JSON.stringify(data); var body = JSON.stringify(data);
console.log(body)
$http({ $http({
method: 'POST', method: 'POST',
url: "../personPostApi/findPersonalData", url: "../personPostApi/findPersonalData",
...@@ -138,24 +136,25 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -138,24 +136,25 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
deleteRecordsNotPrinted: function (date, success) { deleteRecordsNotPrinted: function (date1,date2, success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../personPostApi/recordsHaveNotPrinted" + urlTimeStamp(), url: "../personPostApi/recordsHaveNotPrinted" + urlTimeStamp(),
params: { params: {
importDate:date startDate:date1,
endDate:date2
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
}, },
getChooseDateRecordsCount:function (date, success) { getChooseDateRecordsCount:function (date1,date2, success) {
console.log(date)
$http({ $http({
method: 'GET', method: 'GET',
url: "../personPostApi/findPersonalDataCountByImportDate", url: "../personPostApi/findPersonalDataCountByImportDate",
params:{ params:{
importDate:date startDate:date1,
endDate:date2
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -163,7 +162,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -163,7 +162,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}, },
getRecordsCount: function (data, success) { getRecordsCount: function (data, success) {
var body = JSON.stringify(data); var body = JSON.stringify(data);
console.log(body)
$http({ $http({
method: 'POST', method: 'POST',
url: "../personPostApi/findPersonalDataCount", url: "../personPostApi/findPersonalDataCount",
...@@ -185,7 +183,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -185,7 +183,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
uploadPackage:function(fd,success){ uploadPackage:function(fd,success){
console.log(fd)
$http({ $http({
method: 'POST', method: 'POST',
url: "../importXML/getXMLToCheck", url: "../importXML/getXMLToCheck",
...@@ -551,15 +548,27 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -551,15 +548,27 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
getTaskListToCreate:function(date,success){ getTaskListToCreateFromProd:function(groupNo1,groupNo2,success){
if(date==''){ console.log($rootScope.loginData.roleList[0].process,groupNo1,groupNo2);
date=$filter("date")(new Date(), "yyyy-MM-dd"); $http({
} method: 'GET',
console.log($rootScope.loginData.roleList[0].process,date) url: "../TaskList/queryByCounty"+urlTimeStamp(),
params:{
groupNo1:groupNo1,
groupNo2:groupNo2
}
}).then(function successCallback(response) {
success(response.data)
})
},
getTaskListToCreate:function(groupNo1,groupNo2,date,success){
console.log($rootScope.loginData.roleList[0].process,groupNo1,groupNo2,date);
$http({ $http({
method: 'GET', method: 'GET',
url: "../TaskList/queryByCountyAtACCU"+urlTimeStamp(), url: "../TaskList/queryByCountyAtACCU"+urlTimeStamp(),
params:{ params:{
groupNo1:groupNo1,
groupNo2:groupNo2,
process:$rootScope.loginData.roleList[0].process, process:$rootScope.loginData.roleList[0].process,
date:date date:date
} }
...@@ -782,6 +791,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -782,6 +791,18 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
checkData:function(date,success){
console.log(date)
$http({
method: 'GET',
url: "../LogApi/checkAcppetNo"+urlTimeStamp(),
params:{
importDate:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
analyseDataCount:function(date,success) { analyseDataCount:function(date,success) {
if(date==''){ if(date==''){
date=$filter("date")(new Date(), "yyyy-MM-dd"); date=$filter("date")(new Date(), "yyyy-MM-dd");
...@@ -809,6 +830,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -809,6 +830,17 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
analyseToUpdateIdcard:function(fileid,success){
$http({
method: 'GET',
url: "../LogApi/updateNullIdDate"+urlTimeStamp(),
params:{
fileId:fileid
}
}).then(function successCallback(response) {
success(response.data)
})
},
updateTaskListProcess:function(json,success){ updateTaskListProcess:function(json,success){
var body = JSON.stringify(json); var body = JSON.stringify(json);
$http({ $http({
...@@ -1337,13 +1369,14 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1337,13 +1369,14 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
queryDeliveredReport:function (date1,date2,success) { queryDeliveredReport:function (date1,date2,notNull,success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../DeliveredApi/queryDeliveredReport" + urlTimeStamp(), url: "../DeliveredApi/queryDeliveredReport" + urlTimeStamp(),
params:{ params:{
startDate: date1, startDate: date1,
endDate: date2, endDate: date2,
type:notNull
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
...@@ -1538,12 +1571,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1538,12 +1571,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
updateApplyStateData:function(id,success) { updateApplyStateData:function(id,state,success) {
$http({ $http({
method: 'GET', method: 'GET',
url: "../MaterialManagementApi/updateCardBody" + urlTimeStamp(), url: "../MaterialManagementApi/updateCardBody" + urlTimeStamp(),
params:{ params:{
id:id id:id,
state:state
} }
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
...@@ -1573,7 +1607,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1573,7 +1607,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
var body = JSON.stringify(data); var body = JSON.stringify(data);
$http({ $http({
method: 'POST', method: 'POST',
url: "../FailedCardApi/insertBackCard", url: "../FailedCardApi/insertHistoryCard",
data: body, data: body,
headers: {'Content-Type': 'application/json'} headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) { }).then(function successCallback(response) {
...@@ -1697,16 +1731,11 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1697,16 +1731,11 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data) success(response.data)
}) })
}, },
updatePass:function(password,newPwd,success){ updatePass:function(body,success){
console.log(password,newPwd,$rootScope.loginData.id);
$http({ $http({
method: 'GET', method: 'POST',
url: "../user/updatePwd" + urlTimeStamp(), url: "../user/updatePwd" + urlTimeStamp(),
params: { data: body,
password:password,
newPwd:newPwd,
userId:$rootScope.loginData.id
}
}).then(function successCallback(response) { }).then(function successCallback(response) {
success(response.data) success(response.data)
}) })
......
src/main/resources/static/views/addBackCard/addBackCard.js
View file @ c01619ba
...@@ -91,6 +91,7 @@ angular.module('AvatarCheck.addBackCard', ['ngRoute', 'AvatarCheck.http']) ...@@ -91,6 +91,7 @@ angular.module('AvatarCheck.addBackCard', ['ngRoute', 'AvatarCheck.http'])
var json = {}; var json = {};
json.acceptNo=result[i][0]; json.acceptNo=result[i][0];
json.note=result[i][1]; json.note=result[i][1];
json.name=$rootScope.loginData.name;
list.push(json) list.push(json)
} }
} }
...@@ -106,7 +107,7 @@ angular.module('AvatarCheck.addBackCard', ['ngRoute', 'AvatarCheck.http']) ...@@ -106,7 +107,7 @@ angular.module('AvatarCheck.addBackCard', ['ngRoute', 'AvatarCheck.http'])
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) { controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[]; var idCardArr =[];
for(var i=0;i<list.length;i++){ for(var i=0;i<list.length;i++){
idCardArr.push(list[i].cardId); idCardArr.push(list[i].acceptNo);
} }
HttpService.getPersonInfo(idCardArr,function(data){ HttpService.getPersonInfo(idCardArr,function(data){
$scope.personInfo = data; $scope.personInfo = data;
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ c01619ba
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<th>身份证号</th> <th>身份证号</th>
<th>废证原因</th> <th>废证原因</th>
<th>保存时间</th> <th>保存时间</th>
<th>工作组</th> <!--<th>工作组</th>-->
<th>提交人</th> <th>提交人</th>
<th>状态</th> <th>状态</th>
<th>备注</th> <th>备注</th>
...@@ -134,15 +134,15 @@ ...@@ -134,15 +134,15 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="item in failedInfo"> <tr ng-repeat="item in failedInfo | orderBy:FAILED_CARD_ID">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<th>{{item.ACCEPT_NO}}</th> <th>{{item.ACCEPT_NO}}</th>
<td>{{item.CARD_NAME}}</td> <td>{{item.CARD_NAME}}</td>
<td>{{item.ID_NO}}</td> <td>{{item.ID_NO}}</td>
<th>{{item.FAILED_CARD_REASON_ID}}</th> <th>{{item.FAILED_CARD_REASON_ID}}</th>
<td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td ng-if="item.WORK_GROUP == 1">A组</td> <!--<td ng-if="item.WORK_GROUP == 1">A组</td>-->
<td ng-if="item.WORK_GROUP == 2">B组</td> <!--<td ng-if="item.WORK_GROUP == 2">B组</td>-->
<td>{{item.NAME}}</td> <td>{{item.NAME}}</td>
<td>{{item.STATE}}</td> <td>{{item.STATE}}</td>
<td>{{item.NOTE}}</td> <td>{{item.NOTE}}</td>
......
src/main/resources/static/views/blank/blank.html
View file @ c01619ba
<section class="content row"> <section class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
<div class="box "> <div class="box ">
<div class="box-header"> <div class="box-header">
<strong>制证统计</strong> <strong>制证统计</strong>
<div class="pull-right col-md-2" > <div class="pull-right col-md-2" >
<input class="form-control col-md-1" <input class="form-control col-md-1"
style="width: 70px;height: 20px;" style="width: 70px;height: 20px;"
ng-model="year" ng-model="year"
ng-change="changeYear()"> ng-change="changeYear()">
<span class="col-md-1">年</span> <span class="col-md-1">年</span>
</div> </div>
</div> </div>
<div class="box box-primary"> <div class="box box-primary">
<div style="text-align: center;"> <div style="text-align: center;">
<!--通过率统计图--> <!--通过率统计图-->
<div class="row" > <div class="row" >
<div class="col-md-12"> <div class="col-md-12">
<div class="yx-div-header"></div> <div class="yx-div-header"></div>
<div id="diagram_item_ratio_certification" style="height:500px;"></div> <div id="diagram_item_ratio_certification" style="height:500px;"></div>
</div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div>
</div>
</div> </div>
</section> </section>
\ No newline at end of file
src/main/resources/static/views/blank/blank.js
View file @ c01619ba
...@@ -20,7 +20,6 @@ angular.module('AvatarCheck.blank', ['ngRoute', 'AvatarCheck.http', 'tm.paginati ...@@ -20,7 +20,6 @@ angular.module('AvatarCheck.blank', ['ngRoute', 'AvatarCheck.http', 'tm.paginati
function (data) { function (data) {
console.log("统计图：",data) console.log("统计图：",data)
var myChart = echarts.init(document.getElementById('diagram_item_ratio_certification')); var myChart = echarts.init(document.getElementById('diagram_item_ratio_certification'));
console.log("统计图：",data)
myChart.setOption(buildDiagramDataCheckItemRatioProv('制证生产', data)); myChart.setOption(buildDiagramDataCheckItemRatioProv('制证生产', data));
}, },
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.html
View file @ c01619ba
...@@ -122,11 +122,12 @@ ...@@ -122,11 +122,12 @@
<tr> <tr>
<th>NO.</th> <th>NO.</th>
<th>上传受理号</th> <th>上传受理号</th>
<th>制证类型</th>
<th>姓名</th> <th>姓名</th>
<th>身份证号</th> <th>身份证号</th>
<th>受理单位</th>
<th>原包号</th> <th>原包号</th>
<th>新包号</th> <th>新包号</th>
<th>制证类型</th>
<th>禁用</th> <th>禁用</th>
</tr> </tr>
</thead> </thead>
...@@ -134,11 +135,12 @@ ...@@ -134,11 +135,12 @@
<tr ng-repeat="item in packageData"> <tr ng-repeat="item in packageData">
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{item.JMSFZSLH}}</td> <td>{{item.JMSFZSLH}}</td>
<td>{{item.CARD_TYPE}}</td>
<td>{{item.XM}}</td> <td>{{item.XM}}</td>
<td>{{item.GMSFHM}}</td> <td>{{item.GMSFHM}}</td>
<td>{{item.DWMC}}({{item.DWDM}})</td>
<td>{{item.SOURCE_FILE_NAME}}</td> <td>{{item.SOURCE_FILE_NAME}}</td>
<td>{{item.NEW_FILE_NAME}}</td> <td>{{item.NEW_FILE_NAME}}</td>
<td>{{item.CARD_TYPE}}</td>
<td ng-if="item.IS_VALID==1"><button class="btn btn-primary" ng-click="updateIsValid(item.ID,0)">禁用</button></td> <td ng-if="item.IS_VALID==1"><button class="btn btn-primary" ng-click="updateIsValid(item.ID,0)">禁用</button></td>
<td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.ID,1)">启用</button></td> <td ng-if="item.IS_VALID==0"><button class="btn btn-info" ng-click="updateIsValid(item.ID,1)">启用</button></td>
</tr> </tr>
......
src/main/resources/static/views/cardProdPackage/cardProdPackage.js
View file @ c01619ba
...@@ -206,7 +206,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't ...@@ -206,7 +206,7 @@ angular.module('AvatarCheck.cardProdPackage', ['ngRoute', 'AvatarCheck.http', 't
} }
HttpService.getDownloadCount($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg, HttpService.getDownloadCount($scope.uploadNo,$scope.idCard,$scope.oldPackageNo,$scope.newPackageNo,$scope.sljg,
cardType,packageType,downloadState,date,date1,function(data) { cardType,packageType,downloadState,date,date1,function(data) {
$rootScope.count = data.total; $rootScope.count = data;
}) })
} }
$scope.downloadXml = function(){ $scope.downloadXml = function(){
......
src/main/resources/static/views/cardProdUpdate/cardProdUpdate.html
View file @ c01619ba
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<table class="table table-bordered table-hover" ng-if="xmlDatas.length>0"> <table class="table table-bordered table-hover" ng-if="xmlDatas.length>0">
<thead> <thead>
<tr> <tr>
<th>NO.</th> <th>ID</th>
<th>单位代码</th> <th>单位代码</th>
<th>单位名称</th> <th>单位名称</th>
<th>记录数</th> <th>记录数</th>
......
src/main/resources/static/views/cardReport/cardReport.html
View file @ c01619ba
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
<th>入库数</th> <th>入库数</th>
<th>卡体类型</th> <th>卡体类型</th>
<th>提交人</th> <th>提交人</th>
<th>实际出库</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -96,6 +97,7 @@ ...@@ -96,6 +97,7 @@
<td ng-show="item.CARD_BODY_TYPE!=0">{{item.CARD_BODY_TYPE}}</td> <td ng-show="item.CARD_BODY_TYPE!=0">{{item.CARD_BODY_TYPE}}</td>
<td ng-show="item.CARD_BODY_TYPE==0"></td> <td ng-show="item.CARD_BODY_TYPE==0"></td>
<td>{{item.NAME}}</td> <td>{{item.NAME}}</td>
<td><strong>{{item.COUNT1-item.COUNT2}}</strong></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.html
View file @ c01619ba
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<tr> <tr>
<th><input type="checkbox" ng-model="checkAll"></th> <th><input type="checkbox" ng-model="checkAll"></th>
<th>No.</th> <th>No.</th>
<th>反向运单号</th> <th>正向运单号</th>
<th>身份证号码</th> <th>身份证号码</th>
<th>退回原因</th> <th>退回原因</th>
<th>登记人姓名</th> <th>登记人姓名</th>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</div> </div>
<input type="text" <input type="text"
class="form-control pull-right" class="form-control pull-right"
ng-model="choseDate" ng-model="choseDate1"
id="datepicker2" readonly/> id="datepicker2" readonly/>
</div> </div>
</td> </td>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<thead> <thead>
<tr> <tr>
<th>No.</th> <th>No.</th>
<th>反向运单号</th> <th>正向运单号</th>
<th>身份证号码</th> <th>身份证号码</th>
<th>退回原因</th> <th>退回原因</th>
<th>登记人姓名</th> <th>登记人姓名</th>
......
src/main/resources/static/views/confirmNotDeliveredInfo/confirmNotDeliveredInfo.js
View file @ c01619ba
...@@ -26,6 +26,7 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht ...@@ -26,6 +26,7 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.choseDate1 = $filter("date")(new Date(), "yyyy-MM-dd");
//查询未接收的投递失败的信息 //查询未接收的投递失败的信息
...@@ -40,6 +41,12 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht ...@@ -40,6 +41,12 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht
$scope.searchHasConfirmedInfo = function () { $scope.searchHasConfirmedInfo = function () {
var date1 = $("#datepicker1").val(); var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val(); var date2 = $("#datepicker2").val();
if(date1==''){
date1=$filter("date")(new Date(), "yyyy-MM-dd");
}
if(date2==''){
date2=$filter("date")(new Date(), "yyyy-MM-dd");
}
HttpService.getHasConfirmedInfo(date1,date2,function(data){ HttpService.getHasConfirmedInfo(date1,date2,function(data){
$scope.hasConfirmedInfo = data; $scope.hasConfirmedInfo = data;
console.log($scope.hasConfirmedInfo); console.log($scope.hasConfirmedInfo);
...@@ -69,6 +76,8 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht ...@@ -69,6 +76,8 @@ angular.module("AvatarCheck.confirmNotDeliveredInfo",['ngRoute', 'AvatarCheck.ht
$scope.checkAll = false; $scope.checkAll = false;
$scope.queryDeliveredFailedInfo(); $scope.queryDeliveredFailedInfo();
}) })
$scope.searchHasConfirmedInfo();
} }
}
};
}); });
\ No newline at end of file
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ c01619ba
...@@ -25,9 +25,30 @@ ...@@ -25,9 +25,30 @@
} }
</style> </style>
<div class="content row"> <div class="content row">
<div class="col-md-12" style="margin-top:20px;"> <div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">组号筛选</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>制证组号：</td>
<td>
<input type="text" class="form-control" name="groupNo1" ng-model="groupNo1" ng-minlength="8" ng-maxlength="8" placeholder="起始组号" >
</td>
<td>至</td>
<td>
<input type="text" class="form-control" ng-model="groupNo2" ng-minlength="8" ng-maxlength="8" placeholder="截止组号">
</td>
<td style="text-align: left;">
<div style="text-align: right;">
<button type="submit" class="btn btn-primary" ng-click="searchCurrentFromProd()">查询</button>
</div>
</td>
</tr>
</table>
</form>
</div>
<div class="row"> <div class="row">
<!-- /.col -->
<div class="col-md-12"> <div class="col-md-12">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
...@@ -116,7 +137,7 @@ ...@@ -116,7 +137,7 @@
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th>保存日期</th> <th>任务单编号</th>
<th>组数</th> <th>组数</th>
<th>受理组号</th> <th>受理组号</th>
<th>证件数量</th> <th>证件数量</th>
...@@ -128,7 +149,7 @@ ...@@ -128,7 +149,7 @@
</thead> </thead>
<tbody ng-repeat="task in type.countyList"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td class="mailbox-star"><b>{{task.saveDate | date:'yyyy-MM-dd'}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
<td class="mailbox-subject">{{task.groupNum}}</td> <td class="mailbox-subject">{{task.groupNum}}</td>
<td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td> <td class="mailbox-subject">{{task.countyValidCount-task.specialCount}}</td>
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ c01619ba
...@@ -28,11 +28,33 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -28,11 +28,33 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.totalCardProd = 0; $scope.totalCardProd = 0;
$scope.isHistory=0; $scope.isHistory=0;
$scope.searchCurrentFromProd = function () {
if(angular.isUndefined($scope.groupNo1)||angular.isUndefined($scope.groupNo2)){
MessageService.showAlert("组号不能为空")
}else{
HttpService.getTaskListToCreateFromProd($scope.groupNo1,$scope.groupNo2,function(data){
$scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){
$scope.totalCardProd = $scope.totalCardProd+$scope.cycleSheetData[i].typeSum;
if(i==$scope.currentTab){
$scope.cycleSheetData[i].isActive=true;
}else{
$scope.cycleSheetData[i].isActive=false;
}
}
console.log("制证库查询：",$scope.cycleSheetData)
})
}
};
$scope.searchCurrent = function(){ $scope.searchCurrent = function(){
$scope.totalCardProd = 0; $scope.totalCardProd = 0;
$scope.selected = []; $scope.selected = [];
$scope.isHistory=0; $scope.isHistory=0;
HttpService.getTaskListToCreate($('#datepicker').val(),function(data){ var date = $('#datepicker').val();
if(date=='{{choseDate}}'){
date=$scope.choseDate;
}
HttpService.getTaskListToCreate($scope.groupNo1,$scope.groupNo2,date,function(data){
$scope.cycleSheetData = data; $scope.cycleSheetData = data;
for(var i=0;i<$scope.cycleSheetData.length;i++){ for(var i=0;i<$scope.cycleSheetData.length;i++){
$scope.totalCardProd = $scope.totalCardProd+$scope.cycleSheetData[i].typeSum; $scope.totalCardProd = $scope.totalCardProd+$scope.cycleSheetData[i].typeSum;
......
src/main/resources/static/views/downloadGongan/downloadGongan.html
View file @ c01619ba
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
<div class="box-header" style="border-bottom: 1px solid #e0e0e0;"> <div class="box-header" style="border-bottom: 1px solid #e0e0e0;">
<strong>公安网反馈信息</strong> <strong>公安网反馈信息</strong>
<div class="box-tools pull-right" > <div class="box-tools pull-right" >
<span>交接日期：</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span> <span>交接日期：</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/>
<span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchGongan()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchGongan()">查询</button>
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.js
View file @ c01619ba
...@@ -72,7 +72,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm ...@@ -72,7 +72,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
if(data){ if(data){
$scope.closeThisDialog(); $scope.closeThisDialog();
getData(); getData();
// MessageService.showAlert("上传成功") MessageService.showAlert("上传成功")
}else{ }else{
$scope.wrongMsg = '上传失败'; $scope.wrongMsg = '上传失败';
} }
......
src/main/resources/static/views/materialManagement/materialManagement.html
View file @ c01619ba
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in materialManagement"> <tbody ng-repeat="item in materialManagement">
<tr ng-if="item.CARD_TYPE==1" class="bg-gray"> <tr ng-if="item.CARD_TYPE==1" class="bg-gray-light">
<td>{{item.CARD_BODY_ID}}</td> <td>{{item.CARD_BODY_ID}}</td>
<td>{{item.SAVE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td> <td>{{item.SAVE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.TOTAL_COUNT}}</td> <td>{{item.TOTAL_COUNT}}</td>
...@@ -112,9 +112,11 @@ ...@@ -112,9 +112,11 @@
<td>{{item.NOTE}}</td> <td>{{item.NOTE}}</td>
<td>{{item.NAME}}</td> <td>{{item.NAME}}</td>
<td ng-if="item.STATE==0"> <td ng-if="item.STATE==0">
<button class="btn btn-info" ng-click="updateApplyState(item.CARD_BODY_ID)">确认出库</button> <button class="btn btn-info" ng-click="updateApplyState(item.CARD_BODY_ID,1)">确认出库</button>
<button class="btn btn-danger" ng-click="updateApplyState(item.CARD_BODY_ID,2)" style="margin-left: 10px;">取消出库</button>
</td> </td>
<td ng-if="item.STATE==1">已确认</td> <td ng-if="item.STATE==1">已确认</td>
<td ng-if="item.STATE==2">操作已取消</td>
</tr> </tr>
<tr ng-if="item.CARD_TYPE==2"> <tr ng-if="item.CARD_TYPE==2">
<td>{{item.CARD_BODY_ID}}</td> <td>{{item.CARD_BODY_ID}}</td>
...@@ -125,9 +127,11 @@ ...@@ -125,9 +127,11 @@
<td>{{item.NOTE}}</td> <td>{{item.NOTE}}</td>
<td>{{item.NAME}}</td> <td>{{item.NAME}}</td>
<td ng-if="item.STATE==0"> <td ng-if="item.STATE==0">
<button class="btn btn-info" ng-click="updateApplyState(item.CARD_BODY_ID)">确认入库</button> <button class="btn btn-info" ng-click="updateApplyState(item.CARD_BODY_ID,1)">确认入库</button>
<button class="btn btn-danger" ng-click="updateApplyState(item.CARD_BODY_ID,2)"style="margin-left: 10px;">取消出库</button>
</td> </td>
<td ng-if="item.STATE==1">已确认</td> <td ng-if="item.STATE==1">已确认</td>
<td ng-if="item.STATE==2">操作已取消</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/materialManagement/materialManagement.js
View file @ c01619ba
...@@ -70,8 +70,8 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http'] ...@@ -70,8 +70,8 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
$scope.selectMaterialManagement(); $scope.selectMaterialManagement();
getCardTypeList(); getCardTypeList();
} }
$scope.updateApplyState = function(CARD_BODY_ID) { $scope.updateApplyState = function(CARD_BODY_ID,state) {
HttpService.updateApplyStateData(CARD_BODY_ID,function(data) { HttpService.updateApplyStateData(CARD_BODY_ID,state,function(data) {
$scope.selectMaterialManagement(); $scope.selectMaterialManagement();
}) })
} }
......
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.html
View file @ c01619ba
...@@ -6,10 +6,26 @@ ...@@ -6,10 +6,26 @@
<div class="box" > <div class="box" >
<div class="box-header"> <div class="box-header">
<strong >妥投信息报表</strong> <strong >妥投信息报表</strong>
<div class="box-tools pull-right"> <div class="box-tools pull-left">
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/> <span>至</span> <div style="float: left">
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/> <span>查询日期:</span>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="queryDeliveredReport()">查询</button> <input type="text" style="margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate1" id="datepicker1" readonly/>
<span>至</span>
<input type="text" style="margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/>
</div>
<div style="float: left;margin-right: 10px;margin-top: -3px;">
<!--<select class=" select2-selection__rendered" id="notNull" ng-model="isValid">-->
<select class="form-control select2" id="notNull" ng-model="isValid">
<option value="">--请选择邮寄类型--</option>
<option value="1">对公邮寄</option>
<option value="0">个人邮寄</option>
</select>
</div>
<div style="float: left">
<button type="button" class="btn btn-primary pull-right"
style="margin-top: -3px;"
ng-click="queryDeliveredReport()">查询</button>
</div>
</div> </div>
<!-- /.box-tools --> <!-- /.box-tools -->
</div> </div>
...@@ -27,16 +43,19 @@ ...@@ -27,16 +43,19 @@
<tr> <tr>
<th><input type="checkbox" ng-model="checkAll"></th> <th><input type="checkbox" ng-model="checkAll"></th>
<th>订单发出日期</th> <th>订单发出日期</th>
<th>邮寄类型</th>
<th>邮寄数量</th> <th>邮寄数量</th>
<th>妥投数量</th> <th>妥投数量</th>
<th>未妥投数量</th>
<th>妥投失败数量</th> <th>妥投失败数量</th>
<th>未妥投数量</th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in deliveredReportList"> <tbody ng-repeat="item in deliveredReportList | orderBy:'PRINT_DATE'">
<tr> <tr>
<td><input type="checkbox" class="checkbox" value="{{item.PRINT_DATE}}" ng-checked="checkAll"></td> <td><input type="checkbox" class="checkbox" value="{{item.PRINT_DATE}}" ng-checked="checkAll"></td>
<td>{{item.PRINT_DATE | myDateFilter}}</td> <td>{{item.PRINT_DATE | myDateFilter}}</td>
<td ng-if="item.REPORT_TYPE ==0">个人邮寄</td>
<td ng-if="item.REPORT_TYPE ==1">对公邮寄</td>
<td>{{item.POST_COUNT}}</td> <td>{{item.POST_COUNT}}</td>
<td>{{item.DELIVERED_COUNT}}</td> <td>{{item.DELIVERED_COUNT}}</td>
<td>{{item.DELIVERED_FAILED_COUNT}}</td> <td>{{item.DELIVERED_FAILED_COUNT}}</td>
......
src/main/resources/static/views/queryDeliveredReport/queryDeliveredReport.js
View file @ c01619ba
...@@ -28,6 +28,12 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http' ...@@ -28,6 +28,12 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.queryDeliveredReport=function () { $scope.queryDeliveredReport=function () {
if ($("#notNull").val()==''){
var notNull =-1;
}else {
var notNull =$("#notNull").val();
}
;
var date1 = $("#datepicker1").val(); var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val(); var date2 = $("#datepicker2").val();
if(date1==''){ if(date1==''){
...@@ -36,7 +42,8 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http' ...@@ -36,7 +42,8 @@ angular.module("AvatarCheck.queryDeliveredReport",['ngRoute', 'AvatarCheck.http'
if(date2==''){ if(date2==''){
date2=$filter("date")(new Date(), "yyyy-MM-dd"); date2=$filter("date")(new Date(), "yyyy-MM-dd");
} }
HttpService.queryDeliveredReport(date1,date2,function (data) {
HttpService.queryDeliveredReport(date1,date2,notNull,function (data) {
$scope.deliveredReportList = data; $scope.deliveredReportList = data;
console.log($scope.deliveredReportList); console.log($scope.deliveredReportList);
}) })
......
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.html
View file @ c01619ba
...@@ -31,11 +31,12 @@ ...@@ -31,11 +31,12 @@
<tr> <tr>
<th style="text-align: center;">日期</th> <th style="text-align: center;">日期</th>
<th style="text-align: center;" colspan="2">普通证</th> <th style="text-align: center;" colspan="2">普通证</th>
<th style="text-align: center;" colspan="2">快证</th>
<th style="text-align: center;" colspan="2">重做登记</th>
<th style="text-align: center;" colspan="2">军人证</th>
<th style="text-align: center;" colspan="2">邮寄证</th> <th style="text-align: center;" colspan="2">邮寄证</th>
<th style="text-align: center;" colspan="2">补证</th> <th style="text-align: center;" colspan="2">军人证</th>
<th style="text-align: center;" colspan="2">快证</th>
<th style="text-align: center;" colspan="2">退回重制</th>
<th style="text-align: center;" >补证</th>
<th style="text-align: center;">制证数</th>
</tr> </tr>
<tr class="tr"> <tr class="tr">
<td></td> <td></td>
...@@ -50,28 +51,38 @@ ...@@ -50,28 +51,38 @@
<td>成品</td> <td>成品</td>
<td class="text-danger">废品</td> <td class="text-danger">废品</td>
<td>数量</td> <td>数量</td>
<td>数量</td>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in groupReportList | orderBy:date" style="border-top: 1px solid #f4f4f4;"> <tbody ng-repeat="item in groupReportList | orderBy:date" style="border-top: 1px solid #f4f4f4;">
<tr ng-if="item.date!='合计'"> <tr ng-if="item.date!='合计'">
<td>{{item.date | myDateFilter}}</td> <td>{{item.date | myDateFilter}}</td>
<!--普证-->
<td>{{item.list[0].VALID_COUNT}}</td> <td>{{item.list[0].VALID_COUNT}}</td>
<td>{{item.list[0].FAILED_COUNT}}</td> <td>{{item.list[0].FAILED_COUNT}}</td>
<!--邮寄证-->
<td>{{item.list[7].VALID_COUNT}}</td>
<td>{{item.list[7].FAILED_COUNT}}</td>
<!--军人证-->
<td>{{item.list[4].VALID_COUNT}}</td>
<td>{{item.list[4].FAILED_COUNT}}</td>
<!--快证-->
<td>{{item.list[1].VALID_COUNT}}</td> <td>{{item.list[1].VALID_COUNT}}</td>
<td>{{item.list[1].FAILED_COUNT}}</td> <td>{{item.list[1].FAILED_COUNT}}</td>
<!--重做登记-->
<td>{{item.list[2].VALID_COUNT}}</td> <td>{{item.list[2].VALID_COUNT}}</td>
<td>{{item.list[2].FAILED_COUNT}}</td> <td>{{item.list[2].FAILED_COUNT}}</td>
<td>{{item.list[4].VALID_COUNT}}</td> <!--补证-->
<td>{{item.list[4].FAILED_COUNT}}</td>
<td>{{item.list[7].VALID_COUNT}}</td>
<td>{{item.list[7].FAILED_COUNT}}</td>
<td>{{item.list[8].FAILED_COUNT}}</td> <td>{{item.list[8].FAILED_COUNT}}</td>
<!--制证数-->
<td>{{item.list[0].VALID_COUNT+item.list[1].VALID_COUNT+item.list[2].VALID_COUNT+
item.list[4].VALID_COUNT+item.list[7].VALID_COUNT+item.list[8].FAILED_COUNT}}</td>
</tr> </tr>
<tr ng-if="item.date=='合计'" class="bg-gray"> <tr ng-if="item.date=='合计'" class="bg-gray">
<td>{{item.date}}：</td> <td>{{item.date}}</td>
<td colspan="4">成品证：{{item.list.validCount}}</td> <td colspan="4">成品证：{{item.list.validCount}}</td>
<td colspan="4">废品证：{{item.list.failedCount}}</td> <td colspan="4">废品证：{{item.list.failedCount}}</td>
<td colspan="3">补证：{{item.list.buCount}}</td> <td colspan="4">补证：{{item.list.buCount}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
src/main/resources/static/views/receitp/receitp.html
View file @ c01619ba
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
<div class="box-header" style="border-bottom: 1px solid #e0e0e0;"> <div class="box-header" style="border-bottom: 1px solid #e0e0e0;">
<strong>交接单</strong> <strong>交接单</strong>
<div class="box-tools pull-right" > <div class="box-tools pull-right" >
<span>复核时间：</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/> <span>至</span> <span>复核时间：</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker2" readonly/> <input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate" id="datepicker1" readonly/>
<span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="choseDate_end" id="datepicker2" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchHistory()">查询历史</button>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchReceitp()">查询</button> <button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="doSearchReceitp()">查询</button>
</div> </div>
...@@ -118,11 +120,12 @@ ...@@ -118,11 +120,12 @@
<table class="table table-hover postTable"> <table class="table table-hover postTable">
<thead> <thead>
<tr> <tr>
<th width="10%"><input type="checkbox" ng-model="all"></th> <th><input type="checkbox" ng-model="all"></th>
<th width="30%">派出所代码</th> <th>派出所代码</th>
<th width="30%">派出所名称</th> <th>派出所名称</th>
<th width="20%">证件数量</th> <th>证件数量</th>
<th width="10%">操作</th> <th>操作</th>
<th>交接单打印时间</th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in type.countyList"> <tbody ng-repeat="item in type.countyList">
...@@ -132,6 +135,7 @@ ...@@ -132,6 +135,7 @@
<td style="color: #3c8dbc">{{item.countyName}}</td> <td style="color: #3c8dbc">{{item.countyName}}</td>
<td>{{item.countyValidCount}}</td> <td>{{item.countyValidCount}}</td>
<td><a ng-click="showPoliceList($index)">派出所列表</a></td> <td><a ng-click="showPoliceList($index)">派出所列表</a></td>
<td>{{item.receiptDate}}</td>
</tr> </tr>
<tr ng-show="$index==taskId"> <tr ng-show="$index==taskId">
<td colspan="7" style="padding: 0;"> <td colspan="7" style="padding: 0;">
...@@ -149,7 +153,7 @@ ...@@ -149,7 +153,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="police in item.policeList"> <tr ng-repeat="police in item.policeList | orderBy:'QR_CODE'">
<td><input type="checkbox" ng-checked="all" name="checkPolice{{type.typeCode}}{{item.countyCode}}" value="{{police.ID}}" class="checkPoliceBox"></td> <td><input type="checkbox" ng-checked="all" name="checkPolice{{type.typeCode}}{{item.countyCode}}" value="{{police.ID}}" class="checkPoliceBox"></td>
<td>{{$index+1}}</td> <td>{{$index+1}}</td>
<td>{{police.GAJG_DM}}</td> <td>{{police.GAJG_DM}}</td>
...@@ -190,44 +194,44 @@ ...@@ -190,44 +194,44 @@
</div> </div>
</div> </div>
</div> </div>
<div id="divPrint{{$index}}" ng-repeat="idx in result" style="display: none"> <div id="divPrint{{$index}}" ng-repeat="idx in result" >
<div class="title" style="text-align: center;"> <!--<div class="title" style="text-align: center;">-->
北京市公安局证件制作管理中心交接岗位<br /> <!--北京市公安局证件制作管理中心交接岗位<br />-->
身份证交接单</div> <!--身份证交接单</div>-->
<div>交接日期：{{receitpDataToPrint.date}}</div> <!--<div>交接日期：{{receitpDataToPrint.date}}</div>-->
<div>送至：</div> <!--<div>送至：</div>-->
<table cellpadding="0" cellspacing="0" border="1" style="text-align: center;font-size: 10pt;"> <table cellpadding="0" cellspacing="0" width="740px" style="text-align: center;" border="1px" ng-show="false" >
<thead> <thead>
<tr height="24"> <tr>
<th width="60" style="text-align: center;"> <th width="60">
序号 序号
</th> </th>
<th width="150" style="text-align: center;"> <th width="130">
身份证受理组号 身份证受理组号
</th> </th>
<th width="300"colspan="2" style="text-align: center;"> <th colspan="2">
身份证所属派出所名称 身份证所属派出所名称
</th> </th>
<th width="80" style="text-align: center;"> <th width="80">
数量 数量
</th> </th>
<th width="145" style="text-align: center;"> <th width="145">
备注 备注
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody ng-repeat="item in idx.policeList"> <tbody ng-repeat="item in idx.policeList | orderBy:'QR_CODE'">
<tr height="20"> <tr height="25mm" style="font-size: 11pt;">
<td width="60"> <td width="60" >
{{item.id}} {{$index+1}}
</td> </td>
<td width="150" style="text-align: left;padding-left: 7px;"> <td width="130" style="text-align: center;">
{{item.QR_CODE}} {{item.QR_CODE}}
</td> </td>
<td width="300"colspan="2" style="text-align: left;padding-left: 7px;"> <td colspan="2" style="text-align: left;">
{{item.COUNTYNAME}}{{item.GAJG_MC}} {{item.COUNTYNAME}}{{item.GAJG_MC}}
</td> </td>
<td width="80" style="text-align: left; padding-left: 7px;"> <td width="80" style="text-align: center;">
{{item.FINISH_COUNT}} {{item.FINISH_COUNT}}
</td> </td>
<td width="145"> <td width="145">
...@@ -236,7 +240,7 @@ ...@@ -236,7 +240,7 @@
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr ng-if="idx.value==0"> <tr ng-if="idx.value==0" height="25pt">
<td colspan="2" class="center"> <td colspan="2" class="center">
合计 合计
</td> </td>
...@@ -251,27 +255,27 @@ ...@@ -251,27 +255,27 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3" style="height: 110px;text-align: left;"> <td colspan="3" style="height:26mm;text-align: left;">
<div>实发：</div> <div> 实 发 ：</div>
<br /> <br />
<div class="sign"> <div class="sign">
交付人（签字）： 交付人（签字）：
</div> </div>
<br /> <br />
<div class="signdate"> <div class="signdate">
日期： 日 期 ：
</div> </div>
</td> </td>
<td colspan="3" style="height: 110px;text-align: left;"> <td colspan="3" style="height:26mm;text-align: left;">
<div>实收：</div> <div> 实 收 ：</div>
<br /> <br />
<div class="sign"> <div class="sign">
接收人（签字）： 接收人（签字）：
</div> </div>
<br /> <br />
<div class="signdate"> <div class="signdate">
日期： 日 期 ：
</div> </div>
</td> </td>
</tr> </tr>
......
src/main/resources/static/views/receitp/receitp.js
View file @ c01619ba
...@@ -27,7 +27,8 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -27,7 +27,8 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
autoclose: 1 autoclose: 1
}); });
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd 00:00:00");
$scope.choseDate_end = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
$scope.downloadGAinfo = function(){ $scope.downloadGAinfo = function(){
...@@ -218,20 +219,22 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http']) ...@@ -218,20 +219,22 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
LODOP.PRINT_INIT("打印交接单"); LODOP.PRINT_INIT("打印交接单");
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4"); LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
LODOP.ADD_PRINT_TEXT(10, 0, "100%", 20, "北京市公安局证件制作管理中心交接岗位"); LODOP.ADD_PRINT_TEXT(10, 0, "100%", 20, "北京市公安局证件制作管理中心交接岗位");
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); // LODOP.SET_PRINT_STYLEA(1, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2); LODOP.SET_PRINT_STYLEA(1, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 15); LODOP.SET_PRINT_STYLEA(1, "FontSize", 16);
LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, "身份证交接单"); LODOP.ADD_PRINT_TEXT(35, 0, "100%", 20, "身份证交接单");
LODOP.SET_PRINT_STYLEA(0, "Bold", 1); // LODOP.SET_PRINT_STYLEA(2, "Bold", 1);
LODOP.SET_PRINT_STYLEA(0, "Alignment", 2); LODOP.SET_PRINT_STYLEA(2, "Alignment", 2);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 15); LODOP.SET_PRINT_STYLEA(2, "FontSize", 16);
LODOP.ADD_PRINT_TEXT(70, 33, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date); LODOP.ADD_PRINT_TEXT(70, 20, "100%", 20, "交接日期："+$scope.receitpDataToPrint.date);
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10); LODOP.SET_PRINT_STYLEA(3, "FontSize", 12);
LODOP.ADD_PRINT_TEXT(90, 33, "100%", 20, "送至："); LODOP.ADD_PRINT_TEXT(90, 20, "100%", 20, "送至：");
LODOP.SET_PRINT_STYLEA(0, "FontSize", 10); LODOP.SET_PRINT_STYLEA(4, "FontSize", 10);
LODOP.ADD_PRINT_TABLE(110, 30, 750, "100%", document.getElementById("divPrint"+i).innerHTML); LODOP.ADD_PRINT_TABLE(110, "2mm",740, "100%", document.getElementById("divPrint"+i).innerHTML);
LODOP.SET_PRINT_STYLEA(0, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(0, "Vorient", 3); // LODOP.SET_PRINT_STYLEA(5, "Bold", 0);
LODOP.SET_PRINT_STYLEA(5, "HOrient", 2);
LODOP.SET_PRINT_STYLEA(5, "Vorient", 3);
LODOP.SET_PRINTER_INDEXA(-1); LODOP.SET_PRINTER_INDEXA(-1);
// LODOP.PREVIEW(); // LODOP.PREVIEW();
LODOP.PRINT(); LODOP.PRINT();
......
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html
View file @ c01619ba
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
<div class="box box-primary"> <div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;"> <table class="table table-bordered" style="margin-bottom: 0;">
<tr> <tr>
<td>反向运单号:</td> <td>正向运单号:</td>
<td><input type="text" class="form-control" ng-model="waybillNumber" placeholder="反向运单号"></td> <td><input type="text" class="form-control" ng-model="waybillNumber" placeholder="正向运单号"></td>
<td>身份证号码:</td> <td>身份证号码:</td>
<td><input type="text" class="form-control" ng-model="cardId" placeholder="身份证号码"></td> <td><input type="text" class="form-control" ng-model="cardId" placeholder="身份证号码"></td>
<td>退回原因:</td> <td>退回原因:</td>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<thead> <thead>
<tr> <tr>
<th>No.</th> <th>No.</th>
<th>反向运单号</th> <th>正向运单号</th>
<th>身份证号码</th> <th>身份证号码</th>
<th>退回原因</th> <th>退回原因</th>
<th>登记人姓名</th> <th>登记人姓名</th>
......
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js
View file @ c01619ba
...@@ -58,7 +58,7 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht ...@@ -58,7 +58,7 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
console.log(arr,"=========="); console.log(arr,"==========");
var waybillNumberArr = []; var waybillNumberArr = [];
var json = { var json = {
backWaybillNumber:waybillNumber, waybillNumber:waybillNumber,
cardId:cardId cardId:cardId
}; };
waybillNumberArr.push(json); waybillNumberArr.push(json);
...@@ -74,7 +74,7 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht ...@@ -74,7 +74,7 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
} }
}) })
}else{ }else{
MessageService.showAlert("该反向邮件号不存在") MessageService.showAlert("该邮件号/身份证号不存在")
} }
}) })
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ c01619ba
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
</div> </div>
<div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1"> <div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1">
<button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardProd()">添加快证</button> <button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardProd()">添加快证</button>
<button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button> <button class="btn btn-danger" ng-click="giveBackCardProd()">退证</button>
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ c01619ba
...@@ -283,7 +283,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin ...@@ -283,7 +283,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
LODOP.PRINT_INIT("打印封口签"); LODOP.PRINT_INIT("打印封口签");
//设置纸张大小 //设置纸张大小
// LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", "CreateCustomPage"); // LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", "CreateCustomPage");
LODOP.SET_PRINT_PAGESIZE(1, "80mm", "50mm", ""); LODOP.SET_PRINT_PAGESIZE(1, "79mm", "49mm", "");
// LODOP.SET_PRINT_STYLE("FontName", "黑体"); // LODOP.SET_PRINT_STYLE("FontName", "黑体");
//设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】 //设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
LODOP.ADD_PRINT_BARCODE(24,12, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString()); LODOP.ADD_PRINT_BARCODE(24,12, "78mm", "20mm", "128A", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
......
src/main/resources/static/views/task/task.js
View file @ c01619ba
...@@ -187,12 +187,21 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http']) ...@@ -187,12 +187,21 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
if (typeCode==100){ if (typeCode==100){
HttpService.updateFailedCardWorkGroup(json,function(data) { HttpService.updateFailedCardWorkGroup(json,function(data) {
console.log(data) console.log(data)
$scope.searchTaskList(); if($scope.isHistory==0){
$scope.searchTaskList();
}else{
$scope.searchHistory();
}
}) })
}else { }else {
HttpService.updateWorkGroup(json,function(data) { HttpService.updateWorkGroup(json,function(data) {
console.log(data) console.log(data)
$scope.searchTaskList(); if($scope.isHistory==0){
$scope.searchTaskList();
}else{
$scope.searchHistory();
}
}) })
} }
......
src/main/resources/static/views/task/taskListPrint.html
View file @ c01619ba
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
<table class="table table-hover table-striped"> <table class="table table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" ng-click="selectAll(type.countyList,$event)" ng-checked="isSelectedAll($index)"></th>
<th>任务单编号</th> <th>任务单编号</th>
<th>核验日期</th> <th>核验日期</th>
<th>组数</th> <th>组数</th>
...@@ -156,6 +157,7 @@ ...@@ -156,6 +157,7 @@
</thead> </thead>
<tbody ng-repeat="task in type.countyList"> <tbody ng-repeat="task in type.countyList">
<tr> <tr>
<td><input type="checkbox" id="checkOneBox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}" name="{{task.countyValidCount-task.specialCount}}" ng-click="updateSelection($event,task)"></td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td> <td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td> <td class="mailbox-subject">{{task.saveDate | date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject">{{task.groupList.length}}</td> <td class="mailbox-subject">{{task.groupList.length}}</td>
...@@ -200,7 +202,19 @@ ...@@ -200,7 +202,19 @@
</div> </div>
</div> </div>
<!-- /.mail-box-messages --> <!-- /.mail-box-messages -->
<div class="box-footer">
<div class="pull-left">
<select class="form-control" id="selectedGroup" style="border-radius:5px">
<option value="1">A组</option>
<option value="2">B组</option>
</select>
</div>
<div class="pull-left" style="margin-left: 10px;">
<button class="btn btn-info" ng-click="updateGroup()">更新工作组</button>
</div>
</div>
</div> </div>
<div ng-if="cycleSheetData.length==0"> <div ng-if="cycleSheetData.length==0">
<h4>暂无数据</h4> <h4>暂无数据</h4>
</div> </div>
......
src/main/resources/static/views/updatePass/updatePass.js
View file @ c01619ba
...@@ -10,11 +10,13 @@ angular.module('AvatarCheck.updatePass', ['ngRoute', 'AvatarCheck.http']) ...@@ -10,11 +10,13 @@ angular.module('AvatarCheck.updatePass', ['ngRoute', 'AvatarCheck.http'])
}); });
}]) }])
.controller('updatePassCtrl',function($scope,HttpService,MessageService) { .controller('updatePassCtrl',function($scope,$rootScope,HttpService,MessageService) {
$scope.updPassword = function (password,newPwd) { $scope.updPassword = function (password,newPwd) {
HttpService.updatePass(password,newPwd,function(data){ var json ={"password":password,"newPwd":newPwd,"userId":$rootScope.loginData.id}
HttpService.updatePass(json,function(data){
console.log(data) console.log(data)
if(data.string=='-1'){ if(data.string=='-1'){
MessageService.showAlert("旧密码输入有误，请重新输入"); MessageService.showAlert("旧密码输入有误，请重新输入");
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ c01619ba
...@@ -54,14 +54,34 @@ ...@@ -54,14 +54,34 @@
<td><input type="text" class="form-control" ng-model="gkxx" placeholder="格口"></td> <td><input type="text" class="form-control" ng-model="gkxx" placeholder="格口"></td>
<td>区县:</td> <td>区县:</td>
<td style="text-align: left;"> <td style="text-align: left;">
<select class="form-control select2" id="county" multiple="multiple" data-placeholder="--请选择区县--" <select class="form-control select2"
style="width: 100%;" ng-model="currentCounty"> id="county"
<option value="{{county.countyname}}" ng-repeat="county in countyList">{{county.countyname}}</option> multiple="multiple"
data-placeholder="--请选择区县--"
style="width: 100%;"
ng-model="currentCounty">
<option value="东城区" >东城区</option>
<option value="西城区" >西城区</option>
<option value="朝阳区" >朝阳区</option>
<option value="海淀区" >海淀区</option>
<option value="丰台区" >丰台区</option>
<option value="石景山区" >石景山区</option>
<option value="房山区" >房山区</option>
<option value="门头沟区" >门头沟区</option>
<option value="顺义区" >顺义区</option>
<option value="平谷区" >平谷区</option>
<option value="怀柔区" >怀柔区</option>
<option value="密云区" >密云区</option>
<option value="昌平区" >昌平区</option>
<option value="延庆区" >延庆区</option>
<option value="大兴区" >大兴区</option>
<option value="通州区" >通州区</option>
<option value="中关村科技园区" >中关村科技园区</option>
</select> </select>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Excel导入时间:</td> <td>Excel导入起始日期:</td>
<td> <td>
<div class="input-group date"> <div class="input-group date">
<div class="input-group-addon"> <div class="input-group-addon">
...@@ -71,6 +91,16 @@ ...@@ -71,6 +91,16 @@
<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>
<td>Excel导入截止日期:</td>
<td>
<div class="input-group date">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
<input type="text" class="form-control pull-right" value="{{choseDate}}" id="datepicker1" readonly/>
<span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
</div>
</td>
<td>打印状态:</td> <td>打印状态:</td>
<td style="text-align: left;"> <td style="text-align: left;">
<select class="form-control select2" id="print" <select class="form-control select2" id="print"
...@@ -80,7 +110,13 @@ ...@@ -80,7 +110,13 @@
<option value="0">未打印</option> <option value="0">未打印</option>
</select> </select>
</td> </td>
<td colspan="2"> </tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td colspan="2">
<div style="float: left"> <div style="float: left">
<button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button> <button class="btn btn-primary" style="margin-right: 7px;" ng-click="doQuery()">查询</button>
<button class="btn btn-primary" style="margin-right: 7px;" ng-click="subSomething()">读卡查询</button> <button class="btn btn-primary" style="margin-right: 7px;" ng-click="subSomething()">读卡查询</button>
...@@ -88,7 +124,7 @@ ...@@ -88,7 +124,7 @@
<button type="submit" class="btn btn-danger" ng-click="deleteRecords()"> 删除</button> <button type="submit" class="btn btn-danger" ng-click="deleteRecords()"> 删除</button>
</div> </div>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
...@@ -102,11 +138,12 @@ ...@@ -102,11 +138,12 @@
<tr> <tr>
<!--<th>NO.</th>--> <!--<th>NO.</th>-->
<th>订单号</th> <th>订单号</th>
<th>正向邮件号</th> <th>正-反向邮件号</th>
<th>反向邮件号</th>
<th>受理号</th> <th>受理号</th>
<th>申请人姓名</th> <th>申请人姓名</th>
<th>联系方式</th> <!--<th>身份证号</th>-->
<th>收件人姓名</th>
<th>收件人联系电话</th>
<th>地址</th> <th>地址</th>
<th>打印时间</th> <th>打印时间</th>
<th>操作</th> <th>操作</th>
...@@ -116,10 +153,13 @@ ...@@ -116,10 +153,13 @@
<tr ng-repeat="item in postData | orderBy:item.id"> <tr ng-repeat="item in postData | orderBy:item.id">
<!--<td>{{item.id}}</td>--> <!--<td>{{item.id}}</td>-->
<td>{{item.orderNumber}}</td> <td>{{item.orderNumber}}</td>
<td>{{item.waybillNumber}}</td> <td>{{item.waybillNumber}} -
<td>{{item.backWaybillNumber}}</td> {{item.backWaybillNumber}}
</td>
<td>{{item.firstWhite}}</td> <td>{{item.firstWhite}}</td>
<td>{{item.applicantName}}</td> <td>{{item.applicantName}}</td>
<!--<td>{{item.idCard}}</td>-->
<td>{{item.recipientName}}</td>
<td>{{item.recipientPhone}}</td> <td>{{item.recipientPhone}}</td>
<td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td> <td ng-click="showDetail(item)"><a>{{item.recipientAddress}}</a></td>
<td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td> <td>{{item.printDate | date:'yyyy-MM-dd hh:mm:ss'}}</td>
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js
View file @ c01619ba
...@@ -20,6 +20,14 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -20,6 +20,14 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1
}); });
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
//清除的代码 //清除的代码
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("");
...@@ -49,9 +57,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -49,9 +57,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
$scope.doQueryPage(); $scope.doQueryPage();
} }
} }
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getCountJson = function(){ var getCountJson = function(){
var date=$('#datepicker').val(); var date=$('#datepicker').val();
var date1=$('#datepicker1').val();
var notNull = $("#notNull").val(); var notNull = $("#notNull").val();
var json={}; var json={};
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
...@@ -91,14 +99,20 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -91,14 +99,20 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
json.notNull=notNull json.notNull=notNull
} }
if(date=='{{choseDate}}'){ if(date=='{{choseDate}}'){
json.uploadDate=$scope.choseDate; json.startDate=$scope.choseDate;
}else { }else {
json.uploadDate = $("#datepicker").val(); json.startDate = $("#datepicker").val();
}
if(date1=='{{choseDate}}'){
json.endDate=$scope.choseDate;
}else {
json.endDate = $("#datepicker1").val();
} }
return json; return json;
} }
var getJson = function () { var getJson = function () {
var date=$('#datepicker').val(); var date=$('#datepicker').val();
var date1=$('#datepicker1').val();
var notNull = $("#notNull").val(); var notNull = $("#notNull").val();
var json={}; var json={};
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
...@@ -133,9 +147,14 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -133,9 +147,14 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
json.getToCounty=[]; json.getToCounty=[];
} }
if(date=='{{choseDate}}'){ if(date=='{{choseDate}}'){
json.uploadDate=$scope.choseDate; json.startDate=$scope.choseDate;
}else {
json.startDate = $("#datepicker").val();
}
if(date1=='{{choseDate}}'){
json.endDate=$scope.choseDate;
}else { }else {
json.uploadDate = $("#datepicker").val(); json.endDate = $("#datepicker1").val();
} }
if(notNull==''){ if(notNull==''){
json.notNull = -1; json.notNull = -1;
...@@ -165,6 +184,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -165,6 +184,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
var getCountAndDownloadUrl = function (url) { var getCountAndDownloadUrl = function (url) {
var date=$('#datepicker').val(); var date=$('#datepicker').val();
var date1=$('#datepicker1').val();
if (angular.isDefined($scope.applicantName)) { if (angular.isDefined($scope.applicantName)) {
url = url + 'sqrxm=' + $scope.applicantName + '&'; url = url + 'sqrxm=' + $scope.applicantName + '&';
}else{ }else{
...@@ -180,10 +200,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -180,10 +200,10 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}else{ }else{
url = url + 'sequence=&'; url = url + 'sequence=&';
} }
if ($("#print").val() == 1 || $("#print").val() == -1) { if ($("#print").val() != '') {
url = url + 'hasPrinted=' + $("#print").val() + '&'; url = url + 'hasPrinted=' + $("#print").val() + '&';
}else{ }else{
url = url + 'hasPrinted=&'; url = url + 'hasPrinted=-1&';
} }
if (angular.isDefined($scope.gkxx)) { if (angular.isDefined($scope.gkxx)) {
url = url + 'gkxx=' + $scope.gkxx + '&'; url = url + 'gkxx=' + $scope.gkxx + '&';
...@@ -201,9 +221,14 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -201,9 +221,14 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
url = url + 'emailNo='+$scope.emailNo+'&'; url = url + 'emailNo='+$scope.emailNo+'&';
} }
if(date=='{{choseDate}}'){ if(date=='{{choseDate}}'){
url = url + 'uploadDate='+$scope.choseDate+'&'; url = url + 'startDate='+$scope.choseDate+'&';
}else { }else {
url = url + 'uploadDate='+$("#datepicker").val()+'&'; url = url + 'startDate='+$("#datepicker").val()+'&';
}
if(date1=='{{choseDate}}'){
url = url + 'endDate='+$scope.choseDate+'&';
}else {
url = url + 'endDate='+$("#datepicker1").val()+'&';
} }
return url + 't=' + Math.floor(Date.now()); return url + 't=' + Math.floor(Date.now());
} }
...@@ -214,6 +239,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -214,6 +239,7 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
} }
$scope.downloadExcel = function(){ $scope.downloadExcel = function(){
var date =$('#datepicker').val(); var date =$('#datepicker').val();
var date1 =$('#datepicker1').val();
ngDialog.open({ ngDialog.open({
template: 'dialogs/confirmToDownload.html' + urlTimeStamp(), template: 'dialogs/confirmToDownload.html' + urlTimeStamp(),
width: 800, width: 800,
...@@ -221,7 +247,8 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -221,7 +247,8 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
closeByDocument:false, closeByDocument:false,
controller: ['$scope',function ($scope) { controller: ['$scope',function ($scope) {
getCount() getCount()
$scope.importDate = date; $scope.importStartDate = date;
$scope.importEndDate = date1;
$scope.confirmDownload = function () { $scope.confirmDownload = function () {
var url = '../personPostApi/download?'; var url = '../personPostApi/download?';
var a = document.createElement("a"); var a = document.createElement("a");
...@@ -315,19 +342,22 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -315,19 +342,22 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
var getPost = $scope.doQuery; var getPost = $scope.doQuery;
$scope.deleteRecords = function () { $scope.deleteRecords = function () {
var importDate = $("#datepicker").val(); var importDate = $("#datepicker").val();
var importDate1 = $("#datepicker1").val();
console.log(importDate,importDate1)
ngDialog.open({ ngDialog.open({
template: 'dialogs/confirm.html' + urlTimeStamp(), template: 'dialogs/confirm.html' + urlTimeStamp(),
width: 600, width: 600,
cache: false, cache: false,
closeByDocument: false, closeByDocument: false,
controller: ['$scope', 'HttpService', 'MessageService', function ($scope, HttpService, MessageService) { controller: ['$scope', 'HttpService', 'MessageService', function ($scope, HttpService, MessageService) {
$scope.importDate = importDate; $scope.importStartDate = importDate;
HttpService.getChooseDateRecordsCount(importDate, function (data) { $scope.importEndDate = importDate1;
HttpService.getChooseDateRecordsCount(importDate,importDate1, function (data) {
$scope.total = data; $scope.total = data;
console.log($scope.total) console.log($scope.total)
}) })
$scope.confirmDelete = function () { $scope.confirmDelete = function () {
HttpService.deleteRecordsNotPrinted(importDate, function (data) { HttpService.deleteRecordsNotPrinted(importDate,importDate1, function (data) {
$scope.closeThisDialog(); $scope.closeThisDialog();
// MessageService.showAlert("删除成功。") // MessageService.showAlert("删除成功。")
getPost(); getPost();
...@@ -372,7 +402,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http ...@@ -372,7 +402,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
}) })
} }
}] }]
}); });
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ c01619ba
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
<td> <td>
<button class="btn btn-primary" ng-click="analysis(item.date,item.packageCount)">解析</button> <button class="btn btn-primary" ng-click="analysis(item.date,item.packageCount)">解析</button>
<button class="btn btn-danger" ng-click="deleteDataById(item.date,item.packageCount)">删除</button> <button class="btn btn-danger" ng-click="deleteDataById(item.date,item.packageCount)">删除</button>
<button class="btn btn-primary" ng-click="check(item.date)">检查</button>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ c01619ba
...@@ -86,6 +86,31 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -86,6 +86,31 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
} }
}) })
} }
$scope.UpdateIdcard=function(fileid){
HttpService.analyseToUpdateIdcard(fileid,function(data){
if(data){
$scope.wrongMsg = "清除标记成功"
getData();
}else{
$scope.wrongMsg = "清除标记失败"
}
})
}
}]
});
}
$scope.check = function (uploadDate) {
ngDialog.open({
template: 'dialogs/checkDialog.html' + urlTimeStamp(),
width: 876,
cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) {
HttpService.checkData(uploadDate, function (data) {
$scope.list = data;
})
}] }]
}); });
......
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