Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
b08dca0d
Commit
b08dca0d
authored
May 16, 2024
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
06e54896
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
549 additions
and
227 deletions
+549
-227
BatchPrintPage.vue
src/components/BatchPrintPage.vue
+145
-0
FinancialDocuments.vue
src/components/FinancialModule/FinancialDocuments.vue
+304
-213
BillModule.vue
...ponents/FinancialModule/FinancialSubmodule/BillModule.vue
+4
-2
ReceivablesModule.vue
.../FinancialModule/FinancialSubmodule/ReceivablesModule.vue
+4
-2
RecPayQuery.vue
src/components/FinancialModule/RecPayQuery.vue
+77
-3
signedFinance.vue
src/components/SalesModule/signedFinance.vue
+1
-1
signedFinanceALL.vue
src/components/SalesModule/signedFinanceALL.vue
+1
-1
signedFinanceCheck.vue
src/components/SalesModule/signedFinanceCheck.vue
+1
-1
signedFinanceForAll.vue
src/components/SalesModule/signedFinanceForAll.vue
+1
-1
cityManagement.vue
src/components/platformModule/cityManagement.vue
+1
-1
config.js
src/router/config.js
+10
-2
No files found.
src/components/BatchPrintPage.vue
0 → 100644
View file @
b08dca0d
<
style
scoped
>
._PrintPage
{
width
:
100%
;
background-color
:
white
;
position
:
absolute
;
padding-top
:
20px
;
}
._PrintPage_box
{
width
:
1000px
;
margin
:
0
auto
;
padding
:
0
!important
;
}
._border_1
{
border
:
1px
solid
#333333
;
margin-bottom
:
30px
;
/* page-break-after: always; */
}
/* @media print {
._PrintPage{
margin-left:-145px;
}
} */
._PrintPage_box
{
position
:
relative
;
}
._PrintPage_box
.SetDiv
{
position
:
absolute
;
top
:
10px
;
color
:
#106BAF
;
left
:
-290px
;
}
._PrintPage_box
.SetDiv
span
{
color
:
#106BAF
;
cursor
:
pointer
;
font-size
:
15px
;
}
._PrintPage_Center
+
._PrintPage_always
{
page-break-before
:
always
;
}
</
style
>
<
template
v-loading=
"loading"
>
<div
class=
"_PrintPage"
>
<div
class=
"_PrintPage_box"
>
<div
v-for=
"(items,index) in printDatas"
:class=
"[index% 2 == 0?'_PrintPage_always':'_PrintPage_Center']"
>
<template
v-if=
"items.type=='2'&&(items.Merge=='0'||items.Merge==null)"
>
<div
class=
"SetDiv"
>
<el-select
size=
"mini"
v-model=
"titleName"
:placeholder=
"$t('objFill.qingxuanzhettname')"
style=
"width: 150px;"
>
<el-option
v-for=
"item in optionsList"
:key=
"item.value"
:label=
"item.Name"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<template
v-for=
"(item,index) in loopNumT"
>
<div
v-if=
"index+1==2"
:class=
"
{'_border_1':index+1==2}">
<my-Bill
:ID=
"items.id"
:width=
"widthSon"
:isPrintPage=
"true"
:color=
"colorSon"
:OrderSource=
"items.OrderSource"
:name=
'index+1'
:titleName=
"titleName"
></my-Bill>
</div>
</
template
>
</template>
<
template
v-else-if=
"items.type=='1'&&(items.Merge=='0'||items.Merge==null)"
>
<div
class=
"SetDiv"
>
<el-select
size=
"mini"
v-model=
"titleName"
:placeholder=
"$t('objFill.qingxuanzhettname')"
style=
"width: 150px;"
>
<el-option
v-for=
"item in optionsList"
:key=
"item.value"
:label=
"item.Name"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<template
v-for=
"(item,index) in loopNumN"
>
<div
v-if=
"index+1==2"
class=
"_border_1"
>
<my-RVB-Bill
v-on:helloPP=
"numAdd"
:Num=
"num"
:ID=
"items.id"
:width=
"widthSon"
:isPrintPage=
"true"
:OrderSource=
"items.OrderSource"
:color=
"colorSon"
:name=
'index+1'
:titleName=
"titleName"
></my-RVB-Bill>
</div>
</
template
>
</template>
<
template
v-if=
"items.type=='7'&&(items.Merge=='0'||items.Merge==null)"
>
<template
v-for=
"(item,index) in loopNumT"
>
<div
v-if=
"index+1==2"
class=
"_border_1"
>
<my-GZ-Bill
:ID=
"items.id"
:width=
"widthSon"
:isPrintPage=
"true"
:color=
"colorSon"
:OrderSource=
"items.OrderSource"
:name=
'index+1'
></my-GZ-Bill>
</div>
</
template
>
</template>
<
template
v-if=
"items.Merge=='1'"
>
<template
v-for=
"(item,index) in loopNumN"
>
<div
v-if=
"index+1==2"
class=
"_border_1"
>
<my-HB-Bill
v-on:helloPP=
"numAdd"
:Num=
"num"
:ID=
"items.id"
:width=
"widthSon"
:isPrintPage=
"true"
:color=
"colorSon"
:name=
'index+1'
></my-HB-Bill>
</div>
</
template
>
</template>
</div>
</div>
</div>
</template>
<
script
>
import
myBill
from
"./FinancialModule/FinancialSubmodule/BillModule.vue"
;
import
myrbvBill
from
"./FinancialModule/FinancialSubmodule/ReceivablesModule.vue"
;
import
myhrBill
from
"./FinancialModule/FinancialSubmodule/MergeBillModule.vue"
;
import
myGZBill
from
"./FinancialModule/FinancialSubmodule/GZBillModule.vue"
;
export
default
{
data
(){
return
{
titleName
:
''
,
optionsList
:[
{
Name
:
'和平'
,
value
:
'四川和平国际旅行社'
},
{
Name
:
'微途'
,
value
:
'成都微途科技有限公司'
},
{
Name
:
'欧亚'
,
value
:
'成都欧亚旅行社'
},
{
Name
:
'兆鸿'
,
value
:
'四川兆鸿文化传播有限公司'
},
],
loading
:
true
,
id
:
null
,
type
:
null
,
isKehu
:
null
,
widthSon
:
"100%"
,
colorSon
:
"#ffffff"
,
num
:
0
,
loopNumN
:
this
.
$route
.
query
.
isKehu
==
'1'
?
3
:
2
,
loopNumT
:
2
,
Merge
:
null
,
OrderSource
:
-
1
,
printDatas
:[]
}
},
components
:{
'my-Bill'
:
myBill
,
'my-RVB-Bill'
:
myrbvBill
,
'my-HB-Bill'
:
myhrBill
,
'my-GZ-Bill'
:
myGZBill
},
methods
:{
numAdd
(){
this
.
num
=
this
.
num
+
1
}
},
mounted
(){
},
created
(){
this
.
printDatas
=
JSON
.
parse
(
this
.
$route
.
query
.
list
)
this
.
$i18n
.
locale
=
localStorage
.
language
?
localStorage
.
language
:
'zh-CN'
}
}
</
script
>
src/components/FinancialModule/FinancialDocuments.vue
View file @
b08dca0d
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @
b08dca0d
...
@@ -298,11 +298,13 @@
...
@@ -298,11 +298,13 @@
<tr
v-if=
"isPrintPage"
>
<tr
v-if=
"isPrintPage"
>
<td
height=
"26px"
>
{{$t('hotel.hotel_remark')}}
</td>
<td
height=
"26px"
>
{{$t('hotel.hotel_remark')}}
</td>
<td
height=
"26px"
colspan=
"7"
>
<td
height=
"26px"
colspan=
"7"
>
{{GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark ? GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark : $t('fnc.no')}}
<
template
v-if=
"GetDetail.AuditSteps&&GetDetail.AuditSteps.length>0"
>
{{
GetDetail
.
AuditSteps
[
GetDetail
.
AuditSteps
.
length
-
1
].
AuditRecordList
[
0
].
Remark
?
GetDetail
.
AuditSteps
[
GetDetail
.
AuditSteps
.
length
-
1
].
AuditRecordList
[
0
].
Remark
:
$t
(
'fnc.no'
)
}}
</
template
>
</td>
</td>
</tr>
</tr>
</table>
</table>
<div
class=
"rb_top_row _r_mt10"
v-if=
"GetDetail.AuditSteps&&GetDetail.AuditSteps.length"
>
<div
class=
"rb_top_row _r_mt10"
v-if=
"GetDetail.AuditSteps&&GetDetail.AuditSteps.length
>0
"
>
<
template
v-for=
"(item,index) in GetDetail.AuditSteps"
>
<
template
v-for=
"(item,index) in GetDetail.AuditSteps"
>
<p>
<p>
<span
class=
"font_color_b"
>
{{
item
.
AuditDescription
}}
:
</span>
<span
class=
"font_color_b"
>
{{
item
.
AuditDescription
}}
:
</span>
...
...
src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue
View file @
b08dca0d
...
@@ -245,11 +245,13 @@
...
@@ -245,11 +245,13 @@
<tr
v-if=
"isPrintPage"
>
<tr
v-if=
"isPrintPage"
>
<td
height=
"26px"
>
{{$t('hotel.hotel_remark')}}
</td>
<td
height=
"26px"
>
{{$t('hotel.hotel_remark')}}
</td>
<td
height=
"26px"
colspan=
"7"
>
<td
height=
"26px"
colspan=
"7"
>
{{GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark ? GetDetail.AuditSteps[GetDetail.AuditSteps.length-1].AuditRecordList[0].Remark : $t('fnc.no')}}
<
template
v-if=
"GetDetail.AuditSteps&&GetDetail.AuditSteps.length>0"
>
{{
GetDetail
.
AuditSteps
[
GetDetail
.
AuditSteps
.
length
-
1
].
AuditRecordList
[
0
].
Remark
?
GetDetail
.
AuditSteps
[
GetDetail
.
AuditSteps
.
length
-
1
].
AuditRecordList
[
0
].
Remark
:
$t
(
'fnc.no'
)
}}
</
template
>
</td>
</td>
</tr>
</tr>
</table>
</table>
<div
class=
"rb_top_row _r_mt10"
v-if=
"GetDetail.AuditSteps&&GetDetail.AuditSteps.length"
>
<div
class=
"rb_top_row _r_mt10"
v-if=
"GetDetail.AuditSteps&&GetDetail.AuditSteps.length
>0
"
>
<
template
v-for=
"(item,index) in GetDetail.AuditSteps"
>
<
template
v-for=
"(item,index) in GetDetail.AuditSteps"
>
<p>
<p>
<span
class=
"font_color_r"
>
{{
item
.
AuditDescription
}}
:
</span>
<span
class=
"font_color_r"
>
{{
item
.
AuditDescription
}}
:
</span>
...
...
src/components/FinancialModule/RecPayQuery.vue
View file @
b08dca0d
...
@@ -312,11 +312,21 @@
...
@@ -312,11 +312,21 @@
v
-
if
=
"IsUpdatePayment"
v
-
if
=
"IsUpdatePayment"
:
loading
=
"loadingDC2"
class
=
"normalBtn"
:
loading
=
"loadingDC2"
class
=
"normalBtn"
@
click
=
"method5(2)"
>
{{
$t
(
'objFill.fapiaopzdc'
)
}}
<
/el-button
>
@
click
=
"method5(2)"
>
{{
$t
(
'objFill.fapiaopzdc'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"isBatchPrinting"
:
loading
=
"loadingDC"
class
=
"normalBtn"
@
click
=
"goPrinting()"
>
批量打印
<
/el-button
>
<
/li
>
<
/li
>
<
/ul
>
<
/ul
>
<
/div
>
<
/div
>
<
div
class
=
"_fnDm_content"
v
-
loading
=
'loading'
>
<
div
class
=
"_fnDm_content"
v
-
loading
=
'loading'
>
<
el
-
table
ref
=
"multipleTable"
:
data
=
"DataList"
tooltip
-
effect
=
"dark"
style
=
"width: 100%"
>
<
el
-
table
ref
=
"multipleTable"
:
data
=
"DataList"
tooltip
-
effect
=
"dark"
style
=
"width: 100%"
@
selection
-
change
=
"handleSelectionChange"
row
-
key
=
"FrID"
>
<
el
-
table
-
column
v
-
if
=
"isBatchPrinting"
:
reserve
-
selection
=
"true"
type
=
"selection"
width
=
"55"
>
<
/el-table-column
>
<
el
-
table
-
column
prop
=
"address"
:
label
=
"$t('fnc.danhao')"
width
=
"90"
>
<
el
-
table
-
column
prop
=
"address"
:
label
=
"$t('fnc.danhao')"
width
=
"90"
>
<
template
slot
-
scope
=
"scope"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
popover
popper
-
class
=
"detailsIT_Journal"
placement
=
"bottom-start"
trigger
=
"click"
>
<
el
-
popover
popper
-
class
=
"detailsIT_Journal"
placement
=
"bottom-start"
trigger
=
"click"
>
...
@@ -728,8 +738,12 @@
...
@@ -728,8 +738,12 @@
<
div
style
=
"padding-bottom:15px"
>
<
div
style
=
"padding-bottom:15px"
>
<
el
-
pagination
background
@
current
-
change
=
"handleCurrentChanges"
layout
=
"total,prev, pager, next, jumper"
<
el
-
pagination
background
:
page
-
size
=
"pageSize"
:
total
=
'total'
>
@
current
-
change
=
"handleCurrentChanges"
@
size
-
change
=
"handleSizeChange"
layout
=
"total,sizes,prev, pager, next, jumper"
:
page
-
size
=
"msg.pageSize"
:
total
=
'total'
:
page
-
sizes
=
"[5,15,20,30,50,100,200]"
>
<
/el-pagination
>
<
/el-pagination
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
@@ -1026,6 +1040,8 @@
...
@@ -1026,6 +1040,8 @@
}
,
}
,
dialogTitle
:
""
,
dialogTitle
:
""
,
dialogTitle1
:
""
,
dialogTitle1
:
""
,
multipleSelection
:
[],
isBatchPrinting
:
false
,
}
}
}
,
}
,
created
()
{
created
()
{
...
@@ -1050,6 +1066,9 @@
...
@@ -1050,6 +1066,9 @@
if
(
ActionMenuCode
.
indexOf
(
"F_AccountantFinanceMerge"
)
!=
-
1
)
{
if
(
ActionMenuCode
.
indexOf
(
"F_AccountantFinanceMerge"
)
!=
-
1
)
{
this
.
IsUpdatePayment
=
true
this
.
IsUpdatePayment
=
true
}
}
if
(
ActionMenuCode
.
indexOf
(
"isBatchPrinting"
)
!=
-
1
)
{
this
.
isBatchPrinting
=
true
}
if
(
this
.
$route
.
query
.
returnCode
)
{
if
(
this
.
$route
.
query
.
returnCode
)
{
this
.
active
=
this
.
$route
.
query
.
returnCode
;
this
.
active
=
this
.
$route
.
query
.
returnCode
;
this
.
msg
.
Conditon
=
this
.
$route
.
query
.
returnCode
;
this
.
msg
.
Conditon
=
this
.
$route
.
query
.
returnCode
;
...
@@ -1135,6 +1154,56 @@
...
@@ -1135,6 +1154,56 @@
}
)
}
)
}
,
}
,
methods
:
{
methods
:
{
goPrinting
(){
if
(
this
.
multipleSelection
.
length
==
0
)
return
this
.
$message
({
type
:
'info'
,
message
:
'请选择需要打印的数据'
,
}
);
// GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource
let
routeData
=
this
.
$router
.
resolve
({
name
:
'BatchPrintPage'
,
query
:
{
list
:
JSON
.
stringify
(
this
.
multipleSelection
),
}
}
);
window
.
open
(
routeData
.
href
,
"_blank"
);
}
,
handleSelectionChange
(
val
){
this
.
multipleSelection
=
[]
let
type1
=
{
type
:
null
,
id
:
null
,
isKehu
:
0
,
Merge
:
null
,
OrderSource
:
null
}
let
type2
=
{
type
:
null
,
id
:
null
,
Merge
:
null
,
OrderSource
:
null
}
val
.
forEach
(
x
=>
{
if
(
x
.
Type
==
1
){
type1
=
{
type
:
String
(
x
.
Type
),
id
:
x
.
FrID
,
isKehu
:
0
,
Merge
:
x
.
Is_Merge
,
OrderSource
:
x
.
OrderSource
?
x
.
OrderSource
:
-
1
}
this
.
multipleSelection
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
type1
)))
}
else
{
type2
=
{
type
:
String
(
x
.
Type
),
id
:
x
.
FrID
,
Merge
:
x
.
Is_Merge
,
OrderSource
:
x
.
OrderSource
?
x
.
OrderSource
:
-
1
}
this
.
multipleSelection
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
type2
)))
}
}
)
}
,
ClaerClientAccountList
(){
ClaerClientAccountList
(){
this
.
ClientAccountList
=
[];
this
.
ClientAccountList
=
[];
}
,
}
,
...
@@ -1281,6 +1350,11 @@
...
@@ -1281,6 +1350,11 @@
}
,
}
,
// 数据筛选
// 数据筛选
filterMethod
(
filters
)
{
}
,
filterMethod
(
filters
)
{
}
,
// 更改每页条数
handleSizeChange
(
val
)
{
this
.
msg
.
pageSize
=
val
this
.
getPageList
();
}
,
handleCurrentChanges
(
val
)
{
handleCurrentChanges
(
val
)
{
this
.
pageIndex
=
this
.
msg
.
pageIndex
=
val
;
this
.
pageIndex
=
this
.
msg
.
pageIndex
=
val
;
this
.
getPageList
();
this
.
getPageList
();
...
...
src/components/SalesModule/signedFinance.vue
View file @
b08dca0d
...
@@ -902,7 +902,7 @@ tr._item_list td:last-child {
...
@@ -902,7 +902,7 @@ tr._item_list td:last-child {
float
:
left
;
float
:
left
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#666
;
color
:
#666
;
margin
:
20px
30px
20
px
0
;
margin
:
5px
30px
5
px
0
;
}
}
input
::-webkit-outer-spin-button
,
input
::-webkit-outer-spin-button
,
input
::-webkit-inner-spin-button
{
input
::-webkit-inner-spin-button
{
...
...
src/components/SalesModule/signedFinanceALL.vue
View file @
b08dca0d
...
@@ -464,7 +464,7 @@ tr._item_list td:last-child {
...
@@ -464,7 +464,7 @@ tr._item_list td:last-child {
float
:
left
;
float
:
left
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#666
;
color
:
#666
;
margin
:
20px
30px
20
px
0
;
margin
:
5px
30px
5
px
0
;
}
}
input
::-webkit-outer-spin-button
,
input
::-webkit-outer-spin-button
,
input
::-webkit-inner-spin-button
{
input
::-webkit-inner-spin-button
{
...
...
src/components/SalesModule/signedFinanceCheck.vue
View file @
b08dca0d
...
@@ -873,7 +873,7 @@ tr._item_list td:last-child {
...
@@ -873,7 +873,7 @@ tr._item_list td:last-child {
float
:
left
;
float
:
left
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#666
;
color
:
#666
;
margin
:
20px
30px
20
px
0
;
margin
:
5px
30px
5
px
0
;
}
}
input
::-webkit-outer-spin-button
,
input
::-webkit-outer-spin-button
,
input
::-webkit-inner-spin-button
{
input
::-webkit-inner-spin-button
{
...
...
src/components/SalesModule/signedFinanceForAll.vue
View file @
b08dca0d
...
@@ -911,7 +911,7 @@
...
@@ -911,7 +911,7 @@
float
:
left
;
float
:
left
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#666
;
color
:
#666
;
margin
:
20px
30px
20
px
0
;
margin
:
5px
30px
5
px
0
;
}
}
input
::-webkit-outer-spin-button
,
input
::-webkit-outer-spin-button
,
...
...
src/components/platformModule/cityManagement.vue
View file @
b08dca0d
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
}
}
.cityManagement
.query-box
li
{
.cityManagement
.query-box
li
{
margin
:
20px
30px
20
px
0
;
margin
:
5px
30px
5
px
0
;
}
}
.cityManagement
._addUpload_box
>
div
:hover
{
.cityManagement
._addUpload_box
>
div
:hover
{
...
...
src/router/config.js
View file @
b08dca0d
...
@@ -259,7 +259,7 @@ export default {
...
@@ -259,7 +259,7 @@ export default {
title
:
'员工管理'
title
:
'员工管理'
},
},
},
},
{
{
path
:
'/Temporarystaff'
,
//员工管理
path
:
'/Temporarystaff'
,
//员工管理
name
:
'Temporarystaff'
,
name
:
'Temporarystaff'
,
...
@@ -6218,6 +6218,14 @@ export default {
...
@@ -6218,6 +6218,14 @@ export default {
meta
:
{
meta
:
{
title
:
'支付宝支付'
title
:
'支付宝支付'
},
},
}
},
{
path
:
'/BatchPrintPage'
,
//财务打印页面
name
:
'BatchPrintPage'
,
component
:
resolve
=>
require
([
'@/components/BatchPrintPage'
],
resolve
),
meta
:
{
title
:
'财务批量打印页面'
},
},
]
]
}
}
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