Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
YX_IDENT_beijing_auxiliary_YD
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_beijing_auxiliary_YD
Commits
3c1c71da
Commit
3c1c71da
authored
May 07, 2019
by
dahai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
搜索框添加工作组属性
parent
25f8ca54
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
62 additions
and
24 deletions
+62
-24
SelectApi.java
src/main/java/com/yxproject/start/api/SelectApi.java
+1
-1
SelectSerialNumberMapper.java
.../com/yxproject/start/mapper/SelectSerialNumberMapper.java
+16
-16
service.js
src/main/resources/static/js/service.js
+6
-2
filmManagement.html
...resources/static/views/filmManagement/filmManagement.html
+19
-3
filmManagement.js
...n/resources/static/views/filmManagement/filmManagement.js
+15
-1
searchCard.html
src/main/resources/static/views/searchCard/searchCard.html
+5
-1
No files found.
src/main/java/com/yxproject/start/api/SelectApi.java
View file @
3c1c71da
...
...
@@ -58,7 +58,7 @@ public class SelectApi {
resultMap
.
put
(
"PRODData"
,
PRODData
);
}
else
{
return
null
;
//
return null;
}
return
resultMap
;
}
...
...
src/main/java/com/yxproject/start/mapper/SelectSerialNumberMapper.java
View file @
3c1c71da
...
...
@@ -15,26 +15,26 @@ public interface SelectSerialNumberMapper {
@Select
(
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"WHERE TASK.TASK_ID =#{id} and GROUP_NO.GROUP_NO is not null\n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n"
+
"UNION all \n"
+
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"WHERE TASK.TASK_ID =#{id}\n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE"
)
public
List
<
Map
<
String
,
Object
>>
selectByWorkOrder
(
String
id
);
...
...
@@ -43,26 +43,26 @@ public interface SelectSerialNumberMapper {
@Select
(
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"WHERE GROUP_NO.GROUP_NO =#{id} and GROUP_NO.GROUP_NO is not null\n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n"
+
"UNION all \n"
+
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"WHERE SPECIAL_CARD.accept_NO =#{id} \n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE"
)
public
List
<
Map
<
String
,
Object
>>
selectByGroupNo
(
String
id
);
...
...
@@ -81,28 +81,28 @@ public interface SelectSerialNumberMapper {
@Select
(
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ACCEPT_NO=GROUP_NO.GROUP_NO "
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n"
+
"UNION all \n"
+
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"LEFT JOIN PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "
+
"WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} \n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE"
)
public
List
<
Map
<
String
,
Object
>>
selectByAcceptNoOrCardIdFromTaskList2
(
String
id
);
...
...
@@ -112,28 +112,28 @@ public interface SelectSerialNumberMapper {
@Select
(
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN ACC_CARD_T@ACCU_LINK ON SUBSTR(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"WHERE GROUP_NO.GROUP_NO =substr(#{id},0,8) OR ACC_CARD_T.ID_NO=#{id} and GROUP_NO.GROUP_NO is not null\n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n"
+
"UNION all \n"
+
"select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n"
+
"CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n"
+
"TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n"
+
"TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count
,task.WORK_GROUP
\n"
+
"from TASK \n"
+
"LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n"
+
"LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n"
+
"LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n"
+
"LEFT JOIN ACC_CARD_T@ACCU_LINK ON ACC_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "
+
"WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} \n"
+
"group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"group by
task.WORK_GROUP,
TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n"
+
"TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n"
+
"TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE"
)
public
List
<
Map
<
String
,
Object
>>
selectByAcceptNoOrCardIdFromTaskList
(
String
id
);
...
...
src/main/resources/static/js/service.js
View file @
3c1c71da
...
...
@@ -162,6 +162,7 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
id
:
searchInput
}
}).
then
(
function
successCallback
(
response
)
{
console
.
log
(
response
.
data
,
"------------------------"
)
success
(
response
.
data
)
})
},
...
...
@@ -1259,10 +1260,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
success
(
response
.
data
)
})
},
selectFilmManagement
:
function
(
success
)
{
selectFilmManagement
:
function
(
date
,
success
)
{
$http
({
method
:
'GET'
,
url
:
"../MaterialManagementApi/selectPlasticFilm"
+
urlTimeStamp
()
url
:
"../MaterialManagementApi/selectPlasticFilm"
+
urlTimeStamp
(),
params
:{
date
:
date
}
}).
then
(
function
successCallback
(
response
)
{
success
(
response
.
data
)
})
...
...
src/main/resources/static/views/filmManagement/filmManagement.html
View file @
3c1c71da
...
...
@@ -60,6 +60,22 @@
<strong>
膜耗材操作记录
</strong>
</div>
<div
class=
"box box-primary"
>
<table
class=
"table table-bordered"
style=
"margin-bottom: 0;"
>
<tr>
<td
width=
"15%"
>
审核日期:
</td>
<td
colspan=
"2"
width=
"35%"
>
<div
class=
"input-group date"
style=
"width: 65%"
>
<div
class=
"input-group-addon"
>
<i
class=
"fa fa-calendar"
></i>
</div>
<input
type=
"text"
class=
"form-control pull-right"
ng-model=
"choseDate"
id=
"datepicker"
readonly
/>
</div>
</td>
<td
style=
"text-align: left;"
>
<button
class=
"btn btn-primary"
ng-click=
"selectMaterialManagement()"
>
查询
</button>
</td>
</tr>
</table>
<div
ng-if=
"filmManagement.length==0"
>
<h4
style=
"padding-left: 10px;"
>
暂无数据
</h4>
</div>
...
...
@@ -80,14 +96,14 @@
<tbody>
<tr
ng-repeat=
"item in filmManagement"
>
<td>
{{item.plasticFilmId}}
</td>
<td>
{{item.saveDate}}
</td>
<td>
{{item.saveDate
| date:'yyyy-MM-dd HH:mm:ss'
}}
</td>
<td>
{{item.totalCount}}
</td>
<td
ng-if=
"item.plasticFilmType==1"
>
出库
</td>
<td
ng-if=
"item.plasticFilmType==2"
>
入库
</td>
<td>
{{item.note}}
</td>
<td>
{{item.name}}
</td>
<td
ng-
if=
"ita
m.state==0"
><a
ng-click=
"updateFilmState(item)"
>
确认审核
</a></td>
<td
ng-
if=
"ita
m.state==1"
>
已确认
</td>
<td
ng-
show=
"ite
m.state==0"
><a
ng-click=
"updateFilmState(item)"
>
确认审核
</a></td>
<td
ng-
show=
"ite
m.state==1"
>
已确认
</td>
</tr>
</tbody>
</table>
...
...
src/main/resources/static/views/filmManagement/filmManagement.js
View file @
3c1c71da
...
...
@@ -11,6 +11,16 @@ angular.module('AvatarCheck.filmManagement', ['ngRoute', 'AvatarCheck.http'])
.
controller
(
'filmManagementCtrl'
,
function
(
$scope
,
$rootScope
,
$timeout
,
HttpService
,
ngDialog
,
MessageService
,
$filter
)
{
//Date picker
$
(
'#datepicker'
).
datetimepicker
({
minView
:
"month"
,
//选择日期后,不会再跳转去选择时分秒
language
:
'zh-CN'
,
format
:
'yyyy-mm-dd'
,
todayBtn
:
1
,
autoclose
:
1
});
$scope
.
choseDate
=
$filter
(
"date"
)(
new
Date
(),
"yyyy-MM-dd"
);
$scope
.
insertFilm
=
function
()
{
var
totalCount
=
$scope
.
totalCount
;
var
note
=
$scope
.
note
;
...
...
@@ -32,7 +42,11 @@ angular.module('AvatarCheck.filmManagement', ['ngRoute', 'AvatarCheck.http'])
}
$scope
.
selectFilmManagement
=
function
(){
HttpService
.
selectFilmManagement
(
function
(
data
)
{
var
date
=
$
(
'#datepicker'
).
val
();
if
(
date
==
''
){
date
=
$scope
.
choseDate
;
}
HttpService
.
selectFilmManagement
(
date
,
function
(
data
)
{
$scope
.
filmManagement
=
data
;
console
.
log
(
$scope
.
filmManagement
,
"$scope.filmManagement"
)
})
...
...
src/main/resources/static/views/searchCard/searchCard.html
View file @
3c1c71da
...
...
@@ -25,6 +25,7 @@
<th>
区县
</th>
<th>
制证类型
</th>
<th>
数量
</th>
<th>
工作组
</th>
<th>
下发日期
</th>
<th>
膜打印
</th>
<th>
预定位
</th>
...
...
@@ -37,6 +38,9 @@
<td>
{{item.COUNTYNAME}}
</td>
<td>
{{item.CARD_TYPE}}
</td>
<td>
{{item.VALID_COUNT}}
</td>
<td
ng-show=
"item.WORK_GROUP==1"
>
A组
</td>
<td
ng-show=
"item.WORK_GROUP==2"
>
B组
</td>
<td
ng-show=
"item.WORK_GROUP==null"
></td>
<td>
{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}
</td>
<td>
{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}
</td>
<td>
{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}
</td>
...
...
@@ -150,7 +154,7 @@
</div>
<!---没查到数据-->
<div
class=
"box-info"
ng-if=
"
searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0
"
>
ng-if=
"
(searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0) ||searchResult==null
"
>
<div>
<h4>
没有查询到相关信息
</h4>
</div>
...
...
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