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
b6392659
Commit
b6392659
authored
Nov 27, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
f0db0ba0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+8
-5
customerMap.vue
src/components/SalesModule/customerMap.vue
+1
-0
No files found.
src/components/LeaderManagement/leaderReimbursement.vue
View file @
b6392659
...
...
@@ -180,7 +180,7 @@
</tr>
<tr>
<th
colspan=
"26"
class=
"bgwhite"
>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.
08
- 返佣比例 / 100)
<br
/>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.
10
- 返佣比例 / 100)
<br
/>
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
<br
/>
司导间【月结】不计入总金额
</th>
...
...
@@ -298,7 +298,7 @@
<
template
v-if=
"subItem.RebateType==1"
>
<!--税别-->
<template
v-if=
"subItem.TaxType==2"
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
+
0.
08
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
+
0.
1
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
</
template
>
<
template
v-else
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
...
...
@@ -308,7 +308,7 @@
<
template
v-else
>
<!--税别-->
<template
v-if=
"subItem.TaxType==2"
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
+
0.
08
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
+
0.
1
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
</
template
>
<
template
v-else
>
{{
(
childItem
.
UnitPrice
*
(
childItem
.
BookNum
-
childItem
.
HotelDiscount
)
*
(
1
)
*
(
childItem
.
RebateRatio
/
100
)).
toFixed
(
2
)
}}
...
...
@@ -704,9 +704,12 @@
@
click=
"goZhiDan(item,0,leadr,cur)"
/>
</el-tooltip>
</
template
>
<
template
v-else-if=
"index2==0"
>
<
template
v-else-if=
"
ContractUrlCount !== 0 &&
index2==0"
>
<span>
未上传现付、刷卡的酒店手配书无法制单
</span>
</
template
>
<
template
v-else-if=
"!item.hideZDBtn && index2==0"
>
<span>
超过五天时间限制,无法制单
</span>
</
template
>
</template>
</div>
</td>
...
...
@@ -1138,7 +1141,7 @@
var
coefficient
=
1
;
//税别
if
(
obj
.
TaxType
==
2
)
{
coefficient
=
1
+
0.
08
;
coefficient
=
1
+
0.
1
;
}
if
(
obj
.
PayStyle
===
1
||
obj
.
PayStyle
===
11
)
{
if
(
index
==
4
&&
obj
.
DMCPayType
!==
1
&&
obj
.
DMCPayType
!==
11
)
{
...
...
src/components/SalesModule/customerMap.vue
View file @
b6392659
...
...
@@ -108,6 +108,7 @@ export default {
<p style="font-size: 14px;">联系电话:
${
res
.
data
.
data
.
ContactNumber
}
</p>
<p style="font-size: 14px;">门店名称:
${
res
.
data
.
data
.
CustomerName
}
</p>
<p style="font-size: 14px;">门店地址:
${
res
.
data
.
data
.
Address
}
</p>
<p style="font-size: 14px;">关联销售:
${
res
.
data
.
data
.
EmName
}
</p>
`
)
_this
.
map
.
openInfoWindow
(
infoWindow
,
e
.
point
);
}
...
...
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