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
7e5931b1
Commit
7e5931b1
authored
Dec 29, 2021
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
a0ccd92b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
11 deletions
+49
-11
BasicDocuments.vue
src/pages/financial/financalDocument/BasicDocuments.vue
+6
-1
FinancialDocumentsDetail.vue
...s/financial/financalDocument/FinancialDocumentsDetail.vue
+4
-0
ReturnUserList.vue
src/pages/financial/returnPassbook/ReturnUserList.vue
+10
-6
returnpassbookStatistics.vue
...ges/financial/returnPassbook/returnpassbookStatistics.vue
+14
-4
b2bwithdraw.vue
src/pages/sale/b2bwithdraw.vue
+15
-0
No files found.
src/pages/financial/financalDocument/BasicDocuments.vue
View file @
7e5931b1
...
...
@@ -798,7 +798,9 @@
<span
class=
"fr"
style=
"text-decoration: underline;cursor: pointer;"
v-if=
"GetDetail.OtherType==50 "
@
click=
"goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"
>
业绩销售提成:{{GetDetail.ReFinanceId}}
</span>
<span
class=
"fr"
style=
"text-decoration: underline;cursor: pointer;"
v-if=
"GetDetail.OtherType==51 "
@
click=
"goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"
>
员工人头奖励:{{GetDetail.ReFinanceId}}
</span>
@
click=
"goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"
>
员工人头奖励:{{GetDetail.ReFinanceId}}
</span>
<span
class=
"fr"
style=
"text-decoration: underline;cursor: pointer;"
v-if=
"GetDetail.OtherType==49 "
@
click=
"goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"
>
佣金/存折:{{GetDetail.ReFinanceId}}
</span>
<
template
v-if=
"GetDetail.RelevanceFrId"
>
<span
class=
"fr"
style=
"margin-right:10px;"
>
...
...
@@ -3461,7 +3463,10 @@
tempStr
=
'/financial/market/AchievementsUserDetailList?UserIds='
+
this
.
GetDetail
.
EduCommissionEmp
+
'&preriodId='
+
ID
;
}
else
if
(
OtherType
==
51
){
tempStr
=
'/financial/market/empBonusDetail?Id='
+
ID
;
}
else
if
(
OtherType
==
49
){
tempStr
=
'/financial/returnPassbook/returnpassbookStatistics?UnionCashOutId='
+
ID
;
}
this
.
$router
.
push
({
path
:
tempStr
...
...
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @
7e5931b1
...
...
@@ -842,6 +842,8 @@
@
click=
"goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"
>
业绩销售提成:
{{
GetDetail
.
ReFinanceId
}}
</span>
<span
class=
"fr"
style=
"text-decoration: underline;cursor: pointer;"
v-if=
"GetDetail.OtherType==51 "
@
click=
"goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"
>
员工人头奖励:
{{
GetDetail
.
ReFinanceId
}}
</span>
<span
class=
"fr"
style=
"text-decoration: underline;cursor: pointer;"
v-if=
"GetDetail.OtherType==49 "
@
click=
"goassets2(GetDetail.ReFinanceId,GetDetail.OtherType)"
>
佣金/存折:
{{
GetDetail
.
ReFinanceId
}}
</span>
<template
v-if=
"GetDetail.RelevanceFrId"
>
<span
class=
"fr"
style=
"margin-right:10px;"
>
...
...
@@ -2214,6 +2216,8 @@
tempStr
=
'/financial/market/AchievementsUserDetailList?UserIds='
+
this
.
GetDetail
.
EduCommissionEmp
+
'&preriodId='
+
ID
;
}
else
if
(
OtherType
==
51
){
tempStr
=
'/financial/market/empBonusDetail?Id='
+
ID
;
}
else
if
(
OtherType
==
49
){
tempStr
=
'/financial/returnPassbook/returnpassbookStatistics?UnionCashOutId='
+
ID
;
}
this
.
$router
.
push
({
...
...
src/pages/financial/returnPassbook/ReturnUserList.vue
View file @
7e5931b1
...
...
@@ -53,7 +53,7 @@
/>
</div>
<div
class=
"col row wrap q-mr-lg q-col-gutter-md"
>
<div
class=
"col-3"
>
<
!--
<
div
class=
"col-3"
>
<q-select
filled
stack-label
...
...
@@ -69,8 +69,8 @@
emit-value
map-options
></q-select>
</div>
<div
class=
"col-3"
>
</div>
-->
<
!--
<
div
class=
"col-3"
>
<q-select
filled
stack-label
...
...
@@ -85,7 +85,7 @@
emit-value
map-options
></q-select>
</div>
</div>
-->
<div
class=
"col-3"
>
<q-select
filled
...
...
@@ -106,6 +106,7 @@
<q-select
filled
stack-label
clearable
v-model=
"msg.OrderSourceId"
:dense=
"false"
:options=
"myEmployeeList"
...
...
@@ -130,6 +131,7 @@
filled
stack-label
v-model=
"msg.OrderSourceId"
clearable
:dense=
"false"
:options=
"customList"
use-input
...
...
@@ -151,6 +153,7 @@
<div
class=
"col-3"
v-if=
"msg.OrderSourceType == 4"
>
<q-select
filled
clearable
stack-label
v-model=
"msg.OrderSourceId"
:dense=
"false"
...
...
@@ -303,7 +306,7 @@ export default {
getList
()
{
this
.
loading
=
true
;
let
msg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
msg
))
if
(
msg
.
OrderSourceId
==
''
)
{
if
(
msg
.
OrderSourceId
==
''
||
msg
.
OrderSourceId
==
null
)
{
msg
.
OrderSourceId
=
0
}
getCommissionUserList
(
msg
).
then
(
res
=>
{
...
...
@@ -326,10 +329,11 @@ export default {
getlaiyuan
()
{
if
(
this
.
msg
.
OrderSourceType
==
-
1
)
{
this
.
msg
.
OrderSourceId
=
0
this
.
getList
()
}
else
{
this
.
msg
.
OrderSourceId
=
''
}
this
.
getList
()
},
getBranchList
()
{
//获取校区
getSchoolDropdown
({}).
then
(
res
=>
{
...
...
src/pages/financial/returnPassbook/returnpassbookStatistics.vue
View file @
7e5931b1
...
...
@@ -38,7 +38,7 @@
<div
class=
"page-body cycleOrderList"
>
<div
class=
"page-search row items-center"
>
<div
class=
"col row wrap q-mr-lg q-col-gutter-md"
>
<div
class=
"col-3"
>
<
!--
<
div
class=
"col-3"
>
<q-select
filled
stack-label
...
...
@@ -53,9 +53,10 @@
emit-value
map-options
/>
</div>
</div>
-->
<q-select
v-if=
"!isNormal"
@
input=
"resetSearch"
filled
stack-label
...
...
@@ -128,6 +129,7 @@
map-options
></q-select>
<q-select
v-if=
"!isNormal"
@
input=
"resetSearch"
filled
stack-label
...
...
@@ -160,6 +162,7 @@
<div
class=
"col-3"
v-if=
"msg.OrderSourceType == 1 || msg.OrderSourceType == 3"
>
<q-select
filled
clearable
stack-label
v-model=
"msg.OrderSourceId"
dense
...
...
@@ -183,6 +186,7 @@
<div
class=
"col-3"
v-if=
"msg.OrderSourceType == 2"
>
<q-select
filled
clearable
stack-label
v-model=
"msg.OrderSourceId"
dense
...
...
@@ -206,6 +210,7 @@
<div
class=
"col-3"
v-if=
"msg.OrderSourceType == 4"
>
<q-select
filled
clearable
stack-label
v-model=
"msg.OrderSourceId"
dense
...
...
@@ -265,7 +270,7 @@
<el-table-column
prop=
"UserName"
label=
"人员"
></el-table-column>
<
el-table-column
prop=
"ClassNo"
label=
"班号"
></el-table-column
>
<
!--
<el-table-column
prop=
"ClassNo"
label=
"班号"
></el-table-column>
--
>
<el-table-column
width=
"170"
prop=
"ClassName"
label=
"班级信息"
>
<template
slot-scope=
"scope"
>
<div>
...
...
@@ -274,6 +279,7 @@
@
click=
"goUrlclass('/course/classManage', scope.row.ClassName)"
>
{{
scope
.
row
.
ClassName
}}
</span>
</div>
<div>
班号:
{{
scope
.
row
.
ClassNo
}}
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"OrderId"
label=
"订单号"
>
...
...
@@ -377,6 +383,7 @@ export default {
ClassId
:
0
,
OrderId
:
''
,
UnionCashOutId
:
0
,
},
StatusList
:
[
...
...
@@ -433,6 +440,9 @@ export default {
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
preriodId
)
{
this
.
msg
.
BatchId
=
(
this
.
$route
.
query
.
preriodId
).
toString
()
}
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
UnionCashOutId
)
{
//提现ID
this
.
msg
.
UnionCashOutId
=
this
.
$route
.
query
.
UnionCashOutId
}
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
CommissionType
)
{
this
.
msg
.
CommissionType
=
this
.
$route
.
query
.
CommissionType
;
this
.
msg
.
Q_SelectNormal
=
2
...
...
@@ -461,7 +471,7 @@ export default {
this
.
loading
=
true
;
let
msg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
msg
))
if
(
msg
.
OrderSourceId
==
''
)
{
if
(
msg
.
OrderSourceId
==
''
||
msg
.
OrderSourceId
==
null
)
{
msg
.
OrderSourceId
=
0
}
getCommissionStatistics
(
this
.
msg
).
then
(
res
=>
{
...
...
src/pages/sale/b2bwithdraw.vue
View file @
7e5931b1
...
...
@@ -118,8 +118,18 @@
label=
"审核"
@
click=
"operation(props.row)"
/>
<q-btn
flat
size=
"xs"
icon=
"iconfont icon-view"
color=
"done"
style=
"font-weight:400"
label=
"查看详情"
@
click=
"godetails(props.row)"
/>
</q-td>
</
template
>
<
template
v-slot:bottom
>
...
...
@@ -314,6 +324,11 @@ export default {
this
.
remitMsg
.
Remark
=
''
;
this
.
isShow
=
true
},
godetails
(
row
){
this
.
OpenNewUrl
(
'/financial/returnPassbook/returnpassbookStatistics'
,
{
UnionCashOutId
:
row
.
Id
,
});
},
submit
(){
setCustomerRemitState
(
this
.
remitMsg
).
then
(
res
=>
{
this
.
$q
.
notify
({
...
...
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