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
7cea6b4c
Commit
7cea6b4c
authored
Apr 23, 2019
by
liboyang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
79dcf199
70f3cdbb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
receitp.js
src/main/resources/static/views/receitp/receitp.js
+2
-2
tagPrint.js
src/main/resources/static/views/tagPrint/tagPrint.js
+3
-3
No files found.
src/main/resources/static/views/receitp/receitp.js
View file @
7cea6b4c
...
@@ -13,14 +13,14 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
...
@@ -13,14 +13,14 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
//Date picker
//Date picker
$
(
'#datepicker1'
).
datetimepicker
({
$
(
'#datepicker1'
).
datetimepicker
({
minView
:
"month"
,
//选择日期后,不会再跳转去选择时分秒
minView
:
0
,
//选择到分钟
language
:
'zh-CN'
,
language
:
'zh-CN'
,
format
:
'yyyy-MM-dd HH:mm:ss'
,
format
:
'yyyy-MM-dd HH:mm:ss'
,
todayBtn
:
1
,
todayBtn
:
1
,
autoclose
:
1
autoclose
:
1
});
});
$
(
'#datepicker2'
).
datetimepicker
({
$
(
'#datepicker2'
).
datetimepicker
({
minView
:
"month"
,
//选择日期后,不会再跳转去选择时分秒
minView
:
0
,
//选择到分钟
language
:
'zh-CN'
,
language
:
'zh-CN'
,
format
:
'yyyy-MM-dd HH:mm:ss'
,
format
:
'yyyy-MM-dd HH:mm:ss'
,
todayBtn
:
1
,
todayBtn
:
1
,
...
...
src/main/resources/static/views/tagPrint/tagPrint.js
View file @
7cea6b4c
...
@@ -238,18 +238,18 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
...
@@ -238,18 +238,18 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
LODOP.SET_PRINT_PAGESIZE(1, "
80
mm
", "
50
mm
", "");
LODOP.SET_PRINT_PAGESIZE(1, "
80
mm
", "
50
mm
", "");
// LODOP.SET_PRINT_STYLE("
FontName
", "
黑体
");
// LODOP.SET_PRINT_STYLE("
FontName
", "
黑体
");
//设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
//设定该条形码在纸张内的位置和大小【Top, Left,Width, Height, CodeType, CodeValue】
LODOP.ADD_PRINT_BARCODE(
15,9
, "
78
mm
", "
20
mm
", "
128
A
", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
LODOP.ADD_PRINT_BARCODE(
24,12
, "
78
mm
", "
20
mm
", "
128
A
", $scope.json.policeCardsList[0].ACCEPT_NO.toString());
LODOP.SET_PRINT_STYLEA(0, "
FontSize
", 14);
LODOP.SET_PRINT_STYLEA(0, "
FontSize
", 14);
LODOP.SET_PRINT_STYLEA(0, "
Alignment
", 2);
LODOP.SET_PRINT_STYLEA(0, "
Alignment
", 2);
//设定该打印项在纸张内的位置和区域大小【Top,Left,Width,Height,strHtmlContent】
//设定该打印项在纸张内的位置和区域大小【Top,Left,Width,Height,strHtmlContent】
// LODOP.ADD_PRINT_HTM("
24
mm
", "
0
", "
80
mm
", "
24
mm
", document.getElementById("
tagDiv
").innerHTML);
// LODOP.ADD_PRINT_HTM("
24
mm
", "
0
", "
80
mm
", "
24
mm
", document.getElementById("
tagDiv
").innerHTML);
LODOP.ADD_PRINT_TEXT(10
2
, 0, "
100
%
", 20, $scope.json.policeData.toString());
LODOP.ADD_PRINT_TEXT(10
7
, 0, "
100
%
", 20, $scope.json.policeData.toString());
LODOP.SET_PRINT_STYLEA(0, "
Bold
", 1);
LODOP.SET_PRINT_STYLEA(0, "
Bold
", 1);
LODOP.SET_PRINT_STYLEA(0, "
Alignment
", 2);
LODOP.SET_PRINT_STYLEA(0, "
Alignment
", 2);
LODOP.SET_PRINT_STYLEA(0, "
FontSize
", 15);
LODOP.SET_PRINT_STYLEA(0, "
FontSize
", 15);
LODOP.ADD_PRINT_TEXT(13
2
, 0, "
100
%
", 20, $scope.json.policeName.toString());
LODOP.ADD_PRINT_TEXT(13
7
, 0, "
100
%
", 20, $scope.json.policeName.toString());
LODOP.SET_PRINT_STYLEA(0, "
Bold
", 1);
LODOP.SET_PRINT_STYLEA(0, "
Bold
", 1);
LODOP.SET_PRINT_STYLEA(0, "
Alignment
", 2);
LODOP.SET_PRINT_STYLEA(0, "
Alignment
", 2);
LODOP.SET_PRINT_STYLEA(0, "
VOrient
", 0);
LODOP.SET_PRINT_STYLEA(0, "
VOrient
", 0);
...
...
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