Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
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
罗超
confucius
Commits
924ca6ae
Commit
924ca6ae
authored
Jun 22, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新加订单的额外奖励参数
parent
77e00540
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
6 deletions
+31
-6
orderlist.vue
src/components/sale/orderlist.vue
+13
-3
CommissionDetail.vue
src/pages/financial/CommissionDetail.vue
+4
-0
cycleOrderList.vue
src/pages/financial/cycleOrderList.vue
+13
-2
FinancialDocumentsDetail.vue
...s/financial/financalDocument/FinancialDocumentsDetail.vue
+1
-1
No files found.
src/components/sale/orderlist.vue
View file @
924ca6ae
...
...
@@ -100,13 +100,15 @@
报价单:
<span
class=
"order_OfferId"
@
click=
"goQuotation(item.OfferId)"
style=
"font-size:14px;"
>
{{item.OfferId}}
</span>
</div>
<div
style=
"color:red"
v-if=
"item.YFCommissionMoney>0"
>
应发提成:{{item.YFCommissionMoney}}
</div>
<
template
v-if=
"item.IsCommissionGive==1"
>
<div
style=
"margin-top:30px;"
>
提成:
{{
item
.
CommissionMoney
}}
</div>
<div
style=
"color:red;cursor: pointer;text-decoration: underline;"
@
click=
'gourltx(item.OrderId)'
>
提成:
{{
item
.
CommissionMoney
}}
</div>
<div
style=
"color:red"
v-if=
"item.ExtraCommissionMoney>0"
>
额外奖励实发:
{{
item
.
ExtraCommissionMoney
}}
</div>
</
template
>
<
template
>
<div
style=
"margin-top:30px;color:red;"
v-if=
"item.ExtraRewardMoney>0"
>
额外奖励:
{{
item
.
ExtraRewardMoney
}}
</div>
<div
style=
"color:red;"
v-if=
"item.ExtraRewardMoney>0"
>
额外奖励:
{{
item
.
ExtraRewardMoney
}}
</div>
<div
style=
"color:red"
v-if=
"item.ExtraDeductMoney>0"
>
额外扣除:
{{
item
.
ExtraDeductMoney
}}
</div>
<div
style=
"color:red"
v-if=
"item.CommissionBack>0"
>
补交提成:
{{
item
.
CommissionBack
}}
</div>
</
template
>
</td>
<td
style=
"border:none"
>
{{item.GuestNum}}人
</td>
...
...
@@ -1287,6 +1289,14 @@
path
:
'/sale/contractManage'
,
query
:
{}
});
},
gourltx
(
OrderId
){
this
.
$router
.
push
({
path
:
'/financial/cycleOrderList'
,
query
:
{
OrderId
:
OrderId
}
});
}
}
}
...
...
src/pages/financial/CommissionDetail.vue
View file @
924ca6ae
...
...
@@ -113,6 +113,7 @@
UserId
:
0
,
ClassId
:
0
,
OrderId
:
''
,
School_Id
:
'-1'
,
},
pageCount
:
0
,
persistent
:
false
,
...
...
@@ -145,6 +146,9 @@
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
id
){
this
.
msg
.
PeriodId
=
this
.
$route
.
query
.
id
}
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
School_Id
){
this
.
msg
.
School_Id
=
this
.
$route
.
query
.
School_Id
}
this
.
getList
()
this
.
setClass
()
},
...
...
src/pages/financial/cycleOrderList.vue
View file @
924ca6ae
...
...
@@ -39,7 +39,6 @@
<div
class=
"col row wrap q-mr-lg q-col-gutter-md"
>
<div
class=
"col-3"
>
<q-btn
:loading=
"loading1"
color=
"primary"
size=
"11px"
label=
"返回"
@
click=
"goreturn"
style=
"margin-left:10px"
/>
</div>
</div>
</div>
...
...
@@ -147,9 +146,21 @@
SchoolNamelist
:[],
DeptNamelist
:[],
UserNamelist
:[],
see_tcdetailed
:
false
,
}
},
created
()
{
let
userinfo
=
this
.
getLocalStorage
();
userinfo
.
ActionMenuList
.
map
(
x
=>
{
//判断权限
if
(
x
.
FunctionCode
==
"see_tcdetailed"
){
//判断是否可以查看其他明细
this
.
see_tcdetailed
=
true
;
}
})
if
(
this
.
see_tcdetailed
==
false
){
this
.
msg
.
UserId
=
userinfo
.
Id
}
},
created
()
{},
mounted
()
{
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
OrderId
){
this
.
msg
.
OrderId
=
this
.
$route
.
query
.
OrderId
...
...
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @
924ca6ae
...
...
@@ -2156,7 +2156,7 @@
}
else
if
(
OtherType
==
33
){
tempStr
=
'/financial/financalDocument/InAndOutDdetails?id='
+
ID
;
}
else
if
(
OtherType
==
39
){
tempStr
=
'/financial/CommissionDetail?id='
+
ID
;
tempStr
=
'/financial/CommissionDetail?id='
+
ID
+
'&School_Id='
+
this
.
GetDetail
.
RB_Branch_Id
;
}
this
.
$router
.
push
({
...
...
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