Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 4d6f652c authored by dahai's avatar dahai
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 783de5a8 257fd941
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 165 deletions
src/main/resources/static/js/service.js
View file @ 4d6f652c
......@@ -1190,7 +1190,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
// String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name
insertCardBody:function (cardType,totalCount,note,name,success) {
insertCardBody:function (cardType,totalCount,note,cardBodyType,name,success) {
$http({
method: 'GET',
url: "../MaterialManagementApi/insertCardBody" + urlTimeStamp(),
......@@ -1198,7 +1198,8 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
cardType :cardType,
totalCount :totalCount,
note:note,
name:name
name:name,
cardBodyType:cardBodyType
}
}).then(function successCallback(response) {
......@@ -1206,7 +1207,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
})
},
// @Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name
selectCardBodyManagement:function (date1, date2, cardType, name,success) {
selectCardBodyManagement:function (date1, date2, cardType,cardBodyType,name,success) {
$http({
method: 'GET',
url: "../MaterialManagementApi/selectCardBodyManagement" + urlTimeStamp(),
......@@ -1214,9 +1215,9 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
beginDate :date1,
endDate :date2,
typeCode:cardType,
name:name
name:name,
cardBodyType:cardBodyType
}
}).then(function successCallback(response) {
success(response.data)
})
......
src/main/resources/static/views/insertCardBody/insertCardBody.js
View file @ 4d6f652c
......@@ -8,43 +8,6 @@ angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
});
}])
.controller('insertCardBodyContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.insertCardBody = function () {
var totalCount = $scope.totalCount;
var note = $scope.note;
var cardType = $scope.cardType;
var name = $rootScope.loginData.name;
console.log(totalCount,note,cardType,name)
if ($scope.cardType == null) {
MessageService.showAlert("请选择卡基类型")
} else {
HttpService.insertCardBody(cardType,totalCount, note, name, function (data) {
if(data==false){
MessageService.showAlert("插入失败")
}else{
MessageService.showAlert("插入成功")
}
console.log(data)
})
}
}
$scope.selectCardBodyManagement=function(){
var cardType = $scope.cardType2;
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var name = $rootScope.loginData.name;
if (cardType==null){
MessageService.showAlert("请选择卡基类型")
}else{
HttpService.selectCardBodyManagement(date1, date2, cardType, name, function (data) {
$scope.cardBodyManagement = data;
console.log(data)
})
}
}
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -54,10 +17,6 @@ angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
......@@ -68,8 +27,45 @@ angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.insertCardBody = function () {
var totalCount = $scope.totalCount;
var note = $scope.note;
var cardType = $scope.cardType;
var cardBodyType = $("#cardBodyType").val();
var name = $rootScope.loginData.name;
if(angular.isUndefined(cardType)){
cardType="1";
}
console.log(totalCount,note,cardType,cardBodyType,name);
HttpService.insertCardBody(cardType,totalCount,note,cardBodyType,name, function (data) {
if(data==false){
MessageService.showAlert("插入失败")
}else{
MessageService.showAlert("插入成功")
}
console.log(data)
})
}
$scope.selectCardBodyManagement=function(){
var cardType = $("#cardType2").val();
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var cardBodyType1 = $("#cardBodyType1").val();
if (date1==""){
date1=$scope.choseDate;
}
if (date2==""){
date2=$scope.choseDate;
}
var name = $rootScope.loginData.name;
console.log(date1, date2, cardType,cardBodyType1, name)
HttpService.selectCardBodyManagement(date1, date2, cardType,cardBodyType1,name, function (data) {
$scope.cardBodyManagement = data;
console.log(data)
})
}
$scope.selectCardBodyManagement();
})
\ No newline at end of file
src/main/resources/static/views/insertFilm/insertFilm.html
View file @ 4d6f652c
......@@ -31,71 +31,58 @@
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">插入膜耗材</strong>
<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" ng-model="totalCount" placeholder="数量"></td>
<td>
<input type="text" class="form-control" ng-model="totalCount" placeholder="数量" required>
</td>
<td>操作:</td>
<td>
<input type="radio" ng-model="plasticFilmType" name="type" value="1" ng-checked="true">出库
<input style="margin-left: 10px;" type="radio" ng-model="plasticFilmType" name="type" value="2">入库
</td>
<td>备注:</td>
<td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="insertFilm()">提交</button>
</div>
</td>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header">
<strong>查询膜耗材统计数据</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>膜类型:</td>
<td> <span>起始日期:</span></td>
<td>
<select class="form-control select2" ng-model="plasticFilmType">
<option value="">--请选择膜类型--</option>
<input type="text" class="form-control" ng-model="choseDate" id="datepicker1" readonly/>
</td>
<td> <span>结束日期:</span></td>
<td>
<input type="text" class="form-control" ng-model="choseDate" id="datepicker2" readonly/>
</td>
<td>操作:</td>
<td>
<select class="form-control select2" id="cardType2">
<option value="0">全部</option>
<option value="1">出库</option>
<option value="2">入库</option>
</select>
</td>
<td><div style="text-align: right;">
<button class="btn btn-primary" ng-click="insertFilm()">提交</button>
<td><div style="text-align: left;">
<button class="btn btn-primary" ng-click="selectPlasticFilmManagement()">查询</button>
</div></td>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header with-border">
<div><strong>查询膜耗材统计数据</strong></div>
<!--<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="startDate" 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="endDate" id="datepicker2" readonly/>-->
<!--<button class="btn btn-primary" ng-click="queryDeliveredByImportDate()">查询</button>-->
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td> <span>查询日期:</span></td>
<td><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" 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="endDate" id="datepicker2" readonly/>
</td>
<td>膜类型:</td>
<td>
<select class="form-control select2" ng-model="plasticFilmType2">
<option value="">--请选择膜类型--</option>
<option value="1">出库</option>
<option value="2">入库</option>
</select>
</td>
<td><div style="text-align: right;">
<button class="btn btn-primary" ng-click="selectPlasticFilmManagement()">查询</button>
</div></td>
</tr>
</table>
<!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
<!--{{paginationConf.totalItems}}条</span>)</div>-->
<div ng-if="plasticFilmdata.plasticFilm.length==0">
<h4>暂无数据</h4>
</div>
......
src/main/resources/static/views/insertFilm/insertFilm.js
View file @ 4d6f652c
......@@ -8,40 +8,7 @@ angular.module("AvatarCheck.insertFilm",['ngRoute', 'AvatarCheck.http'])
});
}])
.controller('insertFilmContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.insertFilm = function () {
var totalCount = $scope.totalCount;
var note = $scope.note;
var plasticFilmType = $scope.plasticFilmType;
var name = $rootScope.loginData.name;
if ($scope.plasticFilmType == null) {
MessageService.showAlert("请选择膜类型")
} else {
HttpService.insertFilm(totalCount, plasticFilmType, note, name, function (data) {
if(data==false){
MessageService.showAlert("插入失败")
}else{
MessageService.showAlert("插入成功")
}
console.log(data)
})
}
}
$scope.selectPlasticFilmManagement=function(){
var plasticFilmType = $scope.plasticFilmType2;
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var name = $rootScope.loginData.name;
if ($scope.plasticFilmType2==null){
MessageService.showAlert("请选择膜类型")
}else{
HttpService.selectPlasticFilmManagement(date1, date2, plasticFilmType, name, function (data) {
$scope.plasticFilmdata = data;
console.log(data)
})
}
}
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -51,10 +18,6 @@ angular.module("AvatarCheck.insertFilm",['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
......@@ -65,8 +28,43 @@ angular.module("AvatarCheck.insertFilm",['ngRoute', 'AvatarCheck.http'])
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.insertFilm = function () {
var totalCount = $scope.totalCount;
var note = $scope.note;
var plasticFilmType = $scope.plasticFilmType;
var name = $rootScope.loginData.name;
if(angular.isUndefined(plasticFilmType)){
plasticFilmType="1";
}
console.log(totalCount, plasticFilmType, note, name)
HttpService.insertFilm(totalCount, plasticFilmType, note, name, function (data) {
if(data==false){
MessageService.showAlert("插入失败")
}else{
MessageService.showAlert("插入成功")
}
console.log(data)
})
}
$scope.selectPlasticFilmManagement=function(){
var plasticFilmType = $("#cardType2").val();
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
if (date1==""){
date1=$scope.choseDate;
}
if (date2==""){
date2=$scope.choseDate;
}
var name = $rootScope.loginData.name;
console.log(date1, date2, plasticFilmType, name)
HttpService.selectPlasticFilmManagement(date1, date2, plasticFilmType, name, function (data) {
$scope.plasticFilmdata = data;
console.log(data)
})
}
$scope.selectPlasticFilmManagement();
})
\ No newline at end of file
src/main/resources/static/views/report/report.html
View file @ 4d6f652c
......@@ -18,12 +18,10 @@
<div ng-if="reportData.length==1">
<h4>暂无数据</h4>
</div>
<div ng-if="reportData.length>1">
<div class="table-responsive mailbox-messages" >
<div class="mailbox-messages">
<table class="table table-hover postTable">
<table class="table table-hover">
<thead>
<tr>
<th>打印日期</th>
......@@ -35,7 +33,7 @@
</tr>
</thead>
<tbody ng-repeat="item in reportData">
<tr style="background-color: #eee">
<tr>
<td>{{item.date}}</td>
<td style="color: #3c8dbc">{{item.pu}}</td>
<td>{{item.you}}</td>
......
src/main/resources/static/views/searchCard/searchCard.html
View file @ 4d6f652c
......@@ -28,7 +28,6 @@
<th>下发日期</th>
<th>膜打印</th>
<th>预定位</th>
<th>电写入</th>
<th>分拣</th>
<th>质检</th>
</thead>
......@@ -41,7 +40,6 @@
<td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.SORT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.QUALITY_TEST_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.OUT_STORAGE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
</tr>
......
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 4d6f652c
......@@ -27,6 +27,7 @@
<td style="text-align: center;vertical-align: middle!important;">至</td>
<td><input class="form-control" name="yxqend" type="text" ng-model="endDate" placeholder="截至日期"></td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="doQueryByIdCard(idCard,startDate,endDate)">查询</button>
<button class="btn btn-primary" ng-click="startReading()">开始读卡</button>
<button class="btn btn-primary" ng-click="endReading()">停止读卡</button>
</td>
......
src/main/resources/static/views/tagPrint/tagPrint.js
View file @ 4d6f652c
......@@ -14,16 +14,12 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
$scope.acceptNo = 'ACCEPT_NO';
//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 postParam={
idCard:'',
startDate:'',
endDate:''
}
$scope.json={
id:'',
......@@ -74,8 +70,6 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
}
getPoliceListDataNotChecked();
$scope.checkSame = function (id) {
HttpService.updateReceiptList(id,function(data) {
if(data){
......@@ -87,13 +81,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
})
}
var postParam={
idCard:'',
startDate:'',
endDate:''
}
var doQueryByIdCard = function(idcard,startDate,endDate){
$scope.doQueryByIdCard = function(idcard,startDate,endDate){
console.log(idcard,startDate,endDate)
HttpService.selectTagPrintData(idcard,startDate,endDate,function(data){
console.log(data)
......@@ -153,7 +141,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
postParam.idCard = myform.idCard.value;
postParam.startDate = myform.yxqstart.value;
postParam.endDate = myform.yxqend.value;
doQueryByIdCard(postParam.idCard,postParam.startDate,postParam.endDate);
$scope.doQueryByIdCard(postParam.idCard,postParam.startDate,postParam.endDate);
}
}
} else {
......
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