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
19b923e7
Commit
19b923e7
authored
Apr 10, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
引流人字段调整
parent
50b07331
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
267 additions
and
8 deletions
+267
-8
CapitalAllocation.vue
src/components/FinancialModule/CapitalAllocation.vue
+29
-4
editCapitalAllocationDetail.vue
...omponents/FinancialModule/editCapitalAllocationDetail.vue
+234
-0
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+1
-1
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-1
groupTourOrderOne.vue
src/components/SalesModule/groupTourOrderOne.vue
+1
-1
visaOrderList.vue
src/components/SalesVisa/components/visaOrderList.vue
+1
-1
No files found.
src/components/FinancialModule/CapitalAllocation.vue
View file @
19b923e7
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
.page_CapitalAllocation
.page_CapitalAllocation_list
{
.page_CapitalAllocation
.page_CapitalAllocation_list
{
width
:
100%
;
width
:
100%
;
}
}
.page_CapitalAllocation
i
.icon-sousuo
,
.page_CapitalAllocation
i
.el-icon-edit
{
.page_CapitalAllocation
i
.icon-sousuo
,
.page_CapitalAllocation
i
.el-icon-edit
,
.page_CapitalAllocation
i
.el-icon-coin
{
width
:
30px
;
width
:
30px
;
height
:
30px
;
height
:
30px
;
display
:
inline-block
;
display
:
inline-block
;
...
@@ -27,9 +27,9 @@
...
@@ -27,9 +27,9 @@
cursor
:
pointer
;
cursor
:
pointer
;
outline
:
none
;
outline
:
none
;
}
}
.page_CapitalAllocation
i
.el-icon-edit
{
background-color
:
#00C6FF
;
font-size
:
16px
;}
.page_CapitalAllocation
i
.el-icon-edit
,
.page_CapitalAllocation
i
.el-icon-coin
{
background-color
:
#00C6FF
;
font-size
:
16px
;}
.page_CapitalAllocation
i
.el-icon-edit
:hover
{
background-color
:
#59daff
}
.page_CapitalAllocation
i
.el-icon-edit
:hover
,
.page_CapitalAllocation
i
.el-icon-coin
:hover
{
background-color
:
#59daff
}
.page_CapitalAllocation
i
.el-icon-edit
:active
{
background-color
:
#00b8ec
}
.page_CapitalAllocation
i
.el-icon-edit
:active
,
.page_CapitalAllocation
i
.el-icon-coin
:active
{
background-color
:
#00b8ec
}
.page_CapitalAllocation
i
.icon-sousuo
{
background-color
:
#47BF8C
;}
.page_CapitalAllocation
i
.icon-sousuo
{
background-color
:
#47BF8C
;}
.page_CapitalAllocation
i
.icon-sousuo
:hover
{
background-color
:
#66bb97
}
.page_CapitalAllocation
i
.icon-sousuo
:hover
{
background-color
:
#66bb97
}
.page_CapitalAllocation
i
.icon-sousuo
:active
{
background-color
:
#35ab79
}
.page_CapitalAllocation
i
.icon-sousuo
:active
{
background-color
:
#35ab79
}
...
@@ -194,6 +194,10 @@
...
@@ -194,6 +194,10 @@
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.updateMsg')"
placement=
"top"
v-if=
"(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.updateMsg')"
placement=
"top"
v-if=
"(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1"
>
<i
class=
"edit el-icon-edit"
@
click=
"goURL('addCapitalAllocation', 1, item.FrID)"
></i>
<i
class=
"edit el-icon-edit"
@
click=
"goURL('addCapitalAllocation', 1, item.FrID)"
></i>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改汇率"
placement=
"top"
v-if=
"F_Update_CurrencyRate"
>
<i
class=
"edit el-icon-coin"
@
click=
"editRate(item.FrID)"
></i>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.xiangqing')"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.xiangqing')"
placement=
"top"
>
<i
class=
"iconfont icon-sousuo"
@
click=
"goDetail('CapitalAllocationDetail', item.FrID)"
></i>
<i
class=
"iconfont icon-sousuo"
@
click=
"goDetail('CapitalAllocationDetail', item.FrID)"
></i>
</el-tooltip>
</el-tooltip>
...
@@ -224,12 +228,21 @@
...
@@ -224,12 +228,21 @@
<el-button
size=
"mini"
@
click=
"isCapitalAllocation = false"
>
取 消
</el-button>
<el-button
size=
"mini"
@
click=
"isCapitalAllocation = false"
>
取 消
</el-button>
</span>
</span>
</el-dialog>
</el-dialog>
<editCapitalAllocationDetail
:isEditRate=
"isEditRate"
:id=
"EditId"
@
cancel=
"isEditRate=false"
@
success=
"getList"
></editCapitalAllocationDetail>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
editCapitalAllocationDetail
from
"./editCapitalAllocationDetail.vue"
;
export
default
{
export
default
{
components
:{
editCapitalAllocationDetail
,
},
data
(){
data
(){
return
{
return
{
EditId
:
0
,
isEditRate
:
false
,
F_Update_CurrencyRate
:
false
,
//修改汇率权限
isCapitalAllocation
:
false
,
isCapitalAllocation
:
false
,
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
...
@@ -288,12 +301,24 @@ export default {
...
@@ -288,12 +301,24 @@ export default {
if
(
ActionMenuCode
.
indexOf
(
'F_CreateBranchMoneyAllot'
)
!=-
1
){
if
(
ActionMenuCode
.
indexOf
(
'F_CreateBranchMoneyAllot'
)
!=-
1
){
this
.
btnShow
=
true
;
this
.
btnShow
=
true
;
}
}
if
(
ActionMenuCode
.
indexOf
(
'F_Update_CurrencyRate'
)
!=-
1
){
this
.
F_Update_CurrencyRate
=
true
;
}
},
},
methods
:{
methods
:{
submit
(){
},
editRate
(
id
)
{
this
.
isEditRate
=
true
this
.
EditId
=
id
},
addBtn
(){
addBtn
(){
this
.
isCapitalAllocation
=
true
this
.
isCapitalAllocation
=
true
},
},
getList
:
function
()
{
// 获取列表数据
getList
:
function
()
{
// 获取列表数据
this
.
EditId
=
0
this
.
isEditRate
=
false
if
(
this
.
msg
.
FrID
===
''
)
{
if
(
this
.
msg
.
FrID
===
''
)
{
this
.
msg
.
FrID
=
0
this
.
msg
.
FrID
=
0
}
}
...
...
src/components/FinancialModule/editCapitalAllocationDetail.vue
0 → 100644
View file @
19b923e7
<
style
>
.Ca_Span
{
display
:
block
;
padding-left
:
10px
;
font-size
:
14px
;
padding
:
10px
;
color
:
#333333
;
background-color
:
#eeeeee
;
/* border-left:3px solid #E95252; */
}
.blue0070D9
{
color
:
#0070D9
;
cursor
:
pointer
;
}
</
style
>
<
template
>
<div>
<el-dialog
title=
"修改汇率"
:visible
.
sync=
"isShow"
@
closed=
"clickcancel"
width=
"900px"
>
<div
class=
"editCapitalAllocationDetail"
>
<span
class=
"Ca_Span"
>
收款
</span>
<el-table
:data=
"dataList.SBankList"
style=
"width: 100%"
>
<el-table-column
prop=
"TypeName"
label=
"收款方式"
width=
"180"
>
</el-table-column>
<el-table-column
label=
"账户"
width=
"180"
>
<template
slot-scope=
"scope"
>
{{
scope
.
row
.
Alias
}}
-
{{
scope
.
row
.
AccountType
}}
-
{{
scope
.
row
.
BankNo
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"OriginalMoney"
label=
"金额"
>
</el-table-column>
<el-table-column
prop=
"CurrencyName"
label=
"币种"
>
</el-table-column>
<el-table-column
prop=
"Rate"
label=
"汇率"
>
<
template
slot-scope=
"scope"
>
<el-input
:min=
"0"
type=
"Number"
v-model=
"scope.row.Rate"
placeholder=
"汇率"
/>
<!--
<el-popover
trigger=
"click"
placement=
"top"
@
show=
"setShow(scope.row.Rate,scope.$index)"
>
<el-form
label-width=
"50px"
>
<el-form-item
label=
"汇率"
style=
"margin-bottom:0"
>
<el-input-number
:min=
"0"
type=
"Number"
v-model=
"Rate"
placeholder=
"汇率"
@
change=
"change('SK')"
/>
</el-form-item>
</el-form>
<div
slot=
"reference"
class=
"name-wrapper"
>
<span
class=
"blue0070D9"
>
{{
scope
.
row
.
Rate
}}
</span>
</div>
</el-popover>
-->
</
template
>
</el-table-column>
<el-table-column
label=
"汇兑收益"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.IsExChange==1"
>
是
</span>
<span
v-if=
"scope.row.IsExChange==0"
>
否
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"Money"
label=
"本位币金额"
>
</el-table-column>
</el-table>
<span
class=
"Ca_Span"
>
付款
</span>
<el-table
:data=
"dataList.FBankList"
style=
"width: 100%"
>
<el-table-column
prop=
"TypeName"
label=
"付款方式"
width=
"180"
>
</el-table-column>
<el-table-column
label=
"账户"
width=
"180"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
Alias
}}
-
{{
scope
.
row
.
AccountType
}}
-
{{
scope
.
row
.
BankNo
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"OriginalMoney"
label=
"金额"
>
</el-table-column>
<el-table-column
prop=
"CurrencyName"
label=
"币种"
>
</el-table-column>
<el-table-column
prop=
"Rate"
label=
"汇率"
>
<
template
slot-scope=
"scope"
>
<el-input
:min=
"0"
type=
"Number"
v-model=
"scope.row.Rate"
placeholder=
"汇率"
/>
<!--
<el-popover
trigger=
"click"
placement=
"top"
@
show=
"setShow(scope.row.Rate,scope.$index)"
>
<el-form
label-width=
"50px"
>
<el-form-item
label=
"汇率"
style=
"margin-bottom:0"
>
<el-input-number
:min=
"0"
type=
"Number"
v-model=
"Rate"
placeholder=
"汇率"
@
change=
"change('FK')"
/>
</el-form-item>
</el-form>
<div
slot=
"reference"
class=
"name-wrapper"
>
<span
class=
"blue0070D9"
>
{{
scope
.
row
.
Rate
}}
</span>
</div>
</el-popover>
-->
</
template
>
</el-table-column>
<el-table-column
label=
"汇兑收益"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.IsExChange==1"
>
是
</span>
<span
v-if=
"scope.row.IsExChange==0"
>
否
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"Money"
label=
"本位币金额"
>
</el-table-column>
</el-table>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"mini"
@
click=
"clickcancel"
>
取 消
</el-button>
<el-button
size=
"mini"
@
click=
"submit"
>
保 存
</el-button>
</span>
</el-dialog>
</div>
</template>
<
script
>
import
regexUtils
from
"../../assets/utils/regexUtils"
;
//引入正则验证
export
default
{
props
:[
'isEditRate'
,
'id'
],
data
(){
return
{
msg
:{
ID
:
0
},
parameters
:{
FrId
:
0
,
TradeWay
:
[]
},
dataList
:[],
Rate
:
0
,
index
:
0
,
isShow
:
false
}
},
watch
:
{
id
:{
handler
(
val
,
oldVal
){
this
.
msg
.
ID
=
val
this
.
parameters
.
FrId
=
val
this
.
getList
();
},
// immediate: true
},
isEditRate
:{
handler
(
val
,
oldVal
){
this
.
isShow
=
val
},
}
},
created
(){
let
userinfo
=
this
.
getLocalStorage
();
this
.
bossID
=
userinfo
.
EmployeeId
;
let
ActionMenuCode
=
userinfo
.
ActionMenuCode
;
if
(
ActionMenuCode
.
indexOf
(
'F_Update_KJCostType'
)
!=-
1
){
this
.
huijiShow
=
true
;
}
},
methods
:{
clickcancel
(){
this
.
parameters
.
TradeWay
=
[]
this
.
isShow
=
false
this
.
$emit
(
'cancel'
)
},
setShow
(
Rate
,
index
){
this
.
Rate
=
Rate
this
.
index
=
index
},
change
(
type
){
if
(
this
.
Rate
){
if
(
type
==
'FK'
){
this
.
dataList
.
FBankList
[
this
.
index
].
Rate
=
this
.
Rate
}
else
{
this
.
dataList
.
SBankList
[
this
.
index
].
Rate
=
this
.
Rate
}
}
},
submit
(){
this
.
dataList
.
FBankList
.
forEach
(
x
=>
{
let
datas
=
{
ID
:
x
.
ID
,
Rate
:
x
.
Rate
}
this
.
parameters
.
TradeWay
.
push
(
datas
)
});
this
.
dataList
.
SBankList
.
forEach
(
x
=>
{
let
datas
=
{
ID
:
x
.
ID
,
Rate
:
x
.
Rate
}
this
.
parameters
.
TradeWay
.
push
(
datas
)
});
this
.
apipost
(
'Financial_post_UpdateCapitalAllocationRate'
,
this
.
parameters
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
isShow
=
false
this
.
$emit
(
'success'
)
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
getList
(){
this
.
apipost
(
'Financial_get_GetFundTransfer'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
},
mounted
(){
}
}
</
script
>
src/components/SalesModule/enrollTotal.vue
View file @
19b923e7
...
@@ -558,7 +558,7 @@
...
@@ -558,7 +558,7 @@
: item.commissionSPeopleName
: item.commissionSPeopleName
}}
}}
</p>
</p>
<p
v-if=
"item.
LureEmpName"
>
引流人:{{ item.L
ureEmpName }}
</p>
<p
v-if=
"item.
lureEmpName"
>
引流人:{{ item.l
ureEmpName }}
</p>
<p>
{{ $t("hotel.hotel_StartTeam") }}:{{ item.startDate }}
</p>
<p>
{{ $t("hotel.hotel_StartTeam") }}:{{ item.startDate }}
</p>
<p
v-if=
"item.tradeWay == 1"
>
{{ item.platformOrder }}
</p>
<p
v-if=
"item.tradeWay == 1"
>
{{ item.platformOrder }}
</p>
<!-- <p v-if="item.commissionMoney" style="color: red;">
<!-- <p v-if="item.commissionMoney" style="color: red;">
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
19b923e7
...
@@ -1702,7 +1702,7 @@
...
@@ -1702,7 +1702,7 @@
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%"
>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%"
>
{{
item
.
commissionSPeopleName
}}
{{
item
.
commissionSPeopleName
}}
</p>
</p>
<p
v-if=
"item.
LureEmpName"
>
引流人:
{{
item
.
L
ureEmpName
}}
</p>
<p
v-if=
"item.
lureEmpName"
>
引流人:
{{
item
.
l
ureEmpName
}}
</p>
<p
style=
"min-width: 180px"
>
<p
style=
"min-width: 180px"
>
{{
$t
(
"hotel.hotel_StartTeam"
)
}}
:
{{
item
.
startDate
}}
{{
$t
(
"hotel.hotel_StartTeam"
)
}}
:
{{
item
.
startDate
}}
</p>
</p>
...
...
src/components/SalesModule/groupTourOrderOne.vue
View file @
19b923e7
...
@@ -1478,7 +1478,7 @@
...
@@ -1478,7 +1478,7 @@
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;text-decoration:underline;cursor:pointer;"
:title=
"item.alName"
@
click=
"goUrlX('产品查询','productQueryOne',item.tcid,item.tcnum)"
>
{{item.tcnum}}
</p>
:title=
"item.alName"
@
click=
"goUrlX('产品查询','productQueryOne',item.tcid,item.tcnum)"
>
{{item.tcnum}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{item.commissionSPeopleName}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{item.commissionSPeopleName}}
</p>
<p
v-if=
"item.
LureEmpName"
>
引流人:{{ item.L
ureEmpName }}
</p>
<p
v-if=
"item.
lureEmpName"
>
引流人:{{ item.l
ureEmpName }}
</p>
<p
style=
"min-width: 180px;"
>
{{$t('hotel.hotel_StartTeam')}}:{{item.startDate}}
</p>
<p
style=
"min-width: 180px;"
>
{{$t('hotel.hotel_StartTeam')}}:{{item.startDate}}
</p>
<p>
{{$t('restaurant.res_oderTime')}}:{{item.createDate}}
</p>
<p>
{{$t('restaurant.res_oderTime')}}:{{item.createDate}}
</p>
<p
v-if=
"item.tradeWay ==1"
>
{{item.platformOrder}}
</p>
<p
v-if=
"item.tradeWay ==1"
>
{{item.platformOrder}}
</p>
...
...
src/components/SalesVisa/components/visaOrderList.vue
View file @
19b923e7
...
@@ -522,7 +522,7 @@
...
@@ -522,7 +522,7 @@
</div>
</div>
<div
class=
"row c9e fz12"
>
<div
class=
"row c9e fz12"
>
<div
class=
"row-c"
>
<div
class=
"row-c"
>
<span
class=
"mr"
v-if=
"item.
LureEmpName"
>
引流人:{{ item.L
ureEmpName }}
</span>
<span
class=
"mr"
v-if=
"item.
lureEmpName"
>
引流人:{{ item.l
ureEmpName }}
</span>
<
template
v-if=
"item.createName"
>
<
template
v-if=
"item.createName"
>
<span
class=
"mr"
>
创建人:
</span>
<span
class=
"mr"
>
创建人:
</span>
<span
class=
"mr"
>
{{
item
.
createName
}}
</span>
<span
class=
"mr"
>
{{
item
.
createName
}}
</span>
...
...
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