Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit febd932a authored by guantiantian's avatar guantiantian
Browse files
Options

制证包管理增加格口文件信息展示

parent 91cbc36d
Show whitespace changes
Inline Side-by-side
Showing with 201 additions and 95 deletions
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.html
View file @ febd932a
...@@ -29,6 +29,43 @@ ...@@ -29,6 +29,43 @@
</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 with-border">格口文件管理</strong>
<div class="box-info" style="padding-top: 0;">
<table class="table table-bordered table-hover postTable" ng-if="postPackageData.length>0">
<thead>
<tr>
<th>NO.</th>
<th>文件ID</th>
<th>订单起始日期</th>
<th>订单截至日期</th>
<th>文件名</th>
<th>上传时间</th>
<th>解析状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in postPackageData">
<td>{{$index+1}}</td>
<td>{{item.fileId}}</td>
<td>{{item.formStartTime | myDateFilter}}</td>
<td>{{item.formDeadline| myDateFilter}}</td>
<td>{{item.fileName}}</td>
<td>{{item.uploadDate | myDateFilter}}</td>
<td ng-if="item.state==0">未解析</td>
<td ng-if="item.state==1">已解析</td>
<td>
<button class="btn btn-danger" ng-disabled="item.state==1" ng-click="deletePostData(item.fileId,item.uploadDate)">删除</button>
</td>
</tr>
</tbody>
</table>
<div class="box-body" ng-if="postPackageData.length==0"><h4>暂无记录</h4></div>
</div>
</div>
<div class="box "> <div class="box ">
<strong class="box-header with-border">制证包上传</strong> <strong class="box-header with-border">制证包上传</strong>
<div class="box box-primary"> <div class="box box-primary">
......
src/main/resources/static/views/xmlAndSearch/xmlAndSearch.js
View file @ febd932a
'use strict'; "use strict"
angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.pagination']) angular
.config(['$routeProvider', function ($routeProvider) { .module("AvatarCheck.xmlAndSearch", [
$routeProvider.when('/xmlAndSearch', { "ngRoute",
templateUrl: 'views/xmlAndSearch/xmlAndSearch.html' + urlTimeStamp(), "AvatarCheck.http",
controller: 'xmlAndSearchCtrl', "tm.pagination",
cache: false ])
}); .config([
}]) "$routeProvider",
function ($routeProvider) {
.controller('xmlAndSearchCtrl', function ($scope, $rootScope, HttpService, $interval, MessageService, $timeout, $filter, ngDialog) { $routeProvider.when("/xmlAndSearch", {
templateUrl: "views/xmlAndSearch/xmlAndSearch.html" + urlTimeStamp(),
controller: "xmlAndSearchCtrl",
cache: false,
})
},
])
.controller(
"xmlAndSearchCtrl",
function (
$scope,
$rootScope,
HttpService,
$interval,
MessageService,
$timeout,
$filter,
ngDialog
) {
$("#id_file_photo_for_check").fileinput({ $("#id_file_photo_for_check").fileinput({
language: 'zh', language: "zh",
showUpload: false, showUpload: false,
showCaption: true, showCaption: true,
maxFileCount: 1024, maxFileCount: 1024,
showPreview: true, showPreview: true,
maxFileSize: 1024 * 30 maxFileSize: 1024 * 30,
}); })
//Date picker //Date picker
$('#datepicker').datetimepicker({ $("#datepicker").datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: "zh-CN",
format: 'yyyy-mm-dd', format: "yyyy-mm-dd",
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1,
}); })
$('#dateGrid').datetimepicker({ $("#dateGrid").datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒 minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN', language: "zh-CN",
format: 'yyyy-mm-dd', format: "yyyy-mm-dd",
todayBtn: 1, todayBtn: 1,
autoclose: 1 autoclose: 1,
}); })
//清除的代码 //清除的代码
$(".glyphicon-remove").click(function(){ $(".glyphicon-remove").click(function () {
$($($(this).parent()).prev()).val(""); $($($(this).parent()).prev()).val("")
}) })
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd")
$scope.gridDate = $filter("date")(new Date(), "yyyy-MM-dd"); $scope.gridDate = $filter("date")(new Date(), "yyyy-MM-dd")
$scope.paginationConf = { $scope.paginationConf = {
currentPage: 1, currentPage: 1,
itemsPerPage: 10, itemsPerPage: 10,
perPageOptions: [10, 20, 30, 40, 50] perPageOptions: [10, 20, 30, 40, 50],
}; }
$scope.getXmlPackage=function(){ $scope.getXmlPackage = function () {
if($scope.paginationConf.currentPage!=1){ if ($scope.paginationConf.currentPage != 1) {
$scope.paginationConf.currentPage=1; $scope.paginationConf.currentPage = 1
$scope.paginationConf.itemsPerPage=10; $scope.paginationConf.itemsPerPage = 10
}else{ } else {
$scope.getXmlPackagePage(); $scope.getXmlPackagePage()
} }
} }
$scope.getXmlPackagePage = function(){ $scope.getXmlPackagePage = function () {
// if($scope.paginationConf.currentPage==0){ // if($scope.paginationConf.currentPage==0){
// $scope.paginationConf.currentPage=1; // $scope.paginationConf.currentPage=1;
// } // }
HttpService.selectXmlPackage($("#datepicker").val(),$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function(data){ HttpService.selectXmlPackage(
$scope.paginationConf.totalItems=data.respData.count; $("#datepicker").val(),
$scope.xmlPackageData = data.respData.mapList; $scope.paginationConf.currentPage,
console.log($scope.xmlPackageData,"$scope.xmlPackageData") $scope.paginationConf.itemsPerPage,
}) function (data) {
$scope.paginationConf.totalItems = data.respData.count
$scope.xmlPackageData = data.respData.mapList
console.log($scope.xmlPackageData, "$scope.xmlPackageData")
}
)
} }
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目 // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.getXmlPackagePage); $scope.$watch(
"paginationConf.currentPage +paginationConf.itemsPerPage",
$scope.getXmlPackagePage
)
var getData = $scope.getXmlPackage; var getData = $scope.getXmlPackage
// $scope.analysis = function (uploadDate,packageCount) { // $scope.analysis = function (uploadDate,packageCount) {
// ngDialog.open({ // ngDialog.open({
// template: 'dialogs/analysisDialog.html' + urlTimeStamp(), // template: 'dialogs/analysisDialog.html' + urlTimeStamp(),
...@@ -111,11 +136,11 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -111,11 +136,11 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
// //
// } // }
$scope.analysis = function (uploadDate) { $scope.analysis = function (uploadDate) {
HttpService.analyseToUpdateIfPostCard(uploadDate,function(data){ HttpService.analyseToUpdateIfPostCard(uploadDate, function (data) {
if(data){ if (data) {
MessageService.showAlert("解析完成") MessageService.showAlert("解析完成")
getData(); getData()
}else{ } else {
MessageService.showAlert("解析失败，请联系管理员！") MessageService.showAlert("解析失败，请联系管理员！")
} }
}) })
...@@ -123,77 +148,84 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -123,77 +148,84 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.check = function (uploadDate) { $scope.check = function (uploadDate) {
ngDialog.open({ ngDialog.open({
template: 'dialogs/checkDialog.html' + urlTimeStamp(), template: "dialogs/checkDialog.html" + urlTimeStamp(),
width: 876, width: 876,
cache: false, cache: false,
controller: ['$scope','HttpService', function ($scope,HttpService) { controller: [
"$scope",
"HttpService",
function ($scope, HttpService) {
HttpService.checkData(uploadDate, function (data) { HttpService.checkData(uploadDate, function (data) {
$scope.list = data; $scope.list = data
})
},
],
}) })
}]
});
} }
$scope.uploadXml = function () { $scope.uploadXml = function () {
var fd = new FormData(); var fd = new FormData()
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector(
if(files.length==0){ "input#id_file_photo_for_check"
).files
if (files.length == 0) {
MessageService.showAlert("请选择上传的文件...") MessageService.showAlert("请选择上传的文件...")
}else{ } else {
for(var i in files){ for (var i in files) {
fd.append('file', files[i]); fd.append("file", files[i])
} }
ngDialog.openConfirm({ ngDialog.openConfirm({
template: 'dialogs/alert.html' + urlTimeStamp(), template: "dialogs/alert.html" + urlTimeStamp(),
width: 600, width: 600,
cache: false, cache: false,
closeByDocument:false, closeByDocument: false,
controller: ['$scope', function ($scope) { controller: [
$scope.wrongMsg =-1; "$scope",
function ($scope) {
$scope.wrongMsg = -1
$scope.msgText = "/////上传中，请稍等.../////" $scope.msgText = "/////上传中，请稍等.../////"
HttpService.uploadPackage(fd,function (data) { HttpService.uploadPackage(fd, function (data) {
if(angular.equals(data.code,"200")){ if (angular.equals(data.code, "200")) {
// $scope.closeThisDialog(); // $scope.closeThisDialog();
$scope.msgText = "上传成功！"; $scope.msgText = "上传成功！"
}else{ } else {
$scope.msgText=""; $scope.msgText = ""
$scope.wrongMsg = data.errMsg; $scope.wrongMsg = data.errMsg
} }
getData();//获取导入数据信息 getData() //获取导入数据信息
})
},
],
}) })
}]
});
} }
} }
var reGet = $scope.getXmlPackage; var reGet = $scope.getXmlPackage
$scope.deleteDataById = function(uploadDate,packageCount){ $scope.deleteDataById = function (uploadDate, packageCount) {
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', function ($scope) { controller: [
$scope.wrongMsg =-1; "$scope",
$scope.total = packageCount; function ($scope) {
$scope.importDate =uploadDate; $scope.wrongMsg = -1
$scope.total = packageCount
$scope.importDate = uploadDate
$scope.confirmDelete = function () { $scope.confirmDelete = function () {
HttpService.deleteProdDataByFileId(uploadDate, function (data) { HttpService.deleteProdDataByFileId(uploadDate, function (data) {
if(data.state==1){ if (data.state == 1) {
$scope.closeThisDialog(); $scope.closeThisDialog()
reGet(); reGet()
}else{ } else {
$scope.wrongMsg = data.msg; $scope.wrongMsg = data.msg
} }
}) })
}; }
},
}] ],
}); })
} }
// $scope.analysisMachineAcceptList = function(item) { // $scope.analysisMachineAcceptList = function(item) {
...@@ -244,5 +276,42 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p ...@@ -244,5 +276,42 @@ angular.module('AvatarCheck.xmlAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm.p
// }); // });
// } // }
}); $scope.paginationPostConf = {
currentPage: 1,
itemsPerPage: 10,
perPageOptions: [5, 10, 15, 20, 25],
}
$scope.chosePostDate = $filter("date")(new Date(), "yyyy-MM-dd")
$scope.getPostPackagePage = function () {
HttpService.selectPostPackageCount(
$scope.fileName,
$scope.state,
$scope.chosePostDate,
function (data) {
$scope.paginationPostConf.totalItems = data.respData.string
}
)
// if($scope.paginationConf.currentPage==0){
// $scope.paginationConf.currentPage=1;
// }
HttpService.selectPostPackage(
$scope.fileName,
$scope.state,
$scope.paginationPostConf.currentPage,
$scope.paginationPostConf.itemsPerPage,
$scope.chosePostDate,
function (data) {
$scope.postPackageData = data.respData
}
)
}
// 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
$scope.$watch(
"paginationPostConf.currentPage +paginationPostConf.itemsPerPage",
$scope.getPostPackagePage
)
}
)
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