Skip to content

Y
YX_IDENT_REFACTORING
Commit f73676d5 authored by Administrator's avatar Administrator
Browse files
Options

添加废证页面 

添加查询证件页面
添加受理信息页面
添加特殊证件页面
parent 53b2cac0
Hide whitespace changes
Inline Side-by-side
Showing with 1743 additions and 817 deletions
src/main/java/com/yxproject/start/entity/UserInfo.java
View file @ f73676d5
......@@ -19,6 +19,7 @@ public class UserInfo implements Serializable {
private String password;
private String salt;
private byte state;
private String workshop;
@ManyToMany(fetch= FetchType.EAGER)
@JoinTable(name = "SysUserRole", joinColumns = { @JoinColumn(name = "userId") }, inverseJoinColumns ={@JoinColumn(name = "roleId") })
private List<SysRole> roleList;
......@@ -78,4 +79,12 @@ public class UserInfo implements Serializable {
public void setRoleList(List<SysRole> roleList) {
this.roleList = roleList;
}
public String getWorkshop() {
return workshop;
}
public void setWorkshop(String workshop) {
this.workshop = workshop;
}
}
\ No newline at end of file
src/main/resources/static/dialogs/addFailedCard.html 0 → 100644
View file @ f73676d5
<div class="ui-dialog-title">
特殊证件列表
</div>
<div class="ui-dialog-content">
<table>
<tr>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>受理号</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</div>
src/main/resources/static/dialogs/addPermission.html
View file @ f73676d5
<div class="ui-dialog-title">
添加权限
</div>
......@@ -6,21 +5,21 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>名称</label>
<input type="text" class="form-control" ng-model="name" required >
<input type="text" class="form-control" ng-model="name" required>
</div>
<div class="form-group">
<label>资源路径</label>
<input type="text" class="form-control" ng-model="url" required >
<input type="text" class="form-control" ng-model="url" required>
</div>
<div class="form-group">
<label>权限字符串</label>
<input type="text" class="form-control" ng-model="permission" required >
<input type="text" class="form-control" ng-model="permission" required>
</div>
<div class="form-group">
<label>资源类型</label>
<div class="radio">
<label class="i-checks">
<input type="radio" ng-model="resourceType" value="menu">
<input type="radio" ng-model="resourceType" value="menu">
<i></i>
menu
</label>
......
src/main/resources/static/dialogs/addRole.html
View file @ f73676d5
<div class="ui-dialog-title">
添加角色
</div>
......@@ -6,16 +5,17 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>角色名称</label>
<input type="text" class="form-control" ng-model="role" required >
<input type="text" class="form-control" ng-model="role" required>
</div>
<div class="form-group">
<label>角色描述</label>
<input type="text" class="form-control" ng-model="description" required >
<input type="text" class="form-control" ng-model="description" required>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>权限</label>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId" ng-options="perm.id as perm.name for perm in activePermissionList"></select>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId"
ng-options="perm.id as perm.name for perm in activePermissionList"></select>
</div>
</div>
</form>
......
src/main/resources/static/dialogs/addUser.html
View file @ f73676d5
<div class="ui-dialog-title">
添加用户
</div>
......@@ -6,27 +5,29 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>用户名</label>
<input type="text" class="form-control" ng-model="username" required >
<input type="text" class="form-control" ng-model="username" required>
</div>
<div class="form-group">
<label>昵称</label>
<input type="text" class="form-control" ng-model="name" required >
<input type="text" class="form-control" ng-model="name" required>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>密码</label>
<input type="password" class="form-control" name="password" ng-model="password" required >
<input type="password" class="form-control" name="password" ng-model="password" required>
</div>
<div class="col-sm-6">
<label>确认密码</label>
<input type="password" class="form-control" name="confirm_password" required ng-model="confirm_password" ui-validate=" '$value==password' " ui-validate-watch=" 'password' ">
<input type="password" class="form-control" name="confirm_password" required ng-model="confirm_password"
ui-validate=" '$value==password' " ui-validate-watch=" 'password' ">
<span ng-show='form.confirm_password.$error.validator' style="color:red;">两次密码不一致！</span>
</div>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>角色</label>
<select class="form-control w-md" ng-model="roleId" ng-options="role.id as role.role for role in activeRoleList"></select>
<select class="form-control w-md" ng-model="roleId"
ng-options="role.id as role.role for role in activeRoleList"></select>
</div>
</div>
</form>
......
src/main/resources/static/dialogs/alert.html
View file @ f73676d5
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>{{msgText}}</div>
<div><span style="color: red">{{errText}}</span></div>
</div>
<div class="ui-dialog-confirm">
<button class="btn btn-info" ng-click="confirmYes()">确定</button>
</div>
<div class="ui-dialog-title">
提示
</div>
<div class="ui-dialog-content">
<div>{{msgText}}</div>
<div><span style="color: red">{{errText}}</span></div>
</div>
<div class="ui-dialog-confirm">
<button class="btn btn-info" ng-click="confirmYes()">确定</button>
</div>
src/main/resources/static/dialogs/specialCardList.html
View file @ f73676d5
<div class="ui-dialog-title">
特殊证件列表
</div>
<div class="ui-dialog-content">
<table>
<tr>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>受理号</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
</tr>
</tbody>
</table>
</td>
</tr>
<div class="ui-dialog-title">
特殊证件列表
</div>
<div class="ui-dialog-content">
<table>
<tr >
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>受理号</th>
<th>类型</th>
</thead>
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.acceptNo}}</td>
<td ng-if="specialCard.specialType==0">余证</td>
<td ng-if="specialCard.specialType==1">快证</td>
<td ng-if="specialCard.specialType==2">退证</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</div>
</table>
</div>
src/main/resources/static/dialogs/updatePerms.html
View file @ f73676d5
<div class="ui-dialog-title">
修改权限
</div>
......@@ -6,17 +5,18 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>名称</label>
<input type="text" class="form-control" ng-model="thisPerm.name" ng-value="thisPerm.name" required >
<input type="text" class="form-control" ng-model="thisPerm.name" ng-value="thisPerm.name" required>
</div>
<div class="form-group">
<label>权限字符串</label>
<input type="text" class="form-control" ng-model="thisPerm.permission" ng-value="thisPerm.permission" required >
<input type="text" class="form-control" ng-model="thisPerm.permission" ng-value="thisPerm.permission"
required>
</div>
<div class="form-group">
<label>资源类型</label>
<div class="radio">
<label class="i-checks">
<input type="radio" ng-model="resourceType" value="menu">
<input type="radio" ng-model="resourceType" value="menu">
<i></i>
menu
</label>
......
src/main/resources/static/dialogs/updateRole.html
View file @ f73676d5
<div class="ui-dialog-title">
修改角色
</div>
......@@ -6,16 +5,18 @@
<form name="form" class="form-validation">
<div class="form-group">
<label>角色名称</label>
<input type="text" class="form-control" ng-value="thisRole.role" ng-model="thisRole.role" required >
<input type="text" class="form-control" ng-value="thisRole.role" ng-model="thisRole.role" required>
</div>
<div class="form-group">
<label>角色描述</label>
<input type="text" class="form-control" ng-value="thisRole.description" ng-model="thisRole.description" required >
<input type="text" class="form-control" ng-value="thisRole.description" ng-model="thisRole.description"
required>
</div>
<div class="form-group pull-in clearfix">
<div class="col-sm-6">
<label>权限</label>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId" ng-options="perm.id as perm.name for perm in activePermissionList"></select>
<select ui-jq="chosen" multiple class="form-control w-md" ng-model="permissionId"
ng-options="perm.id as perm.name for perm in activePermissionList"></select>
</div>
</div>
</form>
......
src/main/resources/static/js/services/service.js
View file @ f73676d5
......@@ -452,6 +452,21 @@ app.service('MessageService', function (ngDialog) {
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
findFailedinfo:function(state,workShop,success){
$http({
method: 'GET',
url: "../user/findFailedinfo" + urlTimeStamp(),
params:{
workShop:workShop,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
}
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ f73676d5
......@@ -73,14 +73,14 @@
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
</td>
<td>{{city.state}}</td>
<td ng-if="userState<=4" ><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState>4" ><a ng-click="showTable(city.task_Id)">区县列表</a></td>
<td ng-if="userState<=4"><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTable(city.task_Id)">区县列表</a></td>
<td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td>
</tr>
<tr ng-show="showtable==city.task_Id && userState<=4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>组号</th>
<th>合格数量</th>
......@@ -104,7 +104,7 @@
<tr ng-show="showtable==city.task_Id && userState>4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>区县名称</th>
<th>卸载数量</th>
......@@ -128,7 +128,6 @@
</tr>
</tbody>
</table>
</div>
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ f73676d5
app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService','ngDialog', function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService,ngDialog) {
app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){
if ($rootScope.loginData.login === false) {
$state.go("signin")
}else {
} else {
$state.go("layout.cycleSheet")
}
$scope.userState=$rootScope.loginData.state;
$scope.userState = $rootScope.loginData.state;
// $scope.userState=5;
var getNowFormatDate = function () {
......@@ -18,10 +18,10 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + "/" + month +"/"+ strDate;
var currentdate = date.getFullYear() + "/" + month + "/" + strDate;
return currentdate;
}
$scope.today = function() {
$scope.today = function () {
$scope.dt = getNowFormatDate();
};
$scope.today();
......@@ -31,16 +31,16 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
};
// Disable weekend selection
$scope.disabled = function(date, mode) {
return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) );
$scope.disabled = function (date, mode) {
return (mode === 'day' && (date.getDay() === 0 || date.getDay() === 6));
};
$scope.toggleMin = function() {
$scope.toggleMin = function () {
$scope.minDate = $scope.minDate ? null : new Date();
};
$scope.toggleMin();
$scope.open = function($event) {
$scope.open = function ($event) {
$event.preventDefault();
$event.stopPropagation();
......@@ -56,14 +56,14 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
$scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1];
$scope.task_click = function(){
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====");
$scope.task_click = function () {
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====");
}
$scope.cardType =0;
$scope.check_type = function(typeCode){
cardType=typeCode;
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====",typeCode,"+++++++++++++");
$scope.cardType = 0;
$scope.check_type = function (typeCode) {
cardType = typeCode;
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====", typeCode, "+++++++++++++");
}
// // 查询制证类型列表
// var getTypeListData = function (state) {
......@@ -108,7 +108,6 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
// }
// // 查询区县列表
// var getCountyListData = function (taskId) {
// HttpService.getCountyListByTaskListId(taskId,function (data) {
......@@ -119,28 +118,210 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
// })
// }
$scope.typeList =[
{typeCode:0,typeCount:5000,typeName:'普通证'},
{typeCode:1,typeCount:5000,typeName:'邮寄证'},
{typeCode:2,typeCount:5000,typeName:'特殊证'},
{typeCode:9,typeCount:5000,typeName:'异地证'},
$scope.typeList = [
{typeCode: 0, typeCount: 5000, typeName: '普通证'},
{typeCode: 1, typeCount: 5000, typeName: '邮寄证'},
{typeCode: 2, typeCount: 5000, typeName: '特殊证'},
{typeCode: 9, typeCount: 5000, typeName: '异地证'},
]
$scope.cityList =[
{"card_Type":1,"citycode":"410300",cityName:"郑州",groupCount:10,groupSum:1500,groupInvailedSum:15,groupNO:"1-25","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811203,"task_State_Id":1},
{"card_Type":1,"citycode":"410400",cityName:"驻马店",groupCount:10,groupSum:2500,groupInvailedSum:16,groupNO:"26-45","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811204,"task_State_Id":1},
{"card_Type":1,"citycode":"410500",cityName:"新乡",groupCount:10,groupSum:3500,groupInvailedSum:17,groupNO:"46","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811205,"task_State_Id":1},
{"card_Type":1,"citycode":"410600",cityName:"周口",groupCount:10,groupSum:3500,groupInvailedSum:18,groupNO:"48-52,53-55","download_Date":null,"exception_Information":"","in_Storage_Date":null,"is_Exception":0,"issued_Date":null,"old_Card_Type":1,"out_Storage_Date":null,"out_Workshop_Date":null,"position_Date":null,"print_Out_Date":null,"print_State":0,"printer_Id":0,"quality_People_Name":"","quality_Test_Date":null,"submit_Date":{"date":20,"day":2,"hours":11,"minutes":20,"month":10,"seconds":53,"time":1542684053000,"timezoneOffset":-480,"year":118},"task_Id":201811206,"task_State_Id":1},
$scope.cityList = [
{
"card_Type": 1,
"citycode": "410300",
cityName: "郑州",
groupCount: 10,
groupSum: 1500,
groupInvailedSum: 15,
groupNO: "1-25",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811203,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410400",
cityName: "驻马店",
groupCount: 10,
groupSum: 2500,
groupInvailedSum: 16,
groupNO: "26-45",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811204,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410500",
cityName: "新乡",
groupCount: 10,
groupSum: 3500,
groupInvailedSum: 17,
groupNO: "46",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811205,
"task_State_Id": 1
},
{
"card_Type": 1,
"citycode": "410600",
cityName: "周口",
groupCount: 10,
groupSum: 3500,
groupInvailedSum: 18,
groupNO: "48-52,53-55",
"download_Date": null,
"exception_Information": "",
"in_Storage_Date": null,
"is_Exception": 0,
"issued_Date": null,
"old_Card_Type": 1,
"out_Storage_Date": null,
"out_Workshop_Date": null,
"position_Date": null,
"print_Out_Date": null,
"print_State": 0,
"printer_Id": 0,
"quality_People_Name": "",
"quality_Test_Date": null,
"submit_Date": {
"date": 20,
"day": 2,
"hours": 11,
"minutes": 20,
"month": 10,
"seconds": 53,
"time": 1542684053000,
"timezoneOffset": -480,
"year": 118
},
"task_Id": 201811206,
"task_State_Id": 1
},
]
$scope.groupList =[
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]},
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]},
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]}
]
$scope.groupList = [
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
},
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
},
{
"groupNO": 45,
"vaildCount": 45,
invaildCount: 25,
specialCardCount: 5,
specialCardList: [{acceptNo: 20180401, specialType: 1}, {acceptNo: 20180401, specialType: 1}]
}
]
$scope.countyList = [
{"countyName":"许昌县",county_Code:"411023",downloadCount:240,electric_writerCount:240,in_Storage_Count:240,out_Storage_Count:240,finish_Count:240},
{"countyName":"禹州",county_Code:"411081",downloadCount:210,electric_writerCount:210,in_Storage_Count:210,out_Storage_Count:210,finish_Count:210},
{"countyName":"长葛",county_Code:"411082",downloadCount:243,electric_writerCount:243,in_Storage_Count:243,out_Storage_Count:243,finish_Count:243}
{
"countyName": "许昌县",
county_Code: "411023",
downloadCount: 240,
electric_writerCount: 240,
in_Storage_Count: 240,
out_Storage_Count: 240,
finish_Count: 240
},
{
"countyName": "禹州",
county_Code: "411081",
downloadCount: 210,
electric_writerCount: 210,
in_Storage_Count: 210,
out_Storage_Count: 210,
finish_Count: 210
},
{
"countyName": "长葛",
county_Code: "411082",
downloadCount: 243,
electric_writerCount: 243,
in_Storage_Count: 243,
out_Storage_Count: 243,
finish_Count: 243
}
]
$scope.showtable = -1;
......@@ -157,39 +338,42 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
template: 'dialogs/specialCardList.html' + urlTimeStamp(),
width: 800,
cache: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService,$rootScope) {
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService, $rootScope) {
$scope.specialCardList = specialCardList;
}]
})
}
$scope.finishClick= function(taskId,userState){
HttpService.updateProductionTask(taskId,userState,function (data) {
$scope.finishClick = function (taskId, userState) {
HttpService.updateProductionTask(taskId, userState, function (data) {
//点击确认成功后 再次查询城市列表
getCityListData(cardType,$rootScope.loginData.state);
})
getCityListData(cardType, $rootScope.loginData.state);
})
}
$scope.folds = [
{id:1,name: '普通证', count:10000,filter:'',isActive:true, dataTable:{
{
id: 1, name: '普通证', count: 10000, filter: '', isActive: true, dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 4.0",
"platform": "Win 95+",
"version": "4",
"grade": "X"
},
{
"engine": "Trident",
"browser": "Internet Explorer 5.0",
"platform": "Win 95+",
"version": "5",
"grade": "C"
}]
}},
{id:2,name: '邮寄证', count:20000,filter:'starred', dataTable:{
{
"engine": "Trident",
"browser": "Internet Explorer 4.0",
"platform": "Win 95+",
"version": "4",
"grade": "X"
},
{
"engine": "Trident",
"browser": "Internet Explorer 5.0",
"platform": "Win 95+",
"version": "5",
"grade": "C"
}]
}
},
{
id: 2, name: '邮寄证', count: 20000, filter: 'starred', dataTable: {
"aaData": [
{
"engine": "Trident",
......@@ -212,63 +396,68 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
"version": "7",
"grade": "A"
}]
}},
{id:3,name: '军人证', count:32000,filter:'sent', dataTable:{
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
}]
}},
{id:4,name: '快证', count:40,filter:'important', dataTable:{
"aaData": [
{
"engine": "Webkit",
"browser": "Safari 1.3",
"platform": "OSX.3",
"version": "312.8",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 2.0",
"platform": "OSX.4+",
"version": "419.3",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 3.0",
"platform": "OSX.4+",
"version": "522.1",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "OmniWeb 5.5",
"platform": "OSX.4+",
"version": "420",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "iPod Touch / iPhone",
"platform": "iPod",
"version": "420.1",
"grade": "A"
}]
}}
}
},
{
id: 3, name: '军人证', count: 32000, filter: 'sent', dataTable: {
"aaData": [
{
"engine": "Trident",
"browser": "Internet Explorer 5.5",
"platform": "Win 95+",
"version": "5.5",
"grade": "A"
}]
}
},
{
id: 4, name: '快证', count: 40, filter: 'important', dataTable: {
"aaData": [
{
"engine": "Webkit",
"browser": "Safari 1.3",
"platform": "OSX.3",
"version": "312.8",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 2.0",
"platform": "OSX.4+",
"version": "419.3",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "Safari 3.0",
"platform": "OSX.4+",
"version": "522.1",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "OmniWeb 5.5",
"platform": "OSX.4+",
"version": "420",
"grade": "A"
},
{
"engine": "Webkit",
"browser": "iPod Touch / iPhone",
"platform": "iPod",
"version": "420.1",
"grade": "A"
}]
}
}
];
$scope.currentTab = 1;
$scope.func = function (id) {
for (var i=0;i<$scope.folds.length;i++){
if(id == $scope.folds[i].id){
for (var i = 0; i < $scope.folds.length; i++) {
if (id == $scope.folds[i].id) {
$scope.folds[i].isActive = true;
}else{
} else {
$scope.folds[i].isActive = false;
}
}
......
src/main/resources/static/tpl/layout/failedCard/failedCard.html
View file @ f73676d5
......@@ -7,128 +7,44 @@
<div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">任务循环单</a>
</div>
<div class="wrapper hidden-sm hidden-xs" id="email-menu">
<ul class="nav nav-pills nav-stacked nav-sm">
<li ng-repeat="type in typeList" ui-sref-active="active"
ng-class="{true: 'active', false: ''}[type.isActive]">
<a ng-click="check_type(type.typeCode)">
{{type.typeName}}({{type.typeCount}})
</a>
</li>
</ul>
<a class="w-xs font-bold">废证任务单</a>
</div>
</div>
<div class="col">
<!-- header -->
<div class="row" style="padding-top:15px;padding-left:20px;">
<span class="col-lg-2">
<div class="input-group w-md">
<input type="text" class="form-control" datepicker-popup="{{format}}" ng-model="dt"
is-open="opened" datepicker-options="dateOptions" ng-required="true"
close-text="Close"/>
<span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="open($event)"><i
class="glyphicon glyphicon-calendar"></i></button>
</span>
</div>
</span>
<span class="col-lg-1" style="margin-left: 1em">
<button type="button" class="btn btn-primary" ng-click="task_click()">查询</button>
</span>
</div>
<!-- / header -->
<div class="wrapper-md">
<div class="panel panel-default">
<div class="panel-heading">
制证任务
废证任务
</div>
<div class="table-responsive">
<table class="table table-striped b-t b-light">
<thead>
<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>
</thead>
<tbody ng-repeat="city in cityList| orderBy:citycode:desc">
<tbody ng-repeat="failedCard in failedCardList">
<tr>
<td>{{city.task_Id}}</td>
<td><span class="city"
style="color: #337ab7;display:inline-block">{{city.cityName}}</span></td>
<td>{{city.groupCount}}</td>
<td>{{city.groupNO}}</td>
<td>{{city.groupSum}}</td>
<td>{{city.groupInvailedSum}}</td>
<td>{{failedCard.acceptNo}}</td>
<td>{{failedCard.taskID}}</td>
<td>{{failedCard.failedCardReason}}</td>
<td>{{failedCard.printDate}}</td>
<td>
<span style="padding-left:10px;"
ng-show="city.printer_Id==null">未分配</span>
ng-show="failedCard.allotDate==null">未分配</span>
<span style="padding-left:10px;"
ng-show="city.printer_Id!=null">机器<span>{{city.printer_Id}}</span></span>
</td>
<td>{{city.state}}</td>
<td ng-if="userState<=4" ><a ng-click="showTable(city.task_Id)">组号列表</a></td>
<td ng-if="userState>4" ><a ng-click="showTable(city.task_Id)">区县列表</a></td>
<td><a ng-click="finishClick(city.task_Id,userState)">完成</a></td>
</tr>
<tr ng-show="showtable==city.task_Id && userState<=4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>组号</th>
<th>合格数量</th>
<th>不合格数量</th>
<th>特殊证件数量</th>
<th>特殊证件列表</th>
</thead>
<tbody>
<tr ng-repeat="group in groupList">
<td>{{group.groupNO}}</td>
<td>{{group.vaildCount}}</td>
<td>{{group.invaildCount}}</td>
<td>{{group.specialCardCount}}</td>
<td><a ng-click="showTableGroup(group.specialCardList)">特殊证件列表</a></td>
</tr>
</tbody>
</table>
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}}</span></span>
</td>
<td>{{failedCard.positionDate}}</td>
<td>{{failedCard.state}}</td>
<td><a ng-click="finishClick(failedCard.failedCardId,userState)">完成</a></td>
</tr>
<tr ng-show="showtable==city.task_Id && userState>4">
<td></td>
<td colspan="4">
<table style="font-size:0.9em;color: #000;" class="table">
<thead>
<th>区县名称</th>
<th>卸载数量</th>
<th>完成数量</th>
<th>电写入数量</th>
<th>出库数量</th>
<th>入库数量</th>
</thead>
<tbody>
<tr ng-repeat="county in countyList">
<td>{{county.countyName}}</td>
<td>{{county.downloadCount}}</td>
<td>{{county.finish_Count}}</td>
<td>{{county.electric_writerCount}}</td>
<td>{{county.out_Storage_Count}}</td>
<td>{{county.in_Storage_Count}}</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</div>
......
src/main/resources/static/tpl/layout/failedCard/failedCard.js
View file @ f73676d5
app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService','ngDialog', function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService,ngDialog) {
app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){
if ($rootScope.loginData.login === false) {
$state.go("signin")
}else {
$state.go("layout.cycleSheet")
} else {
$state.go("layout.failedCard")
}
$scope.userState=$rootScope.loginData.state;
$scope.userState = $rootScope.loginData.state;
var getNowFormatDate = function () {
var date = new Date();
var month = date.getMonth() + 1;
......@@ -16,10 +16,10 @@ app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + "/" + month +"/"+ strDate;
var currentdate = date.getFullYear() + "/" + month + "/" + strDate;
return currentdate;
}
$scope.today = function() {
$scope.today = function () {
$scope.dt = getNowFormatDate();
};
$scope.today();
......@@ -27,16 +27,16 @@ app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
$scope.clear = function () {
$scope.dt = null;
};
$scope.disabled = function(date, mode) {
return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) );
$scope.disabled = function (date, mode) {
return (mode === 'day' && (date.getDay() === 0 || date.getDay() === 6));
};
$scope.toggleMin = function() {
$scope.toggleMin = function () {
$scope.minDate = $scope.minDate ? null : new Date();
};
$scope.toggleMin();
$scope.open = function($event) {
$scope.open = function ($event) {
$event.preventDefault();
$event.stopPropagation();
......@@ -52,62 +52,73 @@ app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
$scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1];
$scope.task_click = function(){
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====");
$scope.task_click = function () {
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====");
}
$scope.cardType =0;
$scope.check_type = function(typeCode){
cardType=typeCode;
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====",typeCode,"+++++++++++++");
$scope.cardType = 0;
$scope.check_type = function (typeCode) {
cardType = typeCode;
console.log($rootScope.loginData.state, "----测试-----", $scope.dt, "====", typeCode, "+++++++++++++");
}
// 查询废证列表
var getFailedCardListData = function (state) {
HttpService.getTypeListByTaskStateId(1,function (data) {
$scope.typeList = data.respData;
console.log("---制证类型--数据源:")
console.log(data.respData)
})
}
getFailedCardListData($rootScope.loginData.state);
$scope.groupList =[
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]},
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]},
{"groupNO":45,"vaildCount":45,invaildCount:25,specialCardCount:5,specialCardList:[{acceptNo:20180401,specialType:1},{acceptNo:20180401,specialType:1}]}
]
$scope.showtable = -1;
$scope.showTable = function (taskID) {
if ($scope.showtable != taskID) {
$scope.showtable = taskID;
} else {
$scope.showtable = -1;
// // 查询废证列表
// var getFailedCardListData = function (state,workshop) {
// HttpService.findFailedinfo(1,workshop,function (data) {
// $scope.failedCardList = data.respData;
// console.log("---制证类型--数据源:")
// console.log(data.respData)
//
// })
// }
// getFailedCardListData($rootScope.loginData.state,$rootScope.loginData.workshop);
$scope.failedCardList = [
{
"acceptNo": "201802",
"failedCardReason": "切废",
failedCardId: 201811205,
taskID: 201811203,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
},
{
"acceptNo": "2018035",
"failedCardReason": "电写入废",
failedCardId: 201811206,
taskID: 201811204,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
},
{
"acceptNo": "2018036",
"failedCardReason": "冲切废",
failedCardId: 201811207,
taskID: 201811205,
positionDate: "20181108",
finishDate: "20181109",
allotDate: "20181203",
printDate: "20181204",
state: 2
}
}
$scope.showTableGroup = function (specialCardList) {
ngDialog.open({
template: 'dialogs/specialCardList.html' + urlTimeStamp(),
width: 800,
cache: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService,$rootScope) {
$scope.specialCardList = specialCardList;
}]
]
})
}
$scope.finishClick= function(taskId,userState){
HttpService.updateProductionTask(taskId,userState,function (data) {
//点击确认成功后 再次查询城市列表
getCityListData(cardType,$rootScope.loginData.state);
$scope.finishClick = function (taskId, userState) {
HttpService.updateProductionTask(taskId, userState, function (data) {
//点击确认成功后 再次废证列表
getFailedCardListData($rootScope.loginData.state, $rootScope.loginData.workshop);
})
}
$scope.folds = [
{id:1,name: '普通证', count:10000,filter:'',isActive:true, dataTable:{
{
id: 1, name: '普通证', count: 10000, filter: '', isActive: true, dataTable: {
"aaData": [
{
"engine": "Trident",
......@@ -123,8 +134,10 @@ app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
"version": "5",
"grade": "C"
}]
}},
{id:2,name: '邮寄证', count:20000,filter:'starred', dataTable:{
}
},
{
id: 2, name: '邮寄证', count: 20000, filter: 'starred', dataTable: {
"aaData": [
{
"engine": "Trident",
......@@ -147,8 +160,10 @@ app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
"version": "7",
"grade": "A"
}]
}},
{id:3,name: '军人证', count:32000,filter:'sent', dataTable:{
}
},
{
id: 3, name: '军人证', count: 32000, filter: 'sent', dataTable: {
"aaData": [
{
"engine": "Trident",
......@@ -157,8 +172,10 @@ app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
"version": "5.5",
"grade": "A"
}]
}},
{id:4,name: '快证', count:40,filter:'important', dataTable:{
}
},
{
id: 4, name: '快证', count: 40, filter: 'important', dataTable: {
"aaData": [
{
"engine": "Webkit",
......@@ -195,15 +212,16 @@ app.controller('failedCardCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
"version": "420.1",
"grade": "A"
}]
}}
}
}
];
$scope.currentTab = 1;
$scope.func = function (id) {
for (var i=0;i<$scope.folds.length;i++){
if(id == $scope.folds[i].id){
for (var i = 0; i < $scope.folds.length; i++) {
if (id == $scope.folds[i].id) {
$scope.folds[i].isActive = true;
}else{
} else {
$scope.folds[i].isActive = false;
}
}
......
src/main/resources/static/tpl/layout/layout.html
View file @ f73676d5
<!-- navbar -->
<div class="app-header navbar">
<!-- navbar -->
<div class="app-header navbar">
<!-- navbar header -->
<div class="navbar-header {{app.settings.navbarHeaderColor}}">
<button class="pull-right visible-xs dk" ui-toggle-class="show" data-target=".navbar-collapse">
<i class="glyphicon glyphicon-cog"></i>
</button>
<button class="pull-right visible-xs" ui-toggle-class="off-screen" data-target=".app-aside" ui-scroll="app">
<i class="glyphicon glyphicon-align-justify"></i>
</button>
<!-- brand -->
<a href="#/" class="navbar-brand text-lt">
<i class="fa fa-credit-card"></i>
<span class="hidden-folded m-l-xs">{{app.name}}</span>
</a>
<!-- / brand -->
<button class="pull-right visible-xs dk" ui-toggle-class="show" data-target=".navbar-collapse">
<i class="glyphicon glyphicon-cog"></i>
</button>
<button class="pull-right visible-xs" ui-toggle-class="off-screen" data-target=".app-aside" ui-scroll="app">
<i class="glyphicon glyphicon-align-justify"></i>
</button>
<!-- brand -->
<a href="#/" class="navbar-brand text-lt">
<i class="fa fa-credit-card"></i>
<span class="hidden-folded m-l-xs">{{app.name}}</span>
</a>
<!-- / brand -->
</div>
<!-- / navbar header -->
<!-- navbar collapse -->
<div class="collapse pos-rlt navbar-collapse box-shadow {{app.settings.navbarCollapseColor}}">
<!-- buttons -->
<div class="nav navbar-nav hidden-xs">
<a href class="btn no-shadow navbar-btn" ng-click="app.settings.asideFolded = !app.settings.asideFolded">
<i class="fa {{app.settings.asideFolded ? 'fa-indent' : 'fa-dedent'}} fa-fw"></i>
</a>
</div>
<!-- / buttons -->
<!-- search form -->
<form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse" role="search" ng-controller="TypeaheadDemoCtrl">
<div class="form-group">
<div class="input-group">
<input type="text" ng-model="selected" typeahead="state for state in states | filter:$viewValue | limitTo:8" class="form-control input-sm bg-light no-border rounded padder" placeholder="Search projects...">
<span class="input-group-btn">
<button type="submit" class="btn btn-sm bg-light rounded"><i class="fa fa-search"></i></button>
</span>
</div>
<!-- buttons -->
<div class="nav navbar-nav hidden-xs">
<a href class="btn no-shadow navbar-btn" ng-click="app.settings.asideFolded = !app.settings.asideFolded">
<i class="fa {{app.settings.asideFolded ? 'fa-indent' : 'fa-dedent'}} fa-fw"></i>
</a>
</div>
</form>
<!-- / search form -->
<!-- / buttons -->
<!-- nabar right -->
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<a ui-fullscreen></a>
</li>
<li class="dropdown" dropdown>
<a href class="dropdown-toggle clear" dropdown-toggle>
<span class="thumb-sm avatar pull-right m-t-n-sm m-b-n-sm m-l-sm">
<img src="../img/a0.jpg" alt="...">
<i class="on md b-white bottom"></i>
</span>
<span class="hidden-sm hidden-md">{{loginData.username}}</span> <b class="caret"></b>
</a>
<!-- dropdown -->
<ul class="dropdown-menu animated fadeInRight w">
<li>
<a ng-click="logout()">Logout</a>
<!-- search form -->
<form class="navbar-form navbar-form-sm navbar-left shift" ui-shift="prependTo" target=".navbar-collapse"
role="search" ng-controller="TypeaheadDemoCtrl">
<div class="form-group">
<div class="input-group">
<input type="text" ng-model="selected"
typeahead="state for state in states | filter:$viewValue | limitTo:8"
class="form-control input-sm bg-light no-border rounded padder"
placeholder="Search projects...">
<span class="input-group-btn">
<button type="submit" class="btn btn-sm bg-light rounded">
<i class="fa fa-search"></i>
</button>
</span>
</div>
</div>
</form>
<!-- / search form -->
<!-- nabar right -->
<ul class="nav navbar-nav navbar-right">
<li class="hidden-xs">
<a ui-fullscreen></a>
</li>
<li class="dropdown" dropdown>
<a href class="dropdown-toggle clear" dropdown-toggle>
<span class="thumb-sm avatar pull-right m-t-n-sm m-b-n-sm m-l-sm">
<img src="../img/a0.jpg" alt="...">
<i class="on md b-white bottom"></i>
</span>
<span class="hidden-sm hidden-md">{{loginData.username}}</span>
<b class="caret"></b>
</a>
<!-- dropdown -->
<ul class="dropdown-menu animated fadeInRight w">
<li>
<a ng-click="logout()">Logout</a>
</li>
</ul>
<!-- / dropdown -->
</li>
</ul>
<!-- / dropdown -->
</li>
</ul>
<!-- / navbar right -->
</ul>
<!-- / navbar right -->
</div>
<!-- / navbar collapse -->
</div>
<!-- / navbar -->
</div>
<!-- / navbar -->
<!-- menu -->
<div class="app-aside hidden-xs {{app.settings.asideColor}}">
<!-- menu -->
<div class="app-aside hidden-xs {{app.settings.asideColor}}">
<div class="aside-wrap">
<!-- if you want to use a custom scroll when aside fixed, use the slimScroll
<div class="navi-wrap" ui-jq="slimScroll" ui-options="{height:'100%', size:'8px'}">
-->
<div class="navi-wrap">
<!-- if you want to use a custom scroll when aside fixed, use the slimScroll
<div class="navi-wrap" ui-jq="slimScroll" ui-options="{height:'100%', size:'8px'}">
-->
<div class="navi-wrap">
<!-- nav -->
<nav ui-nav class="navi">
<!-- list -->
<ul class="nav">
<li class="hidden-folded padder m-t m-b-sm text-muted text-xs">
<span>导航</span>
</li>
<li ui-sref-active="active" ng-repeat="menu in menuList">
<a ui-sref="{{menu.url}}">
<i class="{{icons[$index]}}"></i>
<span class="font-bold" >{{menu.name}}</span>
</a>
</li>
<li class="line dk"></li>
</ul>
<!-- / list -->
</nav>
<!-- nav -->
</div>
<!-- nav -->
<nav ui-nav class="navi">
<!-- list -->
<ul class="nav">
<li class="hidden-folded padder m-t m-b-sm text-muted text-xs">
<span>导航</span>
</li>
<li ui-sref-active="active" ng-repeat="menu in menuList">
<a ui-sref="{{menu.url}}">
<i class="{{icons[$index]}}"></i>
<span class="font-bold">{{menu.name}}</span>
</a>
</li>
<li class="line dk"></li>
</ul>
<!-- / list -->
</nav>
<!-- nav -->
</div>
</div>
</div>
<!-- / menu -->
</div>
<!-- / menu -->
<!-- view -->
<div class="app-content" ng-class="{'m-n': app.hideAside, 'h-full': app.hideFooter }">
<!-- view -->
<div class="app-content" ng-class="{'m-n': app.hideAside, 'h-full': app.hideFooter }">
<div ui-view></div>
</div>
</div>
<!-- / view -->
<!-- / view -->
<!-- footer -->
<div class="app-footer wrapper b-t bg-white">
<!-- footer -->
<div class="app-footer wrapper b-t bg-white">
<span class="pull-right">version:{{app.version}}</span>
&copy; 2018 Copyright.
</div>
<!-- / footer -->
\ No newline at end of file
</div>
<!-- / footer -->
\ No newline at end of file
src/main/resources/static/tpl/layout/layout.js
View file @ f73676d5
app.controller('layOutCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService', function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService) {
if($rootScope.loginData.login == false){
app.controller('layOutCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService) {
if ($rootScope.loginData.login == false) {
$state.go("signin")
}else{
$scope.logout = function(){
HttpService.logout(function(data) {})
} else {
$scope.logout = function () {
HttpService.logout(function (data) {
})
$state.go("signin")
localStorage.removeItem("ngStorage-loginData");
location.reload();
......
src/main/resources/static/tpl/layout/permissionList/permissionList.html
View file @ f73676d5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addPerms()"><i class="layui-icon" ></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>权限</th>
<th>名称</th>
<!--<th>路径</th>-->
<th>类型</th>
<!--<th>父类id</th>-->
<!--<th>父类id树</th>-->
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="permission in permissionList | orderBy:id track by permission.id">
<td>{{permission.id}}</td>
<td>{{permission.permission}}</td>
<td>{{permission.name}}</td>
<!--<td>{{permission.url}}</td>-->
<td>{{permission.resource_type}}</td>
<!--<td>{{permission.parent_id}}</td>-->
<!--<td>{{permission.parent_ids}}</td>-->
<td class="td-status">
<span ng-if="permission.available==1" class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
<span ng-if="permission.available==0" class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updatePerms(permission.id)">修改</a>
<a class="layui-btn layui-btn-danger" ng-if="permission.available==0" ng-click="permissionDel(permission.id)">删除</a>
<a class="layui-btn layui-btn-info" ng-if="permission.available==1" ng-click="permissionOpen(permission.id)">启用</a>
</td>
</tr>
</tbody>
</table>
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addPerms()"><i class="layui-icon"></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>权限</th>
<th>名称</th>
<!--<th>路径</th>-->
<th>类型</th>
<!--<th>父类id</th>-->
<!--<th>父类id树</th>-->
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="permission in permissionList | orderBy:id track by permission.id">
<td>{{permission.id}}</td>
<td>{{permission.permission}}</td>
<td>{{permission.name}}</td>
<!--<td>{{permission.url}}</td>-->
<td>{{permission.resource_type}}</td>
<!--<td>{{permission.parent_id}}</td>-->
<!--<td>{{permission.parent_ids}}</td>-->
<td class="td-status">
<span ng-if="permission.available==1"
class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
<span ng-if="permission.available==0"
class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updatePerms(permission.id)">修改</a>
<a class="layui-btn layui-btn-danger" ng-if="permission.available==0"
ng-click="permissionDel(permission.id)">删除</a>
<a class="layui-btn layui-btn-info" ng-if="permission.available==1"
ng-click="permissionOpen(permission.id)">启用</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!-- /hbox layout -->
</div>
<!-- /hbox layout -->
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/permissionList/permissionList.js
View file @ f73676d5
app.controller('permissionListCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService','ngDialog',
function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService,ngDialog) {
if($rootScope.loginData.login === false){
$state.go("signin")
}else {
$state.go("layout.permissionList")
}
app.controller('permissionListCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog',
function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if ($rootScope.loginData.login === false) {
$state.go("signin")
} else {
$state.go("layout.permissionList")
}
$scope.id = 'id';
$scope.id = 'id';
var getPermissionList = function(){
HttpService.getPermissionListData(function(data) {
$scope.permissionList = data;
console.log($scope.permissionList);
})
}
getPermissionList();
var getPermissionList = function () {
HttpService.getPermissionListData(function (data) {
$scope.permissionList = data;
console.log($scope.permissionList);
})
}
getPermissionList();
// 删除权限
$scope.permissionDel = function(id){
HttpService.delPermission(id,function(data){
getPermissionList();
})
}
// 删除权限
$scope.permissionDel = function (id) {
HttpService.delPermission(id, function (data) {
getPermissionList();
})
}
// 启用权限
$scope.permissionOpen = function(id){
HttpService.openPermission(id,function(data){
getPermissionList();
})
}
// 启用权限
$scope.permissionOpen = function (id) {
HttpService.openPermission(id, function (data) {
getPermissionList();
})
}
// 添加
$scope.addPerms = function(){
ngDialog.open({
template: 'dialogs/addPermission.html' + urlTimeStamp(),
width:800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
$scope.permissionAdd = function(resourceType){
var permission={};
permission.name=$scope.name;
permission.url=$scope.url;
permission.permission=$scope.permission;
permission.resourceType=resourceType;
console.log(permission)
HttpService.addPermission(permission,function(data){
$scope.closeThisDialog();
getPermissionList();
// 添加
$scope.addPerms = function () {
ngDialog.open({
template: 'dialogs/addPermission.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
$scope.permissionAdd = function (resourceType) {
var permission = {};
permission.name = $scope.name;
permission.url = $scope.url;
permission.permission = $scope.permission;
permission.resourceType = resourceType;
console.log(permission)
HttpService.addPermission(permission, function (data) {
$scope.closeThisDialog();
getPermissionList();
})
}
}]
})
}
// 修改
$scope.updatePerms = function (id) {
ngDialog.open({
template: 'dialogs/updatePerms.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getPermsById(id, function (data) {
$scope.thisPerm = data.permission;
console.log($scope.thisPerm)
})
}
}]
})
}
// 修改
$scope.updatePerms = function(id){
ngDialog.open({
template: 'dialogs/updatePerms.html' + urlTimeStamp(),
width:800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getPermsById(id,function(data){
$scope.thisPerm = data.permission;
console.log($scope.thisPerm)
})
$scope.permUpdate = function(resourceType){
var jsonPerm = {};
jsonPerm.id = $scope.thisPerm.id;
jsonPerm.name=$scope.thisPerm.name;
// jsonPerm.url=$scope.thisPerm.url;
jsonPerm.permission =$scope.thisPerm.permission;
jsonPerm.resourceType=resourceType;
console.log(jsonPerm)
HttpService.updatePerm(jsonPerm,function(data){
$scope.closeThisDialog();
getPermissionList();
})
}
}]
$scope.permUpdate = function (resourceType) {
var jsonPerm = {};
jsonPerm.id = $scope.thisPerm.id;
jsonPerm.name = $scope.thisPerm.name;
// jsonPerm.url=$scope.thisPerm.url;
jsonPerm.permission = $scope.thisPerm.permission;
jsonPerm.resourceType = resourceType;
console.log(jsonPerm)
HttpService.updatePerm(jsonPerm, function (data) {
$scope.closeThisDialog();
getPermissionList();
})
}
}]
})
})
}
}
}])
\ No newline at end of file
}])
\ No newline at end of file
src/main/resources/static/tpl/layout/roleList/roleList.html
View file @ f73676d5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addRole()"><i class="layui-icon"></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>角色名</th>
<th>描述</th>
<th>权限</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="role in roleList | orderBy:id track by role.id">
<td>{{role.id}}</td>
<td>{{role.role}}</td>
<td>{{role.description}}</td>
<td>
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addRole()"><i class="layui-icon"></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>角色名</th>
<th>描述</th>
<th>权限</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="role in roleList | orderBy:id track by role.id">
<td>{{role.id}}</td>
<td>{{role.role}}</td>
<td>{{role.description}}</td>
<td>
<span ng-repeat="permission in role.permissions">
{{permission.name}},
</span>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updateRoles(role.id)">修改</a>
</td>
</tr>
</tbody>
</table>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updateRoles(role.id)">修改</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/roleList/roleList.js
View file @ f73676d5
app.controller('roleListCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','HttpService','ngDialog',
function($scope,$rootScope, $http,$state, $filter,$localStorage,HttpService,ngDialog){
app.controller('roleListCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog',
function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){
$state.go("signin")
}else {
$state.go("layout.roleList")
}
if ($rootScope.loginData.login === false) {
$state.go("signin")
} else {
$state.go("layout.roleList")
}
$scope.id = 'id';
$scope.id = 'id';
var getRoleList = function(){
HttpService.getRoleListData(function(data) {
$scope.roleList = data;
console.log($scope.roleList);
})
}
getRoleList();
var getRoleList = function () {
HttpService.getRoleListData(function (data) {
$scope.roleList = data;
console.log($scope.roleList);
})
}
getRoleList();
$scope.addRole = function(){
ngDialog.open({
template: 'dialogs/addRole.html' + urlTimeStamp(),
width:600,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getAllActivePermissionList(function(data) {
$scope.activePermissionList = data;
})
$scope.roleAdd = function(permissionId){
var permission={};
permission.role=$scope.role;
permission.description=$scope.description;
permission.permissionIds=permissionId;
console.log(permission)
HttpService.rolesAdd(permission,function(data){
$scope.closeThisDialog();
getRoleList();
$scope.addRole = function () {
ngDialog.open({
template: 'dialogs/addRole.html' + urlTimeStamp(),
width: 600,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getAllActivePermissionList(function (data) {
$scope.activePermissionList = data;
})
}
$scope.roleAdd = function (permissionId) {
var permission = {};
permission.role = $scope.role;
permission.description = $scope.description;
permission.permissionIds = permissionId;
console.log(permission)
HttpService.rolesAdd(permission, function (data) {
$scope.closeThisDialog();
getRoleList();
})
}
}]
}]
})
}
})
}
$scope.updateRoles = function(id){
ngDialog.open({
template: 'dialogs/updateRole.html' + urlTimeStamp(),
width:800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getRoleById(id,function(data){
$scope.thisRole = data.role;
console.log($scope.thisRole)
})
HttpService.getAllActivePermissionList(function(data) {
$scope.activePermissionList = data;
})
$scope.roleUpdate = function(permissionId){
var jsonRole = {};
jsonRole.oldPermissionIds=[];
jsonRole.role=$scope.thisRole.role;
jsonRole.roleId =$scope.thisRole.id;
jsonRole.description =$scope.thisRole.description;
for (var i=0;i<$scope.thisRole.permissions.length;i++){
jsonRole.oldPermissionIds.push($scope.thisRole.permissions[i].id);
}
jsonRole.permissionId=permissionId;
console.log(jsonRole)
HttpService.updateRole(jsonRole,function(data){
$scope.closeThisDialog();
getRoleList();
$scope.updateRoles = function (id) {
ngDialog.open({
template: 'dialogs/updateRole.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getRoleById(id, function (data) {
$scope.thisRole = data.role;
console.log($scope.thisRole)
})
}
}]
HttpService.getAllActivePermissionList(function (data) {
$scope.activePermissionList = data;
})
$scope.roleUpdate = function (permissionId) {
var jsonRole = {};
jsonRole.oldPermissionIds = [];
jsonRole.role = $scope.thisRole.role;
jsonRole.roleId = $scope.thisRole.id;
jsonRole.description = $scope.thisRole.description;
for (var i = 0; i < $scope.thisRole.permissions.length; i++) {
jsonRole.oldPermissionIds.push($scope.thisRole.permissions[i].id);
}
jsonRole.permissionId = permissionId;
console.log(jsonRole)
HttpService.updateRole(jsonRole, function (data) {
$scope.closeThisDialog();
getRoleList();
})
}
}]
})
}
})
}
}])
\ No newline at end of file
}])
\ No newline at end of file
src/main/resources/static/tpl/layout/searchSpecialCard/searchSpecialCard.html 0 → 100644
View file @ f73676d5
<div id="mask-loading" class="mask-loading" ng-if="loading" style="background-color: rgba(0, 0, 0, 0.17);">
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
</div>
<div>
<div class="row"
style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;font-weight: bold;margin-bottom:10px;padding-top:10px;">
<div class="col-md-6" style="text-align: left;cursor:pointer;"><a ng-click="goBack()"> << 完成返回</a></div>
<div class="col-md-6" style="text-align: right;padding-bottom:10px;">搜索结果</div>
</div>
<h3 ng-show="specialCardInfo== null&&searchInput!=null">没有找到与 "{{searchInput}}" 相关的信息。</h3>
<h3 ng-show="searchInput==null">请在快速搜索框中填写身份证号/受理号，查询相关信息。</h3>
<div style="width: auto">
<div ng-if="specialCardInfo[0].isGroup==0">
<div class="panel panel-default" ng-if="specialCardInfo[1]!=null">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[1].cycleSheetInfo}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>编号</th>
<th>地市</th>
<th>制证类型</th>
<th>日期</th>
<th>工序</th>
<th>操作时间</th>
<th>机器号</th>
<th>制证车间</th>
<th>质检</th>
<th>出库时间</th>
<th>入库时间</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[1].info[9]}}</td>
<td>{{specialCardInfo[1].info[14]}}</td>
<td>{{specialCardInfo[1].info[6]}}</td>
<td>{{specialCardInfo[1].info[1]|myDateFilter}}</td>
<td>{{specialCardInfo[1].info[7]}}</td>
<td>{{specialCardInfo[1].info[4]}}</td>
<td>{{specialCardInfo[1].info[16]}}</td>
<td ng-if="specialCardInfo[1].info[2]=='p1'">平一</td>
<td ng-if="specialCardInfo[1].info[2]=='p2'">平二</td>
<td>{{specialCardInfo[1].info[15]}}</td>
<td ng-if="specialCardInfo[1].info[12]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[1].info[13]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[1].info[12]==null"></td>
<td ng-if="specialCardInfo[1].info[13]==null"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].database}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>地市</th>
<th ng-show="specialCardInfo[0].oldGroupNo!=null">受理号</th>
<th>姓名</th>
<th ng-show="specialCardInfo[0].makeName!=null">制证类型</th>
<th>身份证号</th>
<th>性别</th>
<th>出生日期</th>
<th>签发机关</th>
<th>起始有效期</th>
<th>终止有效期</th>
<th>证件状态</th>
<th>上报受理单位</th>
<th>证件状态</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].sbdw}}</td>
<td ng-show="specialCardInfo[0].oldGroupNo!=null">
{{specialCardInfo[0].oldGroupNo}}
</td>
<td>{{specialCardInfo[0].name}}</td>
<td ng-show="specialCardInfo[0].makeType!=null">{{specialCardInfo[0].makeName}}</td>
<td>{{specialCardInfo[0].IDcard}}</td>
<td>{{specialCardInfo[0].xb}}</td>
<td>{{specialCardInfo[0].csrq | myDateFilter}}</td>
<td>{{specialCardInfo[0].jfjg}}</td>
<td>{{specialCardInfo[0].yxqqsrq}}</td>
<td>{{specialCardInfo[0].yxqjzrq}}</td>
<td>{{specialCardInfo[0].state}}</td>
<td>{{specialCardInfo[0].sbdw}}</td>
<td ng-if="specialCardInfo[0].type==0">废证</td>
<td ng-if="specialCardInfo[0].type==1">快证</td>
<td ng-if="specialCardInfo[0].type==2">余证</td>
<td ng-if="specialCardInfo[0].type==3">退证</td>
</tr>
</tbody>
</table>
</div>
<div class="col-lg-12">
<div style="float: right;width: auto">
<button ng-if="(specialCardInfo[0].type==99||specialCardInfo[0].type ==0||specialCardInfo[0].type ==2||specialCardInfo[0].type ==4 )&& loginData.state==1"
class="btn btn-primary" id="addBtn"
ng-click="createCycleSheet(specialCardInfo[0].state,specialCardInfo[0].oldGroupNo,specialCardInfo[0].type,specialCardInfo[0].cityCode,specialCardInfo[0].createDate,specialCardInfo[0].makeType)">
添加特证
</button>
<button ng-if="(specialCardInfo[0].type ==1||specialCardInfo[0].type ==3) && loginData.state==1"
disabled class="btn btn-primary">添加特证
</button>
<button ng-if="(specialCardInfo[0].type==99||specialCardInfo[0].type ==0||specialCardInfo[0].type ==2||specialCardInfo[0].type ==1|| specialCardInfo[0].type ==4) && loginData.state==1"
class="btn btn-danger" id="returnBtn"
ng-click="returnCard(specialCardInfo[0].oldGroupNo)">退证
</button>
<button ng-if="specialCardInfo[0].type ==3 && loginData.state==1" disabled
class="btn btn-danger">退证
</button>
</div>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[1].info[11]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[1].info[10]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==1">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<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>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].groupNo}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[3]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[7]}}</td>
<td>{{specialCardInfo[0].info[8]}}</td>
<td>{{specialCardInfo[0].info[9]}}</td>
<td>{{specialCardInfo[0].info[10]}}</td>
<td ng-if="specialCardInfo[0].info[12]=='p1'">平一车间</td>
<td ng-if="specialCardInfo[0].info[12]=='p2'">平二车间</td>
<td ng-if="specialCardInfo[0].info[12]==null">未分配</td>
<td>{{specialCardInfo[0].info[11]}}</td>
<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>
<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[0].info[14]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==3">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
<th>原文件名</th>
<th>证件类型</th>
<th>循环单生成时间</th>
<th>循环单所处工序</th>
<th>装库时间</th>
<th>出库时间</th>
<th>入库时间</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].groupNo}}</td>
<td>{{specialCardInfo[0].info[12]}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[4]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[7]}}</td>
<td>{{specialCardInfo[0].info[16]| limitTo:8}}</td>
<td>{{specialCardInfo[0].info[17]| limitTo:8}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[0].info[14]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==4">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>循环单流水号</th>
<th>组号</th>
<th>制证类型</th>
<th>时间</th>
<th>工序</th>
<th>打印机器</th>
<th>制证车间</th>
<th>质检人</th>
<th>出库时间</th>
<th>入库时间</th>
<th>异常</th>
<th ng-if="specialCardInfo[0].info[12]==1">异常信息</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].info[1]}}</td>
<td>{{specialCardInfo[0].groupNo}}</td>
<td>{{specialCardInfo[0].info[5]}}</td>
<td>{{specialCardInfo[0].info[3]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[8]}}</td>
<td ng-if="specialCardInfo[0].info[9]=='p1'">平一车间</td>
<td ng-if="specialCardInfo[0].info[9]=='p2'">平二车间</td>
<td ng-if="specialCardInfo[0].info[9]==null">未分配</td>
<td>{{specialCardInfo[0].info[10]}}</td>
<td>{{specialCardInfo[0].info[13] | limitTo:8}}</td>
<td>{{specialCardInfo[0].info[14] | limitTo:8}}</td>
<td ng-if="specialCardInfo[0].info[12]==0">无</td>
<td ng-if="specialCardInfo[0].info[12]==1" style="color:red;">异常</td>
<td ng-if="specialCardInfo[0].info[12]==1">{{specialCardInfo[0].info[11]}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="panel panel-default" ng-if="specialCardInfo[0].info[15]==1">
<div class="panel-heading">
<h3 class="panel-title">
异常信息
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
{{specialCardInfo[0].info[14]}}
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==5">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].library}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].groupNo}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==6">
<div class="panel panel-default" ng-if="specialCardInfo[0]!=null">
<div class="panel-heading">
<h3 class="panel-title">
{{specialCardInfo[0].cycleSheetInfo}}
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>编号</th>
<th>地市</th>
<th>制证类型</th>
<th>日期</th>
<!--<th>最后修改日期</th>-->
<th>工序</th>
<th>操作时间</th>
<th>机器号</th>
<th>制证车间</th>
<th>质检</th>
<th>出库时间</th>
<th>入库时间</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].info[9]}}</td>
<td>{{specialCardInfo[0].info[14]}}</td>
<td>{{specialCardInfo[0].info[6]}}</td>
<td>{{specialCardInfo[0].info[1]|myDateFilter}}</td>
<td>{{specialCardInfo[0].info[7]}}</td>
<td>{{specialCardInfo[0].info[4]}}</td>
<td>{{specialCardInfo[0].info[16]}}</td>
<td ng-if="specialCardInfo[0].info[2]=='p1'">平一</td>
<td ng-if="specialCardInfo[0].info[2]=='p2'">平二</td>
<td>{{specialCardInfo[0].info[15]}}</td>
<td ng-if="specialCardInfo[0].info[12]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[0].info[13]!=null">{{specialCardInfo[1].info[12] |
myDateFilter}}
</td>
<td ng-if="specialCardInfo[0].info[12]==null"></td>
<td ng-if="specialCardInfo[0].info[13]==null"></td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==8">
<!--循环单-->
<div class="panel panel-default" ng-if="specialCardInfo[0].cyclesheet.length>0">
<div class="panel-heading">
<h3 class="panel-title">
循环单
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0 15px 0 15px;">
<table class="table">
<thead>
<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>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].cyclesheet[0]}}</td>
<td>{{specialCardInfo[0].cyclesheet[1]}}</td>
<td>{{specialCardInfo[0].cyclesheet[2]}}</td>
<td>{{specialCardInfo[0].cyclesheet[3]}}</td>
<td>{{specialCardInfo[0].cyclesheet[4]}}</td>
<td>{{specialCardInfo[0].cyclesheet[5]}}</td>
<td>{{specialCardInfo[0].cyclesheet[6]}}</td>
<td>{{specialCardInfo[0].cyclesheet[7]}}</td>
<td ng-if="specialCardInfo[0].cyclesheet[8]=='p1'||specialCardInfo[0].cyclesheet[8]=='p3'">
平一
</td>
<td ng-if="specialCardInfo[0].cyclesheet[8]=='p2'||specialCardInfo[0].cyclesheet[8]=='p4'">
平二
</td>
<td>{{specialCardInfo[0].cyclesheet[9]}}</td>
<td>{{specialCardInfo[0].cyclesheet[10]}}</td>
<td>{{specialCardInfo[0].cyclesheet[11] | limitTo:8}}</td>
<td>{{specialCardInfo[0].cyclesheet[12] | limitTo:8}}</td>
<td ng-if="specialCardInfo[0].cyclesheet[14]==0">无</td>
<td ng-if="specialCardInfo[0].cyclesheet[14]==1">
{{specialCardInfo[0].cyclesheet[13]}}
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--制证库-->
<div class="panel panel-default" ng-if="specialCardInfo[0].prod.length>0">
<div class="panel-heading">
<h3 class="panel-title">
制证库
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
<th>卸载数量</th>
<th>卸载日期</th>
<th>电写入数量</th>
<th>电写入日期</th>
<th>质检数量</th>
<th>质检日期</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].prod[0]}}</td>
<td>{{specialCardInfo[0].prod[1]}}</td>
<td>{{specialCardInfo[0].prod[2]}}</td>
<td>{{specialCardInfo[0].prod[3]}}</td>
<td>{{specialCardInfo[0].prod[4]}}</td>
<td>{{specialCardInfo[0].prod[5]}}</td>
<td>{{specialCardInfo[0].prod[6]}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<!--受理库-->
<div class="panel panel-default" ng-if="specialCardInfo[0].accu.length>0">
<div class="panel-heading">
<h3 class="panel-title">
受理库
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0px 15px 0px 15px;">
<table class="table">
<thead>
<th>组号</th>
<th>装库日期</th>
<th>组号状态</th>
<th>合格数</th>
<th>不合格数</th>
<th>核验日期</th>
<th>核验人</th>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].accu[0]}}</td>
<td>{{specialCardInfo[0].accu[1]}}</td>
<td>{{specialCardInfo[0].accu[2]}}</td>
<td>{{specialCardInfo[0].accu[3]}}</td>
<td>{{specialCardInfo[0].accu[4]}}</td>
<td>{{specialCardInfo[0].accu[5]}}</td>
<td>{{specialCardInfo[0].accu[6]}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
<div ng-if="specialCardInfo[0].isGroup==11">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
循环单
</h3>
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
<div style="float: left;padding:0 15px 0 15px;">
<table class="table">
<thead>
<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>
</thead>
<tbody>
<tr>
<td>{{specialCardInfo[0].cycleSheetID}}</td>
<td>{{specialCardInfo[0].groupNum}}</td>
<td>{{specialCardInfo[0].count}}</td>
<td>{{specialCardInfo[0].cityName}}</td>
<td>{{specialCardInfo[0].makeTypeName}}</td>
<td>{{specialCardInfo[0].createDate}}</td>
<td>{{specialCardInfo[0].lastDate}}</td>
<td>{{specialCardInfo[0].lastProcessName}}</td>
<td>{{specialCardInfo[0].machine}}</td>
<td ng-if="specialCardInfo[0].workShop=='p1'||specialCardInfo[0].workShop=='p3'">
平一
</td>
<td ng-if="specialCardInfo[0].workShop=='p2'||specialCardInfo[0].workShop=='p4'">
平二
</td>
<td>{{specialCardInfo[0].permanentPositionDate}}</td>
<td>{{specialCardInfo[0].qualityinspection}}</td>
<td>{{specialCardInfo[0].outbound}}</td>
<td>{{specialCardInfo[0].putInStorage}}</td>
<td ng-if="specialCardInfo[0].abnormal==0">无</td>
<td ng-if="specialCardInfo[0].abnormal==1">{{specialCardInfo[0].note}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/searchSpecialCard/searchSpecialCard.js 0 → 100644
View file @ f73676d5
app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'HttpService', 'ngDialog', function ($scope, $rootScope, $http, $state, $filter, $localStorage, HttpService, ngDialog) {
if($rootScope.loginData.login === false){
$state.go("signin")
}else {
$state.go("layout.searchSpecialCard")
}
$scope.goBack = function(){
$state.go("layout.cycleSheet")
}
$scope.userState=$rootScope.loginData.state;
var getNowFormatDate = function () {
var date = new Date();
var month = date.getMonth() + 1;
var strDate = date.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
}
var currentdate = date.getFullYear() + "/" + month +"/"+ strDate;
return currentdate;
}
$scope.today = function() {
$scope.dt = getNowFormatDate();
};
$scope.today();
$scope.clear = function () {
$scope.dt = null;
};
$scope.disabled = function(date, mode) {
return ( mode === 'day' && ( date.getDay() === 0 || date.getDay() === 6 ) );
};
$scope.toggleMin = function() {
$scope.minDate = $scope.minDate ? null : new Date();
};
$scope.toggleMin();
$scope.open = function($event) {
$event.preventDefault();
$event.stopPropagation();
$scope.opened = true;
};
$scope.dateOptions = {
formatYear: 'yy',
startingDay: 1,
class: 'datepicker'
};
$scope.initDate = new Date('2016-15-20');
$scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate'];
$scope.format = $scope.formats[1];
$scope.task_click = function(){
console.log($rootScope.loginData.state,"----测试-----",$scope.dt,"====");
}
$scope.createCycleSheet = function (groupState, acceptNo, type) {
$("#addBtn").attr("disabled", true);
var arr = [];
var json = {};
json.acceptNo = acceptNo;
json.type = type;
arr.push(json);
if (groupState == '新组' || groupState == '正在审核') {
MessageService.showAlert("未核验的组不能添加特证！");
$("#addBtn").removeAttr("disabled");
} else {
console.log(arr)
HttpService.saveSpecialCycle(arr, function (data) {
console.log(data)
console.log("------------")
if (data.respData.string == 1) {
MessageService.showAlert("加入特证成功。")
console.log($rootScope.searchInput)
HttpService.querySpecialCardInfo($rootScope.searchInput, function (data) {
if (data != null) {
$rootScope.specialCardInfo = data.respData;
console.log("搜索结果")
console.log(data.respData)
}
})
} else {
MessageService.showAlert("添加特证失败。");
}
})
}
}
$scope.returnCard = function (acceptNo) {
$("#returnBtn").attr("disabled", true);
HttpService.createSpecailCardPkg(cardid, function (data) {
MessageService.showAlert("退证成功。")
})
}
}]);
\ No newline at end of file
src/main/resources/static/tpl/layout/userList/userList.html
View file @ f73676d5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addUser()"><i class="layui-icon"></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>用户名</th>
<th>别名</th>
<th>角色</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in userList | orderBy:id track by user.id">
<td>{{user.id}}</td>
<td>{{user.username}}</td>
<td>{{user.name}}</td>
<td>
<div style="padding: 20px;" class="layui-anim layui-anim-up">
<xblock>
<button class="layui-btn" ng-click="addUser()"><i class="layui-icon"></i>添加</button>
</xblock>
<table class="layui-table">
<thead>
<tr>
<th>ID</th>
<th>用户名</th>
<th>别名</th>
<th>角色</th>
<th>状态</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="user in userList | orderBy:id track by user.id">
<td>{{user.id}}</td>
<td>{{user.username}}</td>
<td>{{user.name}}</td>
<td>
<span ng-repeat="role in user.roleList">
<span ng-repeat="permission in role.permissions">
{{permission.name}},
</span>
</span>
</td>
<td class="td-status">
<span ng-if="user.state==1" class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
<span ng-if="user.state==0" class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updateUser(user.id)">修改</a>
<a class="layui-btn layui-btn-danger" ng-if="user.state==0&&user.username!='admin'" ng-click="delUser(user.id)">删除</a>
<a class="layui-btn layui-btn-danger layui-btn-disabled" ng-if="user.username=='admin'">删除</a>
<a class="layui-btn layui-btn-info" ng-if="user.state==1" ng-click="openUser(user.id)">启用</a>
</td>
</tr>
</tbody>
</table>
</td>
<td class="td-status">
<span ng-if="user.state==1"
class="layui-btn layui-btn-normal layui-btn-mini layui-btn-disabled">已停用</span>
<span ng-if="user.state==0" class="layui-btn layui-btn-normal layui-btn-mini">已启用</span>
</td>
<td>
<a class="layui-btn layui-btn" ng-click="updateUser(user.id)">修改</a>
<a class="layui-btn layui-btn-danger" ng-if="user.state==0&&user.username!='admin'"
ng-click="delUser(user.id)">删除</a>
<a class="layui-btn layui-btn-danger layui-btn-disabled" ng-if="user.username=='admin'">删除</a>
<a class="layui-btn layui-btn-info" ng-if="user.state==1" ng-click="openUser(user.id)">启用</a>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<!-- /hbox layout -->
</div>
<!-- /hbox layout -->
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/userList/userList.js
View file @ f73676d5
app.controller('userListCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage','ngDialog','HttpService',
function($scope,$rootScope, $http,$state, $filter,$localStorage,ngDialog,HttpService) {
app.controller('userListCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', 'ngDialog', 'HttpService',
function ($scope, $rootScope, $http, $state, $filter, $localStorage, ngDialog, HttpService) {
if($rootScope.loginData.login === false){
$state.go("signin")
}else {
$state.go("layout.userList")
}
$scope.id = 'id';
// 用户列表
var getUserList = function(){
HttpService.getUserListData(function(data) {
$scope.userList = data;
console.log($scope.userList);
})
}
getUserList();
if ($rootScope.loginData.login === false) {
$state.go("signin")
} else {
$state.go("layout.userList")
}
$scope.id = 'id';
// 用户列表
var getUserList = function () {
HttpService.getUserListData(function (data) {
$scope.userList = data;
console.log($scope.userList);
})
}
getUserList();
// 添加
$scope.addUser = function(){
ngDialog.open({
template: 'dialogs/addUser.html' + urlTimeStamp(),
width:800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getAllActiveRoleList(function(data) {
$scope.activeRoleList = data;
})
$scope.userAdd = function(roleId){
var user={};
user.username=$scope.username;
user.name=$scope.name;
user.password=$scope.password;
user.roleId=roleId;
HttpService.addUser(user,function(data){
$scope.closeThisDialog();
getUserList();
// 添加
$scope.addUser = function () {
ngDialog.open({
template: 'dialogs/addUser.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getAllActiveRoleList(function (data) {
$scope.activeRoleList = data;
})
}
$scope.userAdd = function (roleId) {
var user = {};
user.username = $scope.username;
user.name = $scope.name;
user.password = $scope.password;
user.roleId = roleId;
HttpService.addUser(user, function (data) {
$scope.closeThisDialog();
getUserList();
})
}
}]
}]
})
}
})
}
// 删除
$scope.delUser = function(id){
HttpService.userDelete(id,function(data){
getUserList();
})
}
// 删除
$scope.delUser = function (id) {
HttpService.userDelete(id, function (data) {
getUserList();
})
}
// 启用
$scope.openUser = function(id){
HttpService.userOpen(id,function(data){
getUserList();
})
}
// 启用
$scope.openUser = function (id) {
HttpService.userOpen(id, function (data) {
getUserList();
})
}
// 修改
$scope.updateUser = function(id){
ngDialog.open({
template: 'dialogs/updateUser.html' + urlTimeStamp(),
width:800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getUserById(id,function(data){
$scope.thisUser = data.user;
console.log($scope.thisUser)
})
HttpService.getAllActiveRoleList(function(data) {
$scope.activeRoleList = data;
})
$scope.userUpdate = function(roleId){
var jsonUser = {};
jsonUser.username=$scope.thisUser.username;
jsonUser.name=$scope.thisUser.name;
jsonUser.id =$scope.thisUser.id;
jsonUser.oldRoleId=$scope.thisUser.roleList[0].id;
jsonUser.roleId=roleId;
console.log(jsonUser)
HttpService.updateUser(jsonUser,function(data){
$scope.closeThisDialog();
getUserList();
// 修改
$scope.updateUser = function (id) {
ngDialog.open({
template: 'dialogs/updateUser.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument: false,
controller: ['$scope', 'HttpService', '$rootScope', function ($scope, HttpService) {
HttpService.getUserById(id, function (data) {
$scope.thisUser = data.user;
console.log($scope.thisUser)
})
}
}]
HttpService.getAllActiveRoleList(function (data) {
$scope.activeRoleList = data;
})
$scope.userUpdate = function (roleId) {
var jsonUser = {};
jsonUser.username = $scope.thisUser.username;
jsonUser.name = $scope.thisUser.name;
jsonUser.id = $scope.thisUser.id;
jsonUser.oldRoleId = $scope.thisUser.roleList[0].id;
jsonUser.roleId = roleId;
console.log(jsonUser)
HttpService.updateUser(jsonUser, function (data) {
$scope.closeThisDialog();
getUserList();
})
}
}]
})
})
}
}
}])
\ No newline at end of file
}])
\ No newline at end of file
src/main/resources/static/tpl/layout/welcome/welcome.html
View file @ f73676d5
<div class="app-content-body fade-in-up">
<!-- main header -->
<div class="col">
<div class="bg-light lter b-b wrapper-md">
<!-- main header -->
<div class="col">
<div class="bg-light lter b-b wrapper-md">
<div class="row">
<div class="col-sm-12 col-xs-12">
<h1 class="m-n font-thin h3 text-black">制证任务概览</h1>
......@@ -10,5 +10,5 @@
</div>
</div>
</div>
<!-- / main header -->
<!-- / main header -->
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/welcome/welcome.js
View file @ f73676d5
app.controller('welcomeCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage', function($scope,$rootScope, $http,$state, $filter,$localStorage) {
app.controller('welcomeCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', function ($scope, $rootScope, $http, $state, $filter, $localStorage) {
if($rootScope.loginData.login == false){
if ($rootScope.loginData.login == false) {
$state.go("signin")
}
}])
\ No newline at end of file
src/main/resources/static/tpl/layout/yieldReport/yieldReport.html
View file @ f73676d5
<div class="app-content-body app-content-full fade-in-up" ng-class="{'h-full': app.hideFooter }">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light " ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<!-- hbox layout -->
<div class="hbox hbox-auto-xs hbox-auto-sm bg-light "
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div class="hbox hbox-auto-xs hbox-auto-sm">
<div class="col w-md bg-light dk b-r bg-auto">
<div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show" target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">{{msg}}</a>
<div class="hbox hbox-auto-xs hbox-auto-sm">
<div class="col w-md bg-light dk b-r bg-auto">
<div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">{{msg}}</a>
</div>
</div>
</div>
</div>
</div>
<!-- /hbox layout -->
</div>
<!-- /hbox layout -->
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/yieldReport/yieldReport.js
View file @ f73676d5
app.controller('yieldReportCtrl', ['$scope','$rootScope', '$http', '$state', '$filter','$localStorage', function($scope,$rootScope, $http,$state, $filter,$localStorage) {
if($rootScope.loginData.login == false){
app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$filter', '$localStorage', function ($scope, $rootScope, $http, $state, $filter, $localStorage) {
if ($rootScope.loginData.login == false) {
$state.go("signin")
}
......
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