Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_REFACTORING
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhangyusheng
YX_IDENT_REFACTORING
Commits
a6a4e88e
Commit
a6a4e88e
authored
Dec 12, 2018
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
编写任务单页面
parent
5b1715d0
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
598 additions
and
19 deletions
+598
-19
specialCardList.html
src/main/resources/static/dialogs/specialCardList.html
+28
-0
service.js
src/main/resources/static/js/services/service.js
+74
-0
cycleSheet.html
...in/resources/static/tpl/layout/cycleSheet/cycleSheet.html
+39
-13
cycleSheet.js
...main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
+86
-6
failedCard.html
...in/resources/static/tpl/layout/failedCard/failedCard.html
+157
-0
failedCard.js
...main/resources/static/tpl/layout/failedCard/failedCard.js
+214
-0
No files found.
src/main/resources/static/dialogs/specialCardList.html
0 → 100644
View file @
a6a4e88e
<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/js/services/service.js
View file @
a6a4e88e
...
@@ -380,7 +380,80 @@ app.service('MessageService', function (ngDialog) {
...
@@ -380,7 +380,80 @@ app.service('MessageService', function (ngDialog) {
var
errA
=
{
Error
:
true
,
ReturnCode
:
err
.
status
,
ReturnMsg
:
"API访问返回错误"
}
var
errA
=
{
Error
:
true
,
ReturnCode
:
err
.
status
,
ReturnMsg
:
"API访问返回错误"
}
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
})
})
},
getTypeListByTaskStateId
:
function
(
state
,
success
){
$http
({
method
:
'GET'
,
url
:
"../user/getTypeListByTaskStateId"
+
urlTimeStamp
(),
params
:{
taskStateId
:
state
}
}).
then
(
function
successCallback
(
response
)
{
success
(
response
.
data
)
},
function
(
err
){
var
errA
=
{
Error
:
true
,
ReturnCode
:
err
.
status
,
ReturnMsg
:
"API访问返回错误"
}
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
})
},
getCityListByCardType
:
function
(
cardType
,
state
,
success
){
$http
({
method
:
'GET'
,
url
:
"../user/getCityListByCardType"
+
urlTimeStamp
(),
params
:{
state
:
state
,
cardType
:
cardType
}
}).
then
(
function
successCallback
(
response
)
{
success
(
response
.
data
)
},
function
(
err
){
var
errA
=
{
Error
:
true
,
ReturnCode
:
err
.
status
,
ReturnMsg
:
"API访问返回错误"
}
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
})
},
getGroupNoByTaskListId
:
function
(
taskStateId
,
success
){
$http
({
method
:
'GET'
,
url
:
"../user/getGroupNoByTaskListId"
+
urlTimeStamp
(),
params
:{
taskStateId
:
taskStateId
}
}).
then
(
function
successCallback
(
response
)
{
success
(
response
.
data
)
},
function
(
err
){
var
errA
=
{
Error
:
true
,
ReturnCode
:
err
.
status
,
ReturnMsg
:
"API访问返回错误"
}
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
})
},
getCountyListByTaskListId
:
function
(
taskStateId
,
success
){
$http
({
method
:
'GET'
,
url
:
"../user/getCountyListByTaskListId"
+
urlTimeStamp
(),
params
:{
taskStateId
:
taskStateId
}
}).
then
(
function
successCallback
(
response
)
{
success
(
response
.
data
)
},
function
(
err
){
var
errA
=
{
Error
:
true
,
ReturnCode
:
err
.
status
,
ReturnMsg
:
"API访问返回错误"
}
MessageService
.
httpRequestFailed
(
JSON
.
stringify
(
errA
))
})
},
updateProductionTask
:
function
(
taskId
,
state
,
success
){
$http
({
method
:
'GET'
,
url
:
"../user/updateProductionTask"
+
urlTimeStamp
(),
params
:{
taskId
:
taskId
,
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
))
})
}
}
}
}
}])
}])
\ No newline at end of file
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @
a6a4e88e
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
<th>
不合格
</th>
<th>
不合格
</th>
<th>
机器号
</th>
<th>
机器号
</th>
<th>
状态
</th>
<th>
状态
</th>
<th></th>
<th>
操作
</th>
</thead>
</thead>
<tbody
ng-repeat=
"city in cityList| orderBy:citycode:desc"
>
<tbody
ng-repeat=
"city in cityList| orderBy:citycode:desc"
>
<tr>
<tr>
...
@@ -73,9 +73,11 @@
...
@@ -73,9 +73,11 @@
ng-show=
"city.printer_Id!=null"
>
机器
<span>
{{city.printer_Id}}
</span></span>
ng-show=
"city.printer_Id!=null"
>
机器
<span>
{{city.printer_Id}}
</span></span>
</td>
</td>
<td>
{{city.state}}
</td>
<td>
{{city.state}}
</td>
<td><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>
<tr
ng-show=
"showtable==city.task_Id"
>
<tr
ng-show=
"showtable==city.task_Id
&& userState<=4
"
>
<td></td>
<td></td>
<td
colspan=
"4"
>
<td
colspan=
"4"
>
<table
style=
"font-size:0.9em;color: #000;"
class=
"table"
>
<table
style=
"font-size:0.9em;color: #000;"
class=
"table"
>
...
@@ -83,26 +85,50 @@
...
@@ -83,26 +85,50 @@
<th>
组号
</th>
<th>
组号
</th>
<th>
合格数量
</th>
<th>
合格数量
</th>
<th>
不合格数量
</th>
<th>
不合格数量
</th>
<th></th>
<th>
特殊证件数量
</th>
<th>
特殊证件列表
</th>
</thead>
</thead>
<tbody>
<tbody>
<tr
ng-repeat=
"groups in city.list"
>
<tr
ng-repeat=
"group in groupList"
>
<td>
{{groups.groupNo}}
</td>
<td>
{{group.groupNO}}
</td>
<td>
{{groups.downloadCount}}
</td>
<td>
{{group.vaildCount}}
</td>
<td>
{{groups.type}}
</td>
<td>
{{group.invaildCount}}
</td>
<td></td>
<td>
{{group.specialCardCount}}
</td>
<td><a
ng-click=
"showTableGroup(group.specialCardList)"
>
特殊证件列表
</a></td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
</td>
</td>
</tr>
<tr
ng-show=
"showtable==city.task_Id && userState>4"
>
<td></td>
<td></td>
<td></td>
<td
colspan=
"4"
>
<td></td>
<table
style=
"font-size:0.9em;color: #000;"
class=
"table"
>
<td></td>
<thead>
<td></td>
<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>
</tr>
</tbody>
</tbody>
</table>
</table>
</div>
</div>
...
...
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @
a6a4e88e
app
.
controller
(
'cycleSheetCtrl'
,
[
'$scope'
,
'$rootScope'
,
'$http'
,
'$state'
,
'$filter'
,
'$localStorage'
,
function
(
$scope
,
$rootScope
,
$http
,
$state
,
$filter
,
$localStorage
)
{
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"
)
$state
.
go
(
"signin"
)
}
else
{
}
else
{
$state
.
go
(
"layout.cycleSheet"
)
$state
.
go
(
"layout.cycleSheet"
)
}
}
$scope
.
userState
=
$rootScope
.
loginData
.
state
;
// $scope.userState=5;
var
getNowFormatDate
=
function
()
{
var
getNowFormatDate
=
function
()
{
var
date
=
new
Date
();
var
date
=
new
Date
();
...
@@ -57,9 +59,66 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
...
@@ -57,9 +59,66 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
$scope
.
task_click
=
function
(){
$scope
.
task_click
=
function
(){
console
.
log
(
$rootScope
.
loginData
.
state
,
"----测试-----"
,
$scope
.
dt
,
"===="
);
console
.
log
(
$rootScope
.
loginData
.
state
,
"----测试-----"
,
$scope
.
dt
,
"===="
);
}
}
$scope
.
cardType
=
0
;
$scope
.
check_type
=
function
(
typeCode
){
$scope
.
check_type
=
function
(
typeCode
){
cardType
=
typeCode
;
console
.
log
(
$rootScope
.
loginData
.
state
,
"----测试-----"
,
$scope
.
dt
,
"===="
,
typeCode
,
"+++++++++++++"
);
console
.
log
(
$rootScope
.
loginData
.
state
,
"----测试-----"
,
$scope
.
dt
,
"===="
,
typeCode
,
"+++++++++++++"
);
}
}
// // 查询制证类型列表
// var getTypeListData = function (state) {
// HttpService.getTypeListByTaskStateId(1,function (data) {
// $scope.typeList = data.respData;
// console.log("---制证类型--数据源:")
// console.log(data.respData)
//
// })
// }
// getTypeListData($rootScope.loginData.state);
// $scope.nowType == $scope.getCityListData[$scope.currentTab].typeCode? $scope.currentTab=$scope.currentTab:$scope.currentTab= -1;
// for (var i = 0; i < $scope.getCityListData.length; i++) {
//
// if (i == $scope.currentTab) {
// $scope.getCityListData[i].isActive = true;
// } else {
// $scope.getCityListData[i].isActive = false;
// }
// }
// // 查询城市列表
// var getCityListData = function (cardType,state) {
// HttpService.getCityListByCardType(cardType,1,function (data) {
// $scope.cityList = data.respData;
// console.log("---城市列表--数据源:")
// console.log(data.respData)
//
// })
// }
// getCityListData(cardType,$rootScope.loginData.state);
// // 查询组号列表
// var getGroupListData = function (taskId) {
// HttpService.getGroupNoByTaskListId(taskId,function (data) {
// $scope.groupList = data.respData;
// console.log("---查询组号列表--数据源:")
// console.log(data.respData)
//
// })
// }
// // 查询区县列表
// var getCountyListData = function (taskId) {
// HttpService.getCountyListByTaskListId(taskId,function (data) {
// $scope.countyList = data.respData;
// console.log("---查询区县列表--数据源:")
// console.log(data.respData)
//
// })
// }
$scope
.
typeList
=
[
$scope
.
typeList
=
[
{
typeCode
:
0
,
typeCount
:
5000
,
typeName
:
'普通证'
},
{
typeCode
:
0
,
typeCount
:
5000
,
typeName
:
'普通证'
},
{
typeCode
:
1
,
typeCount
:
5000
,
typeName
:
'邮寄证'
},
{
typeCode
:
1
,
typeCount
:
5000
,
typeName
:
'邮寄证'
},
...
@@ -68,9 +127,9 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
...
@@ -68,9 +127,9 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
]
]
$scope
.
cityList
=
[
$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"
:
"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"
:
20181120
3
,
"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"
:
20181120
4
,
"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"
:
20181120
3
,
"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"
:
20181120
5
,
"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"
:
20181120
3
,
"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"
:
20181120
6
,
"task_State_Id"
:
1
},
]
]
$scope
.
groupList
=
[
$scope
.
groupList
=
[
...
@@ -79,11 +138,13 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
...
@@ -79,11 +138,13 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
{
"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
=
[
$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
}
]
]
$scope
.
showtable
=
-
1
;
$scope
.
showtable
=
-
1
;
$scope
.
showTable
DY
=
function
(
taskID
)
{
$scope
.
showTable
=
function
(
taskID
)
{
if
(
$scope
.
showtable
!=
taskID
)
{
if
(
$scope
.
showtable
!=
taskID
)
{
$scope
.
showtable
=
taskID
;
$scope
.
showtable
=
taskID
;
}
else
{
}
else
{
...
@@ -91,6 +152,25 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
...
@@ -91,6 +152,25 @@ app.controller('cycleSheetCtrl', ['$scope','$rootScope', '$http', '$state', '$fi
}
}
}
}
$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
.
folds
=
[
$scope
.
folds
=
[
{
id
:
1
,
name
:
'普通证'
,
count
:
10000
,
filter
:
''
,
isActive
:
true
,
dataTable
:{
{
id
:
1
,
name
:
'普通证'
,
count
:
10000
,
filter
:
''
,
isActive
:
true
,
dataTable
:{
"aaData"
:
[
"aaData"
:
[
...
...
src/main/resources/static/tpl/layout/failedCard/failedCard.html
0 → 100644
View file @
a6a4e88e
<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"
>
<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"
>
任务循环单
</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>
</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>
</thead>
<tbody
ng-repeat=
"city in cityList| orderBy:citycode:desc"
>
<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>
<span
style=
"padding-left:10px;"
ng-show=
"city.printer_Id==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>
</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>
<footer
class=
"panel-footer"
>
<div
class=
"row"
>
<div
class=
"col-sm-4 text-right text-center-xs"
>
<ul
class=
"pagination pagination-sm m-t-none m-b-none"
>
<li><a
href
><i
class=
"fa fa-chevron-left"
></i></a></li>
<li><a
href
>
1
</a></li>
<li><a
href
>
2
</a></li>
<li><a
href
>
3
</a></li>
<li><a
href
>
4
</a></li>
<li><a
href
>
5
</a></li>
<li><a
href
><i
class=
"fa fa-chevron-right"
></i></a></li>
</ul>
</div>
</div>
</footer>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/tpl/layout/failedCard/failedCard.js
0 → 100644
View file @
a6a4e88e
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.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
.
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
;
}
}
$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
.
folds
=
[
{
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
:{
"aaData"
:
[
{
"engine"
:
"Trident"
,
"browser"
:
"Internet Explorer 5.5"
,
"platform"
:
"Win 95+"
,
"version"
:
"5.5"
,
"grade"
:
"A"
},
{
"engine"
:
"Trident"
,
"browser"
:
"Internet Explorer 6"
,
"platform"
:
"Win 98+"
,
"version"
:
"6"
,
"grade"
:
"A"
},
{
"engine"
:
"Trident"
,
"browser"
:
"Internet Explorer 7"
,
"platform"
:
"Win XP SP2+"
,
"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"
}]
}}
];
$scope
.
currentTab
=
1
;
$scope
.
func
=
function
(
id
)
{
for
(
var
i
=
0
;
i
<
$scope
.
folds
.
length
;
i
++
){
if
(
id
==
$scope
.
folds
[
i
].
id
){
$scope
.
folds
[
i
].
isActive
=
true
;
}
else
{
$scope
.
folds
[
i
].
isActive
=
false
;
}
}
$scope
.
currentTab
=
id
;
}
}]);
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment