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
172a097e
Commit
172a097e
authored
Oct 15, 2024
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
b6be3c93
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
8 deletions
+18
-8
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+1
-0
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+14
-8
bookDinnerStatisticsDetails.vue
src/components/Restaurant/bookDinnerStatisticsDetails.vue
+1
-0
BusInfo.vue
src/components/busManagement/BusInfo.vue
+1
-0
admissionStatisticsDetails.vue
src/components/scenicSpot/admissionStatisticsDetails.vue
+1
-0
No files found.
src/components/Hotel/roomReservationsDetails.vue
View file @
172a097e
...
@@ -493,6 +493,7 @@
...
@@ -493,6 +493,7 @@
<el-option
:label=
"$t('ground.lingduidydf')"
:value=
'10'
></el-option>
<el-option
:label=
"$t('ground.lingduidydf')"
:value=
'10'
></el-option>
<el-option
:label=
"$t('ground.shuaka')"
:value=
'11'
></el-option>
<el-option
:label=
"$t('ground.shuaka')"
:value=
'11'
></el-option>
<el-option
:label=
"$t('objFill.zhuanzhang')"
:value=
'14'
></el-option>
<el-option
:label=
"$t('objFill.zhuanzhang')"
:value=
'14'
></el-option>
<el-option
:label=
"$t('ground.enterpriseAlipay')"
:value=
'15'
></el-option>
</el-select>
</el-select>
</td>
</td>
</tr>
</tr>
...
...
src/components/LeaderManagement/leaderReimbursement.vue
View file @
172a097e
...
@@ -165,6 +165,7 @@
...
@@ -165,6 +165,7 @@
<span
v-else-if=
"item.PayType === 7"
>
自由活动-无用车
</span>
<span
v-else-if=
"item.PayType === 7"
>
自由活动-无用车
</span>
<span
v-else-if=
"item.PayType === 6"
>
合团公司支付
</span>
<span
v-else-if=
"item.PayType === 6"
>
合团公司支付
</span>
<span
v-else-if=
"item.PayType === 8"
>
酒店接送
</span>
<span
v-else-if=
"item.PayType === 8"
>
酒店接送
</span>
<span
v-else-if=
"item.PayType === 15"
>
{{$t('ground.enterpriseAlipay')}}
</span>
<span
v-else
></span>
<span
v-else
></span>
<br
/>
<br
/>
<span
v-show=
"item.PayType==6"
>
付款团号:{{item.PayTypeTCNUM}}
</span>
<span
v-show=
"item.PayType==6"
>
付款团号:{{item.PayTypeTCNUM}}
</span>
...
@@ -364,10 +365,10 @@
...
@@ -364,10 +365,10 @@
</td>
</td>
<td
style=
"white-space:nowrap; "
>
<td
style=
"white-space:nowrap; "
>
<span
v-if=
"childItem.HouseType != 5"
>
<span
v-if=
"childItem.HouseType != 5"
>
{{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1||subItem.PayStyle === 11
||subItem.PayStyle === 15
? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</span>
</span>
<span
v-else
>
<span
v-else
>
{{(subItem.DMCPayType === 1||subItem.DMCPayType === 11) ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{(subItem.DMCPayType === 1||subItem.DMCPayType === 11
||subItem.DMCPayType === 15
) ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</span>
</span>
</td>
</td>
<td
v-if=
"childIndex==0"
:rowspan=
"subItem.OrderDetailsList.length"
>
<td
v-if=
"childIndex==0"
:rowspan=
"subItem.OrderDetailsList.length"
>
...
@@ -434,6 +435,7 @@
...
@@ -434,6 +435,7 @@
<span
v-else-if=
"subItem.PayStyle === 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.PayStyle === 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.PayStyle === 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.PayStyle === 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.PayStyle === 14"
>
转账
</span>
<span
v-else-if=
"subItem.PayStyle === 14"
>
转账
</span>
<span
v-else-if=
"subItem.PayStyle === 15"
>
{{$t('ground.enterpriseAlipay')}}
</span>
<span
v-else
></span>
<span
v-else
></span>
<br
/>
<br
/>
<span
v-show=
"subItem.PayStyle==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
<span
v-show=
"subItem.PayStyle==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
...
@@ -457,6 +459,7 @@
...
@@ -457,6 +459,7 @@
<span
v-else-if=
"subItem.DMCPayType === 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.DMCPayType === 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.DMCPayType === 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.DMCPayType === 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.DMCPayType === 14"
>
转账
</span>
<span
v-else-if=
"subItem.DMCPayType === 14"
>
转账
</span>
<span
v-else-if=
"subItem.DMCPayType === 15"
>
{{$t('ground.enterpriseAlipay')}}
</span>
<br
/>
<br
/>
<span
v-show=
"subItem.DMCPayType==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
<span
v-show=
"subItem.DMCPayType==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
</td>
</td>
...
@@ -473,6 +476,7 @@
...
@@ -473,6 +476,7 @@
<span
v-else-if=
"subItem.SupplierPayType == 9"
>
月结
</span>
<span
v-else-if=
"subItem.SupplierPayType == 9"
>
月结
</span>
<span
v-else-if=
"subItem.SupplierPayType == 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.SupplierPayType == 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.SupplierPayType == 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.SupplierPayType == 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.SupplierPayType === 15"
>
{{
$t
(
'ground.enterpriseAlipay'
)
}}
</span>
</
template
>
</
template
>
</span>
</span>
<div
v-if=
"subItem.IsHaveShouPeiFee==0"
style=
"color:red;"
>
无手配费
</div>
<div
v-if=
"subItem.IsHaveShouPeiFee==0"
style=
"color:red;"
>
无手配费
</div>
...
@@ -603,7 +607,7 @@
...
@@ -603,7 +607,7 @@
</p>
</p>
</td>
</td>
<td>
<td>
{{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
{{subItem.PayStyle === 1||subItem.PayStyle === 11
||subItem.PayStyle === 15
? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
</td>
<td>
<td>
{{childItem.DiscountPrice}}%
{{childItem.DiscountPrice}}%
...
@@ -618,6 +622,7 @@
...
@@ -618,6 +622,7 @@
<span
v-else-if=
"subItem.PayStyle === 6"
>
公司合团支付
</span>
<span
v-else-if=
"subItem.PayStyle === 6"
>
公司合团支付
</span>
<span
v-else-if=
"subItem.PayStyle === 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.PayStyle === 11"
>
刷卡
</span>
<span
v-else-if=
"subItem.PayStyle === 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.PayStyle === 10"
>
领队导游垫付
</span>
<span
v-else-if=
"subItem.PayStyle === 15"
>
{{$t('ground.enterpriseAlipay')}}
</span>
<span
v-else
></span>
<span
v-else
></span>
<br
/>
<br
/>
<span
v-show=
"subItem.PayStyle==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
<span
v-show=
"subItem.PayStyle==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
...
@@ -737,7 +742,7 @@
...
@@ -737,7 +742,7 @@
</p>
</p>
</td>
</td>
<td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
{{subItem.PayStyle === 1
||subItem.PayStyle === 15
? moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
</td>
<td>
<td>
{{childItem.DiscountPrice}}%
{{childItem.DiscountPrice}}%
...
@@ -752,6 +757,7 @@
...
@@ -752,6 +757,7 @@
<span
v-else-if=
"subItem.PayStyle === 5"
>
实物抵扣
</span>
<span
v-else-if=
"subItem.PayStyle === 5"
>
实物抵扣
</span>
<span
v-else-if=
"subItem.PayStyle === 6"
>
公司合团支付
</span>
<span
v-else-if=
"subItem.PayStyle === 6"
>
公司合团支付
</span>
<span
v-else-if=
"subItem.PayStyle === 12"
>
网订
</span>
<span
v-else-if=
"subItem.PayStyle === 12"
>
网订
</span>
<span
v-else-if=
"subItem.PayStyle === 15"
>
{{$t('ground.enterpriseAlipay')}}
</span>
<span
v-else
></span>
<span
v-else
></span>
<br
/>
<br
/>
<span
v-show=
"subItem.PayStyle==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
<span
v-show=
"subItem.PayStyle==6"
>
付款团号:{{subItem.PayTypeTCNUM}}
</span>
...
@@ -1800,8 +1806,8 @@
...
@@ -1800,8 +1806,8 @@
if
(
obj
.
TaxType
==
2
)
{
if
(
obj
.
TaxType
==
2
)
{
coefficient
=
1
+
0.1
;
coefficient
=
1
+
0.1
;
}
}
if
(
obj
.
PayStyle
===
1
||
obj
.
PayStyle
===
11
)
{
if
(
obj
.
PayStyle
===
1
||
obj
.
PayStyle
===
11
||
obj
.
PayStyle
===
15
)
{
if
(
index
==
4
&&
obj
.
DMCPayType
!==
1
&&
obj
.
DMCPayType
!==
11
)
{
if
(
index
==
4
&&
obj
.
DMCPayType
!==
1
&&
obj
.
DMCPayType
!==
11
&&
obj
.
DMCPayType
!==
15
)
{
totalPrice
+=
0
;
totalPrice
+=
0
;
}
else
{
}
else
{
totalPrice
+=
totalPrice
+=
...
@@ -1827,7 +1833,7 @@
...
@@ -1827,7 +1833,7 @@
(
x
.
UsePeopleNum
-
x
.
Discount
)
*
(
x
.
UsePeopleNum
-
x
.
Discount
)
*
(
1
-
x
.
DiscountPrice
/
100
);
(
1
-
x
.
DiscountPrice
/
100
);
});
});
if
(
!
(
sObj
.
PayStyle
==
1
||
sObj
.
PayStyle
==
11
))
{
if
(
!
(
sObj
.
PayStyle
==
1
||
sObj
.
PayStyle
==
11
||
sObj
.
PayStyle
===
15
))
{
totalPrice
=
0
;
totalPrice
=
0
;
}
}
return
this
.
moneyFormat
(
totalPrice
);
return
this
.
moneyFormat
(
totalPrice
);
...
@@ -1840,7 +1846,7 @@
...
@@ -1840,7 +1846,7 @@
(
x
.
UsePeopleNum
-
x
.
Discount
)
*
(
x
.
UsePeopleNum
-
x
.
Discount
)
*
(
1
-
x
.
DiscountPrice
/
100
);
(
1
-
x
.
DiscountPrice
/
100
);
});
});
if
(
sObj
.
PayStyle
!==
1
)
{
if
(
sObj
.
PayStyle
!==
1
||
sObj
.
PayStyle
!==
15
)
{
totalPrice
=
0
;
totalPrice
=
0
;
}
}
return
this
.
moneyFormat
(
totalPrice
);
return
this
.
moneyFormat
(
totalPrice
);
...
...
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @
172a097e
...
@@ -195,6 +195,7 @@
...
@@ -195,6 +195,7 @@
<el-option
:label=
'$t("ground.lingduidydf")'
:value=
'10'
></el-option>
<el-option
:label=
'$t("ground.lingduidydf")'
:value=
'10'
></el-option>
<el-option
:label=
'$t("ground.gongsihetzf")'
:value=
'6'
></el-option>
<el-option
:label=
'$t("ground.gongsihetzf")'
:value=
'6'
></el-option>
<el-option
:label=
'$t("ground.shuaka")'
:value=
'11'
></el-option>
<el-option
:label=
'$t("ground.shuaka")'
:value=
'11'
></el-option>
<el-option
:label=
"$t('ground.enterpriseAlipay')"
:value=
'15'
></el-option>
</el-select>
</el-select>
</td>
</td>
</tr>
</tr>
...
...
src/components/busManagement/BusInfo.vue
View file @
172a097e
...
@@ -324,6 +324,7 @@
...
@@ -324,6 +324,7 @@
<el-option
:label=
"$t('ground.htgszf')"
:value=
'6'
></el-option>
<el-option
:label=
"$t('ground.htgszf')"
:value=
'6'
></el-option>
<el-option
:label=
"$t('ground.zyhdwyc')"
:value=
'7'
></el-option>
<el-option
:label=
"$t('ground.zyhdwyc')"
:value=
'7'
></el-option>
<el-option
:label=
"$t('ground.jdjiesong')"
:value=
'8'
></el-option>
<el-option
:label=
"$t('ground.jdjiesong')"
:value=
'8'
></el-option>
<el-option
:label=
"$t('ground.enterpriseAlipay')"
:value=
'15'
></el-option>
</el-select>
</el-select>
</div>
</div>
</
template
>
</
template
>
...
...
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @
172a097e
...
@@ -155,6 +155,7 @@
...
@@ -155,6 +155,7 @@
<el-option
label=
'实物抵扣'
value=
'5'
></el-option>
<el-option
label=
'实物抵扣'
value=
'5'
></el-option>
<el-option
label=
'预付'
value=
'4'
></el-option>
<el-option
label=
'预付'
value=
'4'
></el-option>
<el-option
label=
'网订'
value=
'12'
></el-option>
<el-option
label=
'网订'
value=
'12'
></el-option>
<el-option
:label=
"$t('ground.enterpriseAlipay')"
:value=
'15'
></el-option>
</el-select>
</el-select>
</td>
</td>
</tr>
</tr>
...
...
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