Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Theater
Project
Project
Details
Activity
Releases
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
吴春
Theater
Commits
c07d35aa
Commit
c07d35aa
authored
Apr 25, 2019
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取票打印样式修改
parent
2f5ada8b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
341 additions
and
298 deletions
+341
-298
OrderDetail.cs
EheMall.Models/Models/订单管理/OrderDetail.cs
+1
-1
OrderSeat.cs
EheMall.Models/Models/订单管理/OrderSeat.cs
+7
-0
TakeTicketController.cs
....Web/Areas/TicketMall/Controllers/TakeTicketController.cs
+9
-4
Index.cshtml
EheMall.Web/Areas/TicketMall/Views/TakeTicket/Index.cshtml
+34
-29
_PrintDetails.cshtml
...eb/Areas/TicketMall/Views/TakeTicket/_PrintDetails.cshtml
+290
-264
No files found.
EheMall.Models/Models/订单管理/OrderDetail.cs
View file @
c07d35aa
...
...
@@ -6,7 +6,6 @@ using EheMall.EntityFramework.Entities;
using
System.ComponentModel.DataAnnotations
;
using
System.ComponentModel.DataAnnotations.Schema
;
using
EheMall.Models.Enums
;
namespace
EheMall.Models.Models
{
public
partial
class
OrderDetail
:
AggregateRoot
,
ISoftDeleted
...
...
@@ -94,5 +93,6 @@ namespace EheMall.Models.Models
/// </summary>
[
NotMapped
]
public
MemberTypeEnum
iMemberType
{
get
;
set
;
}
}
}
EheMall.Models/Models/订单管理/OrderSeat.cs
View file @
c07d35aa
...
...
@@ -94,5 +94,12 @@ namespace EheMall.Models.Models
/// </summary>
[
NotMapped
]
public
OrderStateEnum
OrderState
{
get
;
set
;
}
/// <summary>
/// 条形码
/// </summary>
[
NotMapped
]
public
System
.
IO
.
MemoryStream
mBarCode
{
get
;
set
;
}
}
}
EheMall.Web/Areas/TicketMall/Controllers/TakeTicketController.cs
View file @
c07d35aa
...
...
@@ -98,6 +98,10 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
model
.
OrderDetailList
=
_OrderDetailServices
.
GetListByArticleTypeID
(
model
.
ID
).
ToList
();
model
.
OrderSeatList
=
new
List
<
OrderSeat
>();
model
.
OrderSeatList
=
_OrderSeatService
.
GetListByArticleTypeID
(
model
.
ID
).
ToList
();
foreach
(
var
item
in
model
.
OrderSeatList
)
{
item
.
mBarCode
=
GenerateBarCodeBySpire
(
item
.
ID
.
ToString
());
}
}
return
PartialView
(
"_PrintDetails"
,
model
);
}
...
...
@@ -138,7 +142,7 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
}
#
region
生成条形码
private
void
GenerateBarCodeBySpire
(
string
Content
)
private
System
.
IO
.
MemoryStream
GenerateBarCodeBySpire
(
string
Content
)
{
BarcodeSettings
bs
=
new
BarcodeSettings
()
{
...
...
@@ -150,9 +154,10 @@ namespace EheMall.Web.Areas.TicketMall.Controllers
};
BarCodeGenerator
generator
=
new
BarCodeGenerator
(
bs
);
Image
barcode
=
generator
.
GenerateImage
();
//save the barcode as an image
barcode
.
Save
(
@"E:\barcode.png"
);
System
.
Drawing
.
Image
codeImage
=
barcode
;
System
.
IO
.
MemoryStream
ms
=
new
System
.
IO
.
MemoryStream
();
codeImage
.
Save
(
ms
,
System
.
Drawing
.
Imaging
.
ImageFormat
.
Jpeg
);
return
ms
;
}
#
endregion
...
...
EheMall.Web/Areas/TicketMall/Views/TakeTicket/Index.cshtml
View file @
c07d35aa
...
...
@@ -10,13 +10,16 @@
<title>
芙蓉国粹-取票
</title>
<style>
.PrintPage
{
width
:
3
9
0px
;
width
:
3
6
0px
;
height
:
440px
;
background-color
:
#fff
;
margin
:
auto
;
font-size
:
12px
;
display
:
inline-block
;
}
.PrintPage
:first-child
{
margin-left
:
0
;
}
.clearfix
::after
{
content
:
""
;
height
:
0
;
...
...
@@ -26,14 +29,8 @@
clear
:
both
;
}
.Tk_left
{
float
:
left
;
height
:
400px
;
margin-left
:
1rem
;
}
.tk_jvTitle
{
width
:
1
5rem
;
width
:
1
90px
;
font-size
:
14px
;
text-align
:
center
;
border-bottom
:
2px
solid
#221D1A
;
...
...
@@ -42,19 +39,19 @@
.commonBorder
{
border
:
1px
solid
#333232
;
border-radius
:
8px
;
height
:
52
px
;
height
:
45
px
;
font-size
:
12px
;
}
.hallLeft
{
float
:
left
;
width
:
103
px
;
width
:
75
px
;
}
.Timeright
{
width
:
1
28
px
;
width
:
1
10
px
;
float
:
left
;
margin-left
:
9.6
px
;
margin-left
:
5
px
;
}
.tk_yingting
{
...
...
@@ -91,7 +88,7 @@
}
.tk_pianName
{
width
:
240
px
;
width
:
193
px
;
}
.tk_yingpian
{
...
...
@@ -121,11 +118,11 @@
.tk_putong
{
float
:
left
;
width
:
74
px
;
width
:
93
px
;
height
:
52px
;
border
:
1px
solid
#333232
;
border-radius
:
8px
;
margin-right
:
8
px
;
margin-right
:
5
px
;
text-align
:
center
;
line-height
:
52px
;
font-size
:
12px
;
...
...
@@ -136,46 +133,46 @@
}
.tk_twoCode
{
width
:
240
px
;
width
:
193
px
;
height
:
5rem
;
}
.Tk_leftquan
{
float
:
righ
t
;
margin
:
0
15px
0
10
px
;
float
:
lef
t
;
margin
:
0
8px
0
6
px
;
}
.tk_quanList
{
width
:
20
px
;
height
:
20
px
;
margin-bottom
:
5
px
;
width
:
15
px
;
height
:
15
px
;
margin-bottom
:
4
px
;
border
:
1px
solid
#838280
;
border-radius
:
50%
;
}
.tk_piaoList
{
width
:
85
px
;
height
:
6
0px
;
width
:
70
px
;
height
:
5
0px
;
font-size
:
14px
;
color
:
#1D1918
;
text-align
:
center
;
border
:
1px
solid
#2B2728
;
border-radius
:
4px
;
margin-bottom
:
12
px
;
margin-bottom
:
6
px
;
}
.tk_pTou
{
width
:
100%
;
height
:
24px
;
border-bottom
:
1px
solid
#838280
;
color
:
#fff
;
font-size
:
12px
;
line-height
:
24px
;
}
.Tk_right
{
float
:
right
;
margin
:
0.81rem
1.25rem
0
0
;
float
:
left
;
width
:
70px
;
margin-top
:
13px
;
}
.tk_lastDiv
{
...
...
@@ -628,7 +625,15 @@
<script>
function
doPrint
(
how
)
{
var
myDoc
=
{
settings
:{
marginLeft
:
1
,
marginRight
:
1
,
marginTop
:
2
,
marginBottom
:
2
,
pageFrom
:
1
,
pageTo
:
2
,
portrait
:
false
},
documents
:
document
,
// 打印页面(div)们在本文档中
copyrights
:
'杰创软件拥有版权 www.jatools.com'
// 版权声明必须
};
...
...
EheMall.Web/Areas/TicketMall/Views/TakeTicket/_PrintDetails.cshtml
View file @
c07d35aa
This diff is collapsed.
Click to expand it.
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