Skip to content

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

查询提交人上传的废证详情

parent 01d623dd
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 16 deletions
src/main/resources/static/js/service.js
View file @ 0bd6a4f2
......@@ -907,6 +907,19 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
selectFailedInfo:function(date,name,success){
$http({
method: 'GET',
url: "../FailedCardApi/queryFailedCardInfo",
params:{
date:date,
name:name
},
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
giveBackCard:function(data,success) {
var body = JSON.stringify(data);
$http({
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ 0bd6a4f2
......@@ -3,20 +3,54 @@
text-align: center;
vertical-align: middle!important;
}
.select2-search__field {
height:30px;
}
.ul li{
cursor: pointer;
}
.table .colSpan{
column-span: 5;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<strong class="box-header with-border">废证添加</strong>
<div class="box box-primary">
<form ng-submit="createInputs()" style="padding-left: 15px;">
<span style="font-size:20px;">废证数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="failedCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
<div style="padding: 7px;">
<table class="table table-bordered">
<div class="box">
<strong class="box-header">废证添加</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom:10px;">
<tr>
<td width="200px">
<span style="font-size:20px;">废证数量:</span>
</td>
<td width="200px">
<input style="" type="number" ng-model="failedCount"></td>
<td>
<div style="text-align: left;">
<input type="submit" ng-click="createInputs()" class="btn btn-primary" value="确定">
</div>
</td>
</tr>
</table>
<table class="table table-bordered" style="margin-bottom: 0;">
<tr ng-repeat="item in arr">
<td>{{$index+1}}</td>
<td>
......@@ -40,13 +74,68 @@
</select>
</td>
</tr>
<tr ng-if="arr.length>0">
<td colspan="5"></td>
<td><button class="btn btn-primary" ng-click="addFailed()">提交</button></td>
<td><button class="btn btn-danger" ng-click="cancelAdd()">取消</button></td>
</tr>
</table>
</div>
</div>
<div class="box">
<div class="box-header">
<strong>废证提交详情</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td width="200px;">
<span>日期:</span>
</td>
<td width="200px;">
<input type="text" class="form-control" ng-model="choseDate" id="datepicker1" readonly/>
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="aselectFailedInfo()">查询</button>
</div>
</td>
</tr>
</table>
<div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary" ng-click="addFailed()">添加</button>
<button class="btn btn-danger" ng-click="cancelAdd()">取消</button>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="failedInfo.length>0">
<thead>
<tr>
<th>NO.</th>
<th>保存时间</th>
<th>数量</th>
<th>卡基类型</th>
<th>备注</th>
<th>提交人</th>
<th>状态</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in failedInfo">
<td>{{item.cardBodyId}}</td>
<td>{{item.saveDate}}</td>
<td>{{item.totalCount}}</td>
<td ng-if="item.cardType==1">出库</td>
<td ng-if="item.cardType==2">入库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<td ng-if="item.state==0" class="text-danger">未审核</td>
<td ng-if="item.state==1" class="text-success">已审核</td>
</tr>
</tbody>
<tbody ng-if="failedInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/addFailed/addFailed.js
View file @ 0bd6a4f2
......@@ -11,6 +11,30 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
.controller('addFailedCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var date = $('#datepicker').val();
if(angular.isUndefined(date)){
date=$scope.choseDate
}
//查询废证
$scope.aselectFailedInfo = function () {
HttpService.selectFailedInfo(date,$rootScope.loginData.name,function(data){
$scope.failedInfo = data;
console.log($scope.failedInfo)
})
}
$scope.aselectFailedInfo();
HttpService.getFailedReasonListData(function(data) {
$scope.failedReason = data;
console.log(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