Skip to content

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

修改异地证系统的废证、交接单

parent 6dd677bf
Expand all Show whitespace changes
Inline Side-by-side
Showing with 615 additions and 189 deletions
src/main/java/com/yxproject/start/api/ReportApi.java
View file @ 22708494
......@@ -61,9 +61,9 @@ public class ReportApi {
* @return
*/
@RequestMapping("queryWorkGroupReport")
public List<Map<String, Object>> queryWorkGroupReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "workGroup") String workGroup) {
List<Map<String, Object>> mapList = taskListService.selectWorkGroupReport(replaceDate(startDate), replaceDate(endDate),workGroup);
return mapList;
public List<Map<String,Object>> queryWorkGroupReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate,@RequestParam(value = "workGroup") String workGroup) {
List<Map<String,Object>> map = taskListService.selectWorkGroupReport(replaceDate(startDate), replaceDate(endDate), workGroup);
return map;
}
/**
......@@ -82,17 +82,15 @@ public class ReportApi {
/**
* 查询报表
* 质检
* 质检 仓库
* @param startDate 开始时间
* @param endDate 结束时间
* @return
*/
@RequestMapping("queryQualityCheckReport")
public List<Map<String, Object>> queryQualityCheckReport(@RequestParam(value = "startDate") String startDate,@RequestParam(value = "endDate") String endDate) {
//todo
// List<Map<String, Object>> mapList = dataAuditingService.selectDataAuditingReport(startDate, endDate);
// return mapList;
return null;
List<Map<String, Object>> mapList = taskListService.selectQualityCheckReport(replaceDate(startDate), replaceDate(endDate));
return mapList;
}
/**
......
src/main/java/com/yxproject/start/mapper/FailedCardMapper.java
View file @ 22708494
......@@ -35,7 +35,7 @@ public interface FailedCardMapper {
"left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO " +
"left join failed_card on PROD_CARD_T.ACCEPT_NO = failed_card.ACCEPT_NO " +
" left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID =FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID"+
"WHERE PROD_CARD_T.ID_NO=#{cardId} OR PROD_CARD_T.ACCEPT_NO=#{cardId}")
" WHERE PROD_CARD_T.ID_NO=#{cardId} OR PROD_CARD_T.ACCEPT_NO=#{cardId}")
public Map<String,Object>selectInfoByCardId(@Param("cardId")String cardId);
......@@ -96,7 +96,7 @@ public interface FailedCardMapper {
@Select("select substr(ACCEPT_NO,0,8) from PROD_CARD_T where ID_NO in" +
" (#{cardList})group by substr(ACCEPT_NO,0,8);")
" (#{cardList}) group by substr(ACCEPT_NO,0,8)")
public List<String> selectGroupNo(@Param("cardIdList") String cardIdList);
......
src/main/java/com/yxproject/start/mapper/TaskListMapper.java
View file @ 22708494
......@@ -1488,22 +1488,44 @@ public interface TaskListMapper {
"group by CARD_TYPE, CARD_TYPE_ID, failed_count, PRINT_OUT_DATE")
public List<Map<String, Object>> selectFilmReport(@Param("startDate")String startDate,@Param("endDate") String endDate);
@Select("SELECT CARD_TYPE,CARD_TYPE_ID,SUM(valid_count) valid_count , failed_count,PUNCHING_DATE FROM (select CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT) valid_count ,\n" +
"failed_info.failed_count,to_char(PUNCHING_DATE,'yyyyMMdd') PUNCHING_DATE\n" +
"from task \n" +
"left join GROUP_NO on task.TASK_ID = GROUP_NO.TASK_ID\n" +
"left join SPECIAL_CARD on SPECIAL_CARD.TASK_ID = task.TASK_ID\n" +
"left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
"left join (\n" +
" select to_char(ALLOT_DATE,'yyyyMMdd') printDate ,count(FAILED_CARD_id) failed_count \n" +
" from FAILED_CARD where FAILED_CARD.WORK_GROUP = #{workGroup} GROUP BY to_char(ALLOT_DATE,'yyyyMMdd')\n" +
" ) failed_info on failed_info.printDate = to_char(PUNCHING_DATE,'yyyyMMdd')\n" +
"where to_char(PUNCHING_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} and task.WORK_GROUP = #{workGroup}\n" +
"group by task.task_id, task.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE, failed_info.failed_count, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
"decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT), to_char(PUNCHING_DATE,'yyyyMMdd')) \n" +
"group by CARD_TYPE, CARD_TYPE_ID, failed_count, PUNCHING_DATE")
// @Select("SELECT CARD_TYPE,CARD_TYPE_ID,SUM(valid_count) valid_count , failed_count,PUNCHING_DATE FROM (select CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT) valid_count ,\n" +
// "failed_info.failed_count,to_char(PUNCHING_DATE,'yyyyMMdd') PUNCHING_DATE\n" +
// "from task \n" +
// "left join GROUP_NO on task.TASK_ID = GROUP_NO.TASK_ID\n" +
// "left join SPECIAL_CARD on SPECIAL_CARD.TASK_ID = task.TASK_ID\n" +
// "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
// "left join (\n" +
// " select to_char(ALLOT_DATE,'yyyyMMdd') printDate ,count(FAILED_CARD_id) failed_count \n" +
// " from FAILED_CARD where FAILED_CARD.WORK_GROUP = #{workGroup} GROUP BY to_char(ALLOT_DATE,'yyyyMMdd')\n" +
// " ) failed_info on failed_info.printDate = to_char(PUNCHING_DATE,'yyyyMMdd')\n" +
// "where to_char(PUNCHING_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} and task.WORK_GROUP = #{workGroup}\n" +
// "group by task.task_id, task.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE, failed_info.failed_count, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
// "decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT), to_char(PUNCHING_DATE,'yyyyMMdd')) \n" +
// "group by CARD_TYPE, CARD_TYPE_ID, failed_count, PUNCHING_DATE")
// public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
@Select("select a.card_type,a.finish_date,a.work_group,sum(a.valid_count) valid_count,sum(decode(a.failed_count,null,0,a.failed_count)) failed_count from (\n" +
" select task.TASK_ID,card_type,to_char(punching_date,'yyyyMMdd') finish_date ,work_group,FAILED_CARD.failed_count,\n" +
" sum(decode(group_no.VALID_COUNT,null,1,group_no.VALID_COUNT-group_no.SPECIAL_CARD_COUNT)) valid_count\n" +
" from task \n" +
" left join group_no on task.TASK_ID = group_no.TASK_ID\n" +
" left join SPECIAL_CARD on task.TASK_ID = SPECIAL_CARD.TASK_ID\n" +
" left join (select TASK_ID,count(FAILED_CARD.accept_no) failed_count \n" +
" from FAILED_CARD \n" +
" group by TASK_ID\n" +
" ) FAILED_CARD on FAILED_CARD.TASK_ID = task.TASK_ID\n" +
" where to_char(punching_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} and task.WORK_GROUP = #{workGroup} \n" +
" group by task.TASK_ID, card_type, to_char(punching_date,'yyyyMMdd'), work_group, FAILED_CARD.failed_count\n" +
" ) a group by a.card_type, a.finish_date, a.work_group")
public List<Map<String, Object>> selectWorkGroupReport(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
@Select("select to_char(FINISH_DATE,'yyyyMMdd')FINISH_DATE,WORK_GROUP,count(FAILED_CARD.accept_no) failed_count \n" +
"from FAILED_CARD \n" +
"where to_char(FINISH_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} and WORK_GROUP = #{workGroup}\n" +
"group by to_char(FINISH_DATE,'yyyyMMdd'),WORK_GROUP")
public List<Map<String, Object>> selectWorkGroupReportBu(@Param("startDate")String startDate,@Param("endDate") String endDate,@Param("workGroup") String workGroup);
@Update("update task set work_group = ${workGroup} where TASK_ID = ${taskId}")
public boolean updateWorkGroup(@Param("taskId")String taskId,@Param("workGroup") long workGroup);
......@@ -1542,4 +1564,26 @@ public interface TaskListMapper {
@Delete("delete task where task_id = ${taskId}")
public boolean deleteTaskByTaskId(@Param("taskId")long taskId);
@Select("select a.card_type,a.finish_date,sum(a.valid_count) valid_count,sum(decode(a.failed_count,null,0,a.failed_count)) failed_count from (\n" +
" select task.TASK_ID,card_type,to_char(punching_date,'yyyyMMdd') finish_date ,FAILED_CARD.failed_count,\n" +
" sum(decode(group_no.VALID_COUNT,null,1,group_no.VALID_COUNT-group_no.SPECIAL_CARD_COUNT)) valid_count\n" +
" from task \n" +
" left join group_no on task.TASK_ID = group_no.TASK_ID\n" +
" left join SPECIAL_CARD on task.TASK_ID = SPECIAL_CARD.TASK_ID\n" +
" left join (select TASK_ID,count(FAILED_CARD.accept_no) failed_count \n" +
" from FAILED_CARD \n" +
" group by TASK_ID\n" +
" ) FAILED_CARD on FAILED_CARD.TASK_ID = task.TASK_ID\n" +
" where to_char(punching_date,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
" group by task.TASK_ID, card_type, to_char(punching_date,'yyyyMMdd'), FAILED_CARD.failed_count\n" +
" ) a group by a.card_type, a.finish_date")
public List<Map<String, Object>> selectQualityCheckReport(@Param("startDate")String startDate,@Param("endDate") String endDate);
@Select("select to_char(FINISH_DATE,'yyyyMMdd')FINISH_DATE,count(FAILED_CARD.accept_no) failed_count \n" +
"from FAILED_CARD \n" +
"where to_char(FINISH_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
"group by to_char(FINISH_DATE,'yyyyMMdd')")
public List<Map<String, Object>> selectQualityCheckReportBu(@Param("startDate")String startDate,@Param("endDate") String endDate);
}
src/main/java/com/yxproject/start/service/TaskListService.java
View file @ 22708494
......@@ -109,4 +109,6 @@ public interface TaskListService {
public List<Map<String,Object>> selectRedoTask(String date);
public boolean deleteRedoTask(long taskId);
public List<Map<String,Object>> selectQualityCheckReport(String startDate,String endDate);
}
src/main/java/com/yxproject/start/service/impl/ReceiptServiceImpl.java
View file @ 22708494
......@@ -333,7 +333,7 @@ public class ReceiptServiceImpl implements ReceiptService {
}
} else {
if ((((countyMapList.get(i)).get("QR_CODE")) + "").length() == 8) {
nsList.add(Integer.parseInt((((countyMapList.get(i)).get("QR_CODE")) + "")));
nsList.add(Integer.parseInt((((countyMapList.get(i)).get("QR_CODE")) + "").substring(1, (((countyMapList.get(i)).get("QR_CODE")) + "").length())));
}
}
}
......
src/main/resources/static/dialogs/confirmFailedCards.html
View file @ 22708494
......@@ -8,6 +8,7 @@
<th>身份证号</th>
<th>姓名</th>
<th>性别</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="item in personInfo">
......@@ -20,7 +21,7 @@
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==0">废证</td>
<td ng-if="item.SPECIAL_TYPE==null&&item.NAME!='查无此人'">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
</tr>
</tbody>
......
src/main/resources/static/dialogs/confirmRestCards.html
View file @ 22708494
......@@ -21,7 +21,7 @@
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==0">废证</td>
<td ng-if="item.SPECIAL_TYPE==null&&item.NAME!='查无此人'">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
</tr>
</tbody>
......
src/main/resources/static/dialogs/confirmTagCards.html
View file @ 22708494
......@@ -8,6 +8,7 @@
<th>身份证号</th>
<th>姓名</th>
<th>性别</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="item in personInfo">
......@@ -20,7 +21,7 @@
<td ng-if="item.SEX_NO==-1">错误</td>
<td ng-if="item.SPECIAL_TYPE==2">快证</td>
<td ng-if="item.SPECIAL_TYPE==1">余证</td>
<td ng-if="item.SPECIAL_TYPE==0">废证</td>
<td ng-if="item.SPECIAL_TYPE==null&&item.NAME!='查无此人'">废证</td>
<td ng-if="item.SPECIAL_TYPE==3">退证</td>
</tr>
</tbody>
......
src/main/resources/static/index.html
View file @ 22708494
......@@ -81,8 +81,9 @@
<!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><span><img src="newTheme/dist/img/logo.jpg" style="width:25px;height:25px;"></span></span>
<!-- logo for regular state and mobile devices -->
<span class="logo-lg" style="font-size: 14px;">
北京市公安局证件制作管理中心
<span class="logo-lg">
<span ng-if="loginData.roleList[0].process!=8">北京制证辅助平台</span>
<span ng-if="loginData.roleList[0].process==8">邮政管理系统</span>
</span>
</a>
<!-- Header Navbar: style can be found in header.less -->
......@@ -113,10 +114,17 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li class="dropdown user">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-user"></i>
<span class="hidden-xs" ng-bind="loginData.name"></span>
</a>-->
<a class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-user"></i>
<span class="hidden-xs" ng-bind="loginData.name"></span>
</a>
<ul class="dropdown-menu" style="padding: 0;">
<li class="header" style="text-align: center;"><a style="padding: 8px;" href="#!/updatePass"><strong>修改密码</strong></a></li>
</ul>
</li>
<li class="dropdown user user-menu">
<a ng-click="logout()" class="btn btn-flat" style="background-color: #0c6ba2;border: 0"><i class="glyphicon glyphicon-off"></i>退出当前用户</a>
......@@ -198,5 +206,7 @@
<script src="views/filmReport/filmReport.js"></script>
<script src="views/dataCheckReport/dataCheckReport.js"></script>
<script src="views/blank/blank.js"></script>
<script src="views/addBackCard/addBackCard.js"></script>
<script src="views/updatePass/updatePass.js"></script>
</body>
</html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 22708494
......@@ -40,6 +40,8 @@ angular.module('AvatarCheck', [
'AvatarCheck.filmReport',
"AvatarCheck.dataCheckReport",
'AvatarCheck.cardReport',
'AvatarCheck.addBackCard',
'AvatarCheck.updatePass',
'AvatarCheck.blank'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!');
......@@ -192,7 +194,6 @@ angular.module('AvatarCheck', [
if($location.path()=="/saveDeliveredFailedInfo"){
$rootScope.tab = '/saveDeliveredFailedInfo';
}
if($location.path()=="/queryDeliveredReport"){
$rootScope.tab = '/queryDeliveredReport';
}
......@@ -214,6 +215,9 @@ angular.module('AvatarCheck', [
if($location.path()=="/dataCheckReport"){
$rootScope.tab = '/dataCheckReport';
}
if($location.path()=="/addBackCard"){
$rootScope.tab = '/addBackCard';
}
......
src/main/resources/static/js/service.js
View file @ 22708494
......@@ -25,7 +25,26 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
DebugService.debug($scope.ngDialogData)
}]
});
},
showAlertAndLogout: function (msg) {
ngDialog.openConfirm({
template: 'dialogs/alertLogin.html' + urlTimeStamp(),
width: 400,
cache: false,
data: msg,
controller: ['$scope','$rootScope','$location','localStorageService','HttpService', function ($scope,$rootScope,$location,localStorageService,HttpService) {
$scope.msgText = $scope.ngDialogData;
$scope.confirmYes = function() {
HttpService.logout(function(data) {
$scope.closeThisDialog();
localStorage.clear();
$rootScope.loginData = {userid:'用户未登录', login:false};
$location.path("/login");
})
}
}]
});
},
}
})
......@@ -981,6 +1000,30 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
aselectBackInfoData:function(date,name,success){
console.log(date,name);
$http({
method: 'GET',
url: "../TaskList/queryRedoTask",
params:{
date:date
},
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
addBackCardDataBySjhy:function(data,success){
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../TaskList/createRedoTask",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
giveBackCard:function(data,success) {
var body = JSON.stringify(data);
$http({
......@@ -1121,7 +1164,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
}
if(date2==""){
date1 = $filter("date")(new Date(), "yyyy-MM-dd");
date2 = $filter("date")(new Date(), "yyyy-MM-dd");
}
$http({
method: 'GET',
......@@ -1316,6 +1359,14 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
getCardBodyTypeList:function(success){
$http({
method: 'GET',
url: "../MaterialManagementApi/queryCardBodyDic" + urlTimeStamp()
}).then(function successCallback(response) {
success(response.data)
})
},
selectMaterialManagement:function(date,name,success) {
$http({
method: 'GET',
......@@ -1351,6 +1402,25 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
getFailedTypeList:function(success){
$http({
method: 'GET',
url: "../FailedCardApi/selectFailedCardDic" + urlTimeStamp()
}).then(function successCallback(response) {
success(response.data)
})
},
addHistoryCard:function(data,success){
var body = JSON.stringify(data);
$http({
method: 'POST',
url: "../FailedCardApi/insertHistoryCard",
data: body,
headers: {'Content-Type': 'application/json'}
}).then(function successCallback(response) {
success(response.data)
})
},
updateFilmStateData:function(id,success) {
$http({
method: 'GET',
......@@ -1377,6 +1447,19 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
selectBackDataInfo: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)
})
},
selectFilmData:function(date1, date2,operator, cardType,currPage,itemsPerPage,success) {
console.log(date1, date2,operator,cardType,currPage,itemsPerPage);
$http({
......@@ -1444,13 +1527,26 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success(response.data)
})
},
deleteFailedCard:function(failedCardId,success){
console.log(failedCardId)
deleteFailedCard:function(taskid,success){
$http({
method: 'GET',
url: "../FailedCardApi/deleteFailedCardInfo" + urlTimeStamp(),
url: "../TaskList/deleteRedoTask" + urlTimeStamp(),
params:{
failedCardId:cardid
taskId:taskid
}
}).then(function successCallback(response) {
success(response.data)
})
},
updatePass:function(password,newPwd,success){
console.log(password,newPwd,$rootScope.loginData.id);
$http({
method: 'GET',
url: "../user/updatePwd" + urlTimeStamp(),
params: {
password:password,
newPwd:newPwd,
userId:$rootScope.loginData.id
}
}).then(function successCallback(response) {
success(response.data)
......
src/main/resources/static/views/addFailed/addFailed.html
View file @ 22708494
......@@ -33,13 +33,13 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box" ng-if="loginData.roleList[0].process==3">
<div class="box" ng-if="loginData.roleList[0].process!=2">
<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>
<span>废证数量:</span>
</td>
<td width="200px">
<input style="" type="number" ng-model="failedCount"></td>
......@@ -48,6 +48,13 @@
<input type="submit" ng-click="createInputs(failedCount)" class="btn btn-primary" value="确定">
</div>
</td>
<!--<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="restCount">-->
<!--<input type="submit" class="btn btn-primary" value="确定">-->
<!--<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>-->
<!--</form>-->
</tr>
</table>
<table class="table table-bordered" style="margin-bottom: 0;">
......@@ -109,8 +116,8 @@
<tr>
<th>NO.</th>
<th>受理组号</th>
<th>身份证号</th>
<th>姓名</th>
<th>身份证号</th>
<th>废证原因</th>
<th>保存时间</th>
<th>工作组</th>
......
src/main/resources/static/views/addFailed/addFailed.js
View file @ 22708494
......@@ -32,15 +32,15 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.failedInfo = data;
console.log($scope.failedInfo)
})
}
};
if($rootScope.loginData.login==true){
$scope.aselectFailedInfo();
}
HttpService.getFailedReasonListData(function(data) {
$scope.failedReason = data;
console.log(data)
})
$scope.createInputs = function(failedCount){
if(failedCount>0){
var count = failedCount;
......@@ -64,6 +64,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
var cancelAdd = $scope.cancelAdd;
var reGet = $scope.aselectFailedInfo;
$scope.addFailed = function(){
var array = [];
for(var i=0;i<$scope.arr.length;i++){
......@@ -94,7 +95,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
if(count>0){
MessageService.showAlert("身份证或者受理号不能为空")
}else{
console.log(list)
console.log(list);
ngDialog.open({
template: 'dialogs/confirmFailedCards.html' + urlTimeStamp(),
width: 800,
......@@ -118,7 +119,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.confirmAdd = function(){
HttpService.addFailedCard(list,function(data){
$scope.closeThisDialog();
// MessageService.showAlert("添加成功");
reGet();
cancelAdd();
console.log(data)
})
......@@ -139,7 +140,7 @@ angular.module('AvatarCheck.addFailed', ['ngRoute', 'AvatarCheck.http'])
$scope.confirmDelete = function () {
HttpService.deleteFailedCard(failedCardId,function(data) {
$scope.closeThisDialog();
$scope.aselectFailedInfo();
reGet();
})
};
}]
......
src/main/resources/static/views/addRest/addRest.html
View file @ 22708494
......@@ -13,7 +13,7 @@
<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>
<span>余证数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="restCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
......
src/main/resources/static/views/addRest/addRest.js
View file @ 22708494
......@@ -21,6 +21,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//查询余证
$scope.aselectRestInfo = function () {
var date = $('#datepicker').val();
......@@ -47,13 +48,14 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
}else{
MessageService.showAlert("请输入正确的数字")
}
}
};
$scope.cancelAddRest =function(){
$scope.arr = [];
}
};
var cancel=$scope.cancelAddRest;
var reGetData = $scope.aselectRestInfo;
$scope.addRest = function(){
var array = [];
var count = 0;
......@@ -92,6 +94,7 @@ angular.module('AvatarCheck.addRest', ['ngRoute', 'AvatarCheck.http'])
$scope.closeThisDialog();
// MessageService.showAlert("添加成功");
cancel();
reGetData();
console.log(data)
})
}
......
src/main/resources/static/views/addTag/addTag.html
View file @ 22708494
......@@ -10,7 +10,7 @@
<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>
<span>证件数量:</span>
<input style="margin-top:20px;height: 30px;" type="number" ng-model="tagCount">
<input type="submit" class="btn btn-primary" value="确定">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
......
src/main/resources/static/views/addTag/addTag.js
View file @ 22708494
......@@ -32,7 +32,7 @@ angular.module('AvatarCheck.addTag', ['ngRoute', 'AvatarCheck.http'])
}
var cancelAdd = $scope.cancelAdd
var cancelAdd = $scope.cancelAdd;
$scope.addTags = function(){
var array = [];
for(var i=0;i<$scope.arr.length;i++){
......
src/main/resources/static/views/cardReport/cardReport.html
View file @ 22708494
......@@ -30,7 +30,7 @@
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-default">
<div class="box">
<div class="box-header">
<strong>身份证卡体耗材统计报表</strong>
</div>
......@@ -47,11 +47,9 @@
</td>
<td>卡体类型:</td>
<td>
<select class="form-control select2" id="cardBodyType1">
<select class="form-control select2" id="cardBodyType1" data-placeholder="--请选择卡体类型--" style="width: 100%;">
<option value="0">全部</option>
<option value="1">身份证卡体</option>
<option value="2">台湾居住证卡体</option>
<option value="3">港澳居住证卡体</option>
<option value="{{item.CARD_BODY_TYPE_ID}}" ng-repeat="item in cardBodyTypeList">{{item.CARD_BODY_TYPE_NAME}}</option>
</select>
</td>
</tr>
......@@ -76,9 +74,9 @@
</div></td>
</tr>
</table>
<!--<div ng-if="cardBodyCountData.list.length==0">
<div ng-if="cardBodyCountData.list.length==1">
<h4 style="padding-left: 10px;">暂无数据</h4>
</div>-->
</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="cardBodyCountData.list.length>1">
<thead>
......@@ -95,37 +93,36 @@
<td>{{item.SAVE_DATE}}</td>
<td>{{item.COUNT1}}</td>
<td>{{item.COUNT2}}</td>
<td ng-if="item.CARD_BODY_TYPE==0"></td>
<td ng-if="item.CARD_BODY_TYPE==1">身份证卡体</td>
<td ng-if="item.CARD_BODY_TYPE==2">香港居住证卡体</td>
<td ng-if="item.CARD_BODY_TYPE==3">港澳居住证卡体</td>
<td ng-show="item.CARD_BODY_TYPE!=0">{{item.CARD_BODY_TYPE}}</td>
<td ng-show="item.CARD_BODY_TYPE==0"></td>
<td>{{item.NAME}}</td>
</tr>
</tbody>
</table>
<table class="table table-bordered bg-info">
<th>总计</th>
<th>
出库数:
<span ng-if="cardBodyCountData.total1==null">0</span>
<span ng-if="cardBodyCountData.total1!=null">{{cardBodyCountData.total1}}</span>
</th>
<th>
入库数
<span ng-if="cardBodyCountData.total2==null">0</span>
<span ng-if="cardBodyCountData.total2!=null">{{cardBodyCountData.total2}}</span>
</th>
<th colspan="2">
库存：{{cardBodyCountData.total2-cardBodyCountData.total1}}
</th>
</table>
<div style="padding-left: 27%;" ng-if="cardBodyCountData.list.length>1">
<tm-pagination conf="paginationConf" class="ul"></tm-pagination>
</div>
</div>
</div>
</div>
<div class="box">
<div class="box-header">
<strong>卡体库存</strong>
</div>
<div class="box box-primary">
<table class="table table-bordered">
<thead>
<tr>
<th ng-repeat="name in cardBodyCountData.total">{{name.CARD_BODY_TYPE_NAME}}</th>
</tr>
</thead>
<tbody>
<tr>
<td ng-repeat="count in cardBodyCountData.total">{{count.TOTAL_COUNT}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/cardReport/cardReport.js
View file @ 22708494
......@@ -20,6 +20,13 @@ angular.module('AvatarCheck.cardReport', ['ngRoute', 'AvatarCheck.http', 'tm.pag
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getCardTypeList = function () {
HttpService.getCardBodyTypeList(function(data) {
$scope.cardBodyTypeList = data;
console.log($scope.cardBodyTypeList)
});
};
getCardTypeList();
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......
src/main/resources/static/views/createTaskList/createTaskList.html
View file @ 22708494
......@@ -31,7 +31,7 @@
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<strong>创建任务单</strong>
<strong>创建任务单(<span ng-bind="totalCardProd"></span>)</strong>
<div class="box-tools pull-right">
<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="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
......
src/main/resources/static/views/createTaskList/createTaskList.js
View file @ 22708494
......@@ -23,19 +23,19 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.totalCardProd = 0;
$scope.isHistory=0;
$scope.searchCurrent = function(){
$scope.totalCardProd = 0;
$scope.selected = [];
$scope.isHistory=0;
HttpService.getTaskListToCreate($('#datepicker').val(),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{
......@@ -49,10 +49,12 @@ angular.module('AvatarCheck.createTaskList', ['ngRoute', 'AvatarCheck.http', 'tm
$scope.searchCurrent();
$scope.searchHistory = function(){
$scope.totalCardProd = 0;
$scope.isHistory=1;
HttpService.getCreateHistoryTask($('#datepicker').val(),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{
......
src/main/resources/static/views/dispatchTask/dispatchTask.html
View file @ 22708494
......@@ -5,7 +5,7 @@
<div class="col-md-12">
<div class="box ">
<div class="box-header with-border">
<strong>请选择下发任务单</strong>
<strong>请选择下发任务单(<span ng-bind="totalCardProd"></span>)</strong>
<div class="box-tools pull-right">
<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="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;" ng-click="searchHistory()">查询历史</button>
......
src/main/resources/static/views/dispatchTask/dispatchTask.js
View file @ 22708494
......@@ -24,14 +24,16 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.totalCardProd = 0;
$scope.isHistory=0;
$scope.searchTaskList = function(){
$scope.totalCardProd = 0;
$scope.selected = [];
$scope.isHistory=0;
HttpService.getTaskListByProcess(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{
......@@ -44,10 +46,12 @@ angular.module('AvatarCheck.dispatchTask', ['ngRoute', 'AvatarCheck.http', 'tm.p
$scope.searchTaskList();
$scope.searchHistory = function(){
$scope.totalCardProd = 0;
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),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{
......
src/main/resources/static/views/excelAndSearch/excelAndSearch.html
View file @ 22708494
......@@ -79,7 +79,7 @@
</div>
<div class="box ">
<strong class="box-header with-border">格口文件管理</strong>
<div class="box box-primary" >
<div class="box box-primary" style="margin-bottom: 0;">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>上传时间:</td>
......@@ -114,7 +114,7 @@
</tr>
</table>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0;">
<div class="box-info" style="padding-top: 0;">
<table class="table table-bordered table-hover postTable" ng-if="postPackageData.length>0">
<thead>
<tr>
......
src/main/resources/static/views/filmManagement/filmManagement.html
View file @ 22708494
......@@ -32,7 +32,7 @@
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">添加膜耗材数据</strong>
<div class="box box-primary">
<form name="form" class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>数量:</td>
......@@ -48,12 +48,12 @@
<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>
<button class="btn btn-primary" ng-click="insertFilm()" ng-disabled="form.$invalid">提交</button>
</div>
</td>
</tr>
</table>
</div>
</form>
</div>
<div class="box box-default">
<div class="box-header">
......@@ -72,7 +72,7 @@
</div>
</td>
<td style="text-align: left;">
<button class="btn btn-primary" ng-click="selectMaterialManagement()">查询</button>
<button class="btn btn-primary" ng-click="selectFilmManagement()">查询</button>
</td>
</tr>
</table>
......@@ -85,7 +85,7 @@
<tr>
<th>NO.</th>
<th>保存时间</th>
<th>数量</th>
<th>数量(盒)</th>
<th>操作</th>
<th>备注</th>
<th>提交人</th>
......@@ -93,17 +93,32 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="item in filmManagement">
<tbody ng-repeat="item in filmManagement">
<tr ng-if="item.plasticFilmType==1" class="bg-gray">
<td>{{item.plasticFilmId}}</td>
<td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.totalCount}}</td>
<td>出库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<td ng-show="item.state==0">
<button class="btn btn-info" ng-click="updateFilmState(item)">
确认出库
</button>
</td>
<td ng-show="item.state==1">已确认</td>
</tr>
<tr ng-if="item.plasticFilmType==2">
<td>{{item.plasticFilmId}}</td>
<td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.totalCount}}</td>
<td ng-if="item.plasticFilmType==1">出库</td>
<td ng-if="item.plasticFilmType==2">入库</td>
<td>入库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<td ng-show="item.state==0">
<button class="btn btn-info" ng-click="updateFilmState(item)">确认审核</button>
<button class="btn btn-info" ng-click="updateFilmState(item)">
确认入库
</button>
</td>
<td ng-show="item.state==1">已确认</td>
</tr>
......
src/main/resources/static/views/filmManagement/filmManagement.js
View file @ 22708494
......@@ -55,9 +55,10 @@ angular.module('AvatarCheck.filmManagement', ['ngRoute', 'AvatarCheck.http'])
$scope.filmManagement = data;
console.log($scope.filmManagement,"$scope.filmManagement")
})
}
};
if($rootScope.loginData.login==true){
$scope.selectFilmManagement();
}
$scope.updateFilmState = function(item) {
HttpService.updateFilmStateData(item.plasticFilmId,function(data) {
$scope.selectFilmManagement();
......
src/main/resources/static/views/filmReport/filmReport.html
View file @ 22708494
......@@ -84,7 +84,7 @@
</tr>
</tbody>
</table>
<table class="table table-bordered bg-info">
<table class="table table-bordered bg-gray">
<th>总计</th>
<th>
出库数:
......
src/main/resources/static/views/historyCards/historyBack.html
View file @ 22708494
......@@ -8,12 +8,28 @@
<div class="col-md-12" style="margin-top:20px;">
<div class="box box-primary">
<strong class="box-header with-border">回迁证添加</strong>
<form style="padding-left: 15px;">
<table class="table table-bordered" style="margin-bottom:10px;">
<tr>
<td width="200px">
<span>回迁证数量:</span>
</td>
<td width="200px">
<input class="form-control" type="number" ng-model="historyCount"></td>
<td>
<div style="text-align: left;">
<input type="submit" ng-click="createHistoryInputs(historyCount)" class="btn btn-primary" value="确定">
</div>
</td>
<!--<form style="padding-left: 15px;">
<span style="font-size:20px;">回迁证数量:</span>
<input style="margin-top:20px;height: 30px;" type="text" ng-model="historyCount">
<input type="submit" class="btn btn-primary" value="确定" ng-click="createHistoryInputs()">
<span style="font-size:14px;color: red;" ng-if="errMsglb">{{errMsglb}}</span>
</form>
</form>-->
</tr>
</table>
<div style="padding: 15px;">
<table class="table table-bordered">
<tr ng-repeat="item in arr">
......@@ -22,34 +38,98 @@
身份证号:
</td>
<td>
<input type="text" placeholder="请填写身份证号" style="height: 34px;">
<input type="text" placeholder="请填写身份证号" class="{{$index}}" style="height: 34px;">
</td>
<td>
制证类型:
工作组:
</td>
<td>
<select class="form-control select2" id="state">
<option value="">普通证</option>
<option value="">邮寄证</option>
<select class="form-control select2 {{$index}}" id="workGroup">
<option value="1">A组</option>
<option value="2">B组</option>
</select>
</td>
<td>
地区:
废证类型：
</td>
<td>
<select class="form-control select2" id="state">
<option value="">回迁证</option>
<option value="">东城区</option>
<option value="">西城区</option>
<select class="form-control select2 {{$index}}" id="faildType">
<option value="{{item.failedCardReasonId}}" ng-repeat="item in selectFailedCardDic">{{item.failedCardReason}}</option>
</select>
</td>
<td>
备注:
</td>
<td>
<input type="text" placeholder="请填写备注" class="{{$index}}" style="height: 34px;">
</td>
</tr>
</table>
<div ng-if="arr.length>0" style="text-align: right;">
<button class="btn btn-primary">添加</button>
<button class="btn btn-primary" ng-click="addHistory()">提交</button>
<button class="btn btn-danger" ng-click="cancelAddHistory()">取消</button>
</div>
</div>
</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="datepicker" readonly/>
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="selectBackInfo()">查询</button>
</div>
</td>
</tr>
</table>
<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>
<th>提交人</th>
<th>状态</th>
<th>备注</th>
<th ng-if="loginData.roleList[0].process==2">操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in failedInfo">
<td>{{$index+1}}</td>
<th>{{item.ACCEPT_NO}}</th>
<td>{{item.CARD_NAME}}</td>
<td>{{item.ID_NO}}</td>
<th>{{item.FAILED_CARD_REASON_ID}}</th>
<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 == 2">B组</td>
<td>{{item.NAME}}</td>
<td>{{item.STATE}}</td>
<td>{{item.NOTE}}</td>
<td ng-if="loginData.roleList[0].process==2"><a ng-click="deleteFailed(item.FAILED_CARD_ID,item.ID_NO)">删除</a></td>
</tr>
</tbody>
</table>
<div ng-if="failedInfo.length==0">
<h4 style="padding-left: 10px;">暂无数据</h4>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/historyCards/historyBack.js
View file @ 22708494
......@@ -11,15 +11,119 @@ angular.module('AvatarCheck.historyBack', ['ngRoute', 'AvatarCheck.http'])
.controller('historyBackCtrl', function ($scope, $rootScope, $timeout, HttpService, ngDialog, MessageService, $filter) {
$scope.createHistoryInputs = function(){
//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");
//查询废证
$scope.selectBackInfo = function () {
var date = $('#datepicker').val();
if(date==""){
date=$scope.choseDate
}
HttpService.selectFailedInfo(date,$rootScope.loginData.name,function(data){
$scope.failedInfo = data;
console.log($scope.failedInfo)
})
};
if($rootScope.loginData.login==true){
HttpService.getFailedTypeList(function(data) {
$scope.selectFailedCardDic = data;
console.log($scope.selectFailedCardDic)
})
$scope.selectBackInfo();
}
$scope.createHistoryInputs = function(historyCount){
if(historyCount>0){
var count = historyCount;
if(count>10){
count=10;
}
$scope.arr = [];
for (var i=0;i<$scope.historyCount;i++){
for (var i=0;i<count;i++){
$scope.arr.push(i);
}
}else{
MessageService.showAlert("请输入正确的数字")
}
};
$scope.cancelAddHistory =function(){
$scope.arr = [];
};
var cancelAdd = $scope.cancelAdd;
var reGet = $scope.selectBackInfo;
$scope.addHistory = function () {
var array = [];
for(var i=0;i<$scope.arr.length;i++){
for (var j=0;j<$("."+i).length;j++){
array.push($("."+i)[j].value)
}
}
var result = [];
console.log(array)
for (var i = 0, j = array.length; i < j; i += 4) {
result.push(array.slice(i, i + 4));
}
console.log(result)
var list=[];
var count=0;
for (var i=0;i<result.length;i++){
if(result[i][0]==''){
count=count+1;
}else{
var json = {};
json.cardId=result[i][0];
json.workGroup=result[i][1];
json.failedCardReasonId = result[i][2];
json.note=result[i][3];
json.name=$rootScope.loginData.name;
list.push(json)
}
}
if(count>0){
MessageService.showAlert("身份证或者受理号不能为空")
}else{
console.log(list);
ngDialog.open({
template: 'dialogs/confirmFailedCards.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService','MessageService',function ($scope,HttpService,MessageService) {
var idCardArr =[];
for(var i=0;i<list.length;i++){
idCardArr.push(list[i].cardId);
}
HttpService.getPersonInfo(idCardArr,function(data){
$scope.personInfo = data;
$scope.can = false;
for(var i=0;i<$scope.personInfo.length;i++){
if($scope.personInfo[i].SEX_NO==-1){
$scope.can = true;
}
}
console.log($scope.personInfo)
});
console.log(list)
$scope.confirmAdd = function(){
HttpService.addHistoryCard(list,function(data){
$scope.closeThisDialog();
reGet();
cancelAdd();
console.log(data)
})
}
}]
});
}
}
});
\ No newline at end of file
src/main/resources/static/views/insertCardBody/insertCardBody.html
View file @ 22708494
......@@ -35,17 +35,15 @@
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<strong class="box-header">添加卡体耗材数据</strong>
<div class="box box-primary">
<form name="form" class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>数量:</td>
<td><input type="number" ng-model="totalCount" placeholder="数量"></td>
<td><input type="number" ng-model="totalCount" placeholder="数量" required></td>
<td>卡体类型:</td>
<td>
<select class="form-control select2" id="cardBodyType">
<option value="1">身份证卡体</option>
<option value="2">台湾居住证卡体</option>
<option value="3">港澳居住证卡体</option>
<select class="form-control select2" id="cardBodyType" data-placeholder="--请选择卡体类型--" style="width: 100%;">
<option value="{{item.CARD_BODY_TYPE_ID}}" ng-repeat="item in cardBodyTypeList">{{item.CARD_BODY_TYPE_NAME}}</option>
</select>
</td>
<td>操作:</td>
......@@ -59,12 +57,12 @@
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="insertCardBody()">提交</button>
<button class="btn btn-primary" ng-click="insertCardBody()" ng-disabled="form.$invalid">提交</button>
</div>
</td>
</tr>
</table>
</div>
</form>
</div>
<div class="box">
<div class="box-header">
......@@ -83,11 +81,9 @@
</td>
<td>卡体类型:</td>
<td>
<select class="form-control select2" id="cardBodyType1">
<select class="form-control select2" id="cardBodyType1" style="width: 100%;">
<option value="0">全部</option>
<option value="1">身份证卡体</option>
<option value="2">台湾居住证卡体</option>
<option value="3">港澳居住证卡体</option>
<option value="{{item.CARD_BODY_TYPE_ID}}" ng-repeat="item in cardBodyTypeList">{{item.CARD_BODY_TYPE_NAME}}</option>
</select>
</td>
<td>操作:</td>
......@@ -112,7 +108,8 @@
<tr>
<th>NO.</th>
<th>保存时间</th>
<th>数量</th>
<th>数量(张)</th>
<th>卡体类型</th>
<th>卡基类型</th>
<th>备注</th>
<th>提交人</th>
......@@ -121,25 +118,26 @@
</thead>
<tbody>
<tr ng-repeat="item in cardBodyManagement.cardBody">
<td>{{item.cardBodyId}}</td>
<td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</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>
<td>{{item.CARD_BODY_ID}}</td>
<td>{{item.SAVE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.TOTAL_COUNT}}</td>
<td>{{item.CARD_BODY_TYPE_NAME}}</td>
<td ng-if="item.CARD_TYPE==1">出库</td>
<td ng-if="item.CARD_TYPE==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>
<tr class="bg-info">
<tr class="bg-gray">
<th>合计</th>
<th colspan="2">出库数：</th>
<th ng-if="cardBodyManagement.cardCount1==null">0</th>
<th ng-if="cardBodyManagement.cardCount1!=null">{{cardBodyManagement.cardCount1}}</th>
<th colspan="2">入库数：</th>
<th ng-if="cardBodyManagement.cardCount2==null">0</th>
<th ng-if="cardBodyManagement.cardCount2!=null">{{cardBodyManagement.cardCount2}}</th>
<th colspan="2" ng-if="cardBodyManagement.cardCount2==null">0</th>
<th colspan="2" ng-if="cardBodyManagement.cardCount2!=null">{{cardBodyManagement.cardCount2}}</th>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/insertCardBody/insertCardBody.js
View file @ 22708494
......@@ -28,6 +28,14 @@ angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getCardTypeList = function () {
HttpService.getCardBodyTypeList(function(data) {
$scope.cardBodyTypeList = data;
console.log($scope.cardBodyTypeList)
});
};
getCardTypeList();
$scope.insertCardBody = function () {
var totalCount = $scope.totalCount;
......
src/main/resources/static/views/insertFilm/insertFilm.html
View file @ 22708494
......@@ -32,7 +32,7 @@
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">添加膜耗材数据</strong>
<div class="box box-primary">
<form name="form" class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>数量:</td>
......@@ -48,12 +48,12 @@
<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>
<button class="btn btn-primary" ng-click="insertFilm()" ng-disabled="form.$invalid">提交</button>
</div>
</td>
</tr>
</table>
</div>
</form>
</div>
<div class="box box-default">
<div class="box-header">
......@@ -88,7 +88,7 @@
<tr>
<th>NO.</th>
<th>提交时间</th>
<th>数量</th>
<th>数量(盒)</th>
<th>操作</th>
<th>备注</th>
<th>提交人</th>
......@@ -109,7 +109,7 @@
<td ng-if="item.state==1" class="text-success">已审核</td>
</tr>
<tr class="bg-info">
<tr class="bg-gray">
<th>合计</th>
<th colspan="2">出库数：</th>
<th ng-if="plasticFilmdata.plasticFilmCount1==null">0</th>
......
src/main/resources/static/views/materialManagement/materialManagement.html
View file @ 22708494
......@@ -35,17 +35,15 @@
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<strong class="box-header">添加卡体耗材数据</strong>
<div class="box box-primary">
<form name="form" class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>数量:</td>
<td><input type="number" class="form-control" ng-model="totalCount" placeholder="数量"></td>
<td><input type="number" class="form-control" ng-model="totalCount" placeholder="数量" required></td>
<td>卡体类型:</td>
<td>
<select class="form-control select2" id="cardBodyType">
<option value="1">身份证卡体</option>
<option value="2">香港居住证卡体</option>
<option value="3">港澳居住证卡体</option>
<select class="form-control select2" id="cardBodyType" data-placeholder="--请选择卡体类型--" style="width: 100%;">
<option value="{{item.CARD_BODY_TYPE_ID}}" ng-repeat="item in cardBodyTypeList">{{item.CARD_BODY_TYPE_NAME}}</option>
</select>
</td>
<td>操作:</td>
......@@ -59,12 +57,12 @@
</td>
<td>
<div style="text-align: left;">
<button class="btn btn-primary" ng-click="insertCardBody()">提交</button>
<button class="btn btn-primary" ng-click="insertCardBody()" ng-disabled="form.$invalid">提交</button>
</div>
</td>
</tr>
</table>
</div>
</form>
</div>
<div class="box">
<div class="box-header">
......@@ -96,26 +94,40 @@
<tr>
<th>NO.</th>
<th>保存时间</th>
<th>数量</th>
<th>卡基类型</th>
<th>数量(张)</th>
<th>卡体类型</th>
<th>操作</th>
<th>备注</th>
<th>提交人</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in materialManagement">
<td>{{item.cardBodyId}}</td>
<td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</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">
<button class="btn btn-info" ng-click="updateApplyState(item)">确认审核</button>
<tbody ng-repeat="item in materialManagement">
<tr ng-if="item.CARD_TYPE==1" class="bg-gray">
<td>{{item.CARD_BODY_ID}}</td>
<td>{{item.SAVE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.TOTAL_COUNT}}</td>
<td>{{item.CARD_BODY_TYPE_NAME}}</td>
<td>出库</td>
<td>{{item.NOTE}}</td>
<td>{{item.NAME}}</td>
<td ng-if="item.STATE==0">
<button class="btn btn-info" ng-click="updateApplyState(item.CARD_BODY_ID)">确认出库</button>
</td>
<td ng-if="item.STATE==1">已确认</td>
</tr>
<tr ng-if="item.CARD_TYPE==2">
<td>{{item.CARD_BODY_ID}}</td>
<td>{{item.SAVE_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.TOTAL_COUNT}}</td>
<td>{{item.CARD_BODY_TYPE_NAME}}</td>
<td>入库</td>
<td>{{item.NOTE}}</td>
<td>{{item.NAME}}</td>
<td ng-if="item.STATE==0">
<button class="btn btn-info" ng-click="updateApplyState(item.CARD_BODY_ID)">确认入库</button>
</td>
<td ng-if="item.state==1">已审核</td>
<td ng-if="item.STATE==1">已确认</td>
</tr>
</tbody>
</table>
......
src/main/resources/static/views/materialManagement/materialManagement.js
View file @ 22708494
......@@ -21,6 +21,12 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
var getCardTypeList = function () {
HttpService.getCardBodyTypeList(function(data) {
$scope.cardBodyTypeList = data;
console.log($scope.cardBodyTypeList)
});
};
$scope.insertCardBody = function () {
......@@ -59,11 +65,13 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
$scope.materialManagement = data;
console.log($scope.materialManagement,"$scope.materialManagement")
})
}
};
if($rootScope.loginData.login==true){
$scope.selectMaterialManagement();
$scope.updateApplyState = function(item) {
HttpService.updateApplyStateData(item.cardBodyId,function(data) {
getCardTypeList();
}
$scope.updateApplyState = function(CARD_BODY_ID) {
HttpService.updateApplyStateData(CARD_BODY_ID,function(data) {
$scope.selectMaterialManagement();
})
}
......
src/main/resources/static/views/querySortingReport/querySortingReport.js
View file @ 22708494
......@@ -16,8 +16,6 @@ angular.module("AvatarCheck.querySortingReport",['ngRoute', 'AvatarCheck.http'])
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
......@@ -37,6 +35,8 @@ angular.module("AvatarCheck.querySortingReport",['ngRoute', 'AvatarCheck.http'])
$scope.sortingReportList = data;
console.log($scope.sortingReportList);
})
}
};
if($rootScope.loginData.login==true){
$scope.querySortingReport();
})
\ No newline at end of file
}
});
\ No newline at end of file
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.html
View file @ 22708494
......@@ -21,7 +21,7 @@
</div>
<div ng-if="groupReportList.length>1">
<div class="mailbox-messages">
<table class="table table-hover">
<table class="table table-hover postTable" >
<thead>
<tr>
<th>日期</th>
......@@ -32,7 +32,7 @@
<th>废证</th>
</tr>
</thead>
<tbody ng-repeat="item in groupReportList | orderBy:date" ng-class="{true: 'bg-info', false: ''}[item.date=='合计']">
<tbody ng-repeat="item in groupReportList | orderBy:date" ng-class="{true: 'bg-gray', false: ''}[item.date=='合计']">
<tr>
<td>{{item.date}}</td>
<td>{{item.you}}</td>
......
src/main/resources/static/views/queryWorkGroupReport/queryWorkGroupReport.js
View file @ 22708494
......@@ -47,5 +47,7 @@ angular.module("AvatarCheck.queryWorkGroupReport",['ngRoute', 'AvatarCheck.http'
console.log($scope.groupReportList);
})
}
if($rootScope.loginData.login==true){
$scope.queryWorkGroupReport();
})
}
});
src/main/resources/static/views/tagPrint/tagPrint.html
View file @ 22708494
......@@ -47,7 +47,8 @@
<thead>
<tr>
<th>NO.</th>
<th>派出所代码</th>
<!--<th>派出所代码</th>-->
<th>受理组号</th>
<th>派出所名称</th>
<th>数量</th>
<th>打印卸载</th>
......@@ -58,7 +59,8 @@
<tbody>
<tr ng-click="showDetail(item)" ng-repeat="item in tagPrintData" class="{{item.styleClass}}">
<td>{{$index+1}}</td>
<td>{{item.POLICE_CODE}}</td>
<!--<td>{{item.POLICE_CODE}}</td>-->
<td>{{item.QR_CODE}}</td>
<td>{{item.GAJG_MC}}</td>
<td>{{item.FINISH_COUNT}}</td>
<td>{{item.download}}</td>
......
src/main/resources/static/views/task/task.js
View file @ 22708494
......@@ -44,9 +44,11 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.totalCardProd = 0;
$scope.isHistory=0;
$scope.searchTaskList = function(){
$('#datepicker').val($scope.choseDate)
$scope.totalCardProd = 0;
$scope.selected = [];
$rootScope.cardsTotal=0;
$scope.restCount=0;
......@@ -54,6 +56,7 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
HttpService.getTaskListByProcess(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{
......@@ -66,10 +69,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.searchTaskList();
$scope.searchHistory = function(){
$scope.totalCardProd = 0;
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),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{
......@@ -438,14 +443,17 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.totalCardProd = 0;
$scope.isHistory=0;
$scope.searchTaskList = function(){
$('#datepicker').val($scope.choseDate);
$scope.totalCardProd = 0;
$scope.selected = [];
$scope.isHistory=0;
HttpService.getDxrTaskListByProcess(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{
......@@ -458,10 +466,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.searchTaskList();
$scope.searchHistory = function(){
$scope.totalCardProd = 0;
$scope.isHistory=1;
HttpService.getHistoryTask($('#datepicker').val(),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{
......@@ -616,13 +626,17 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
$scope.totalCardProd = 0;
$scope.isHistory=0;
$scope.searchTaskList = function(){
$('#datepicker').val($scope.choseDate);
$scope.totalCardProd = 0;
$scope.selected = [];
$scope.isHistory=0;
HttpService.getFjTaskListByProcess(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{
......@@ -637,10 +651,12 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}
$scope.searchHistory = function(){
$scope.totalCardProd = 0;
$scope.isHistory=1;
HttpService.getFjHistoryTask($('#datepicker').val(),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{
......
src/main/resources/static/views/task/taskListEwriting.html
View file @ 22708494
......@@ -5,7 +5,7 @@
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<strong>任务单详情(<span ng-bind="totalCardProd"></span>)</strong>
<div class="box-tools pull-right">
<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="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
......
src/main/resources/static/views/task/taskListPrint.html
View file @ 22708494
......@@ -5,7 +5,7 @@
<div class="col-md-12">
<div class="box">
<div class="box-header with-border">
<strong>任务单详情</strong>
<strong>任务单详情(<span ng-bind="totalCardProd"></span>)</strong>
<div class="box-tools pull-right">
<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="datepicker" readonly/>
<button type="button" class="btn btn-primary pull-right" style="height: 30px;line-height: 17px;margin-left: 10px;" ng-click="searchTaskList()">当前</button>
......
src/main/resources/static/views/task/taskListSorting.html
View file @ 22708494
......@@ -3,7 +3,7 @@
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<div class="box-header with-border">
<strong>任务单详情</strong>
<strong>任务单详情(<span ng-bind="totalCardProd"></span>)</strong>
<div class="box-tools pull-right">
<input type="text"
style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;"
......
src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.html
View file @ 22708494
......@@ -136,5 +136,5 @@
<h4 ng-if="postData.length==0">暂无记录。</h4>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
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