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
c3f56d0f
Commit
c3f56d0f
authored
Jun 30, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
月结制单调整、手配费制单界面调整
parent
cf7c2ee7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
483 additions
and
25 deletions
+483
-25
ChoiceAddFinancialDocuments2.vue
...mponents/FinancialModule/ChoiceAddFinancialDocuments2.vue
+5
-1
HandFeeStatistics.vue
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
+52
-6
selectListData.vue
...nts/FinancialModule/HandFee/components/selectListData.vue
+133
-0
selectListData.vue
...Module/MonthlyCostStatement/components/selectListData.vue
+182
-0
index.vue
...components/FinancialModule/MonthlyCostStatement/index.vue
+36
-9
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+75
-9
No files found.
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @
c3f56d0f
...
@@ -313,7 +313,6 @@
...
@@ -313,7 +313,6 @@
else
if
(
t
==
4
)
{
else
if
(
t
==
4
)
{
this
.
GetList
=
this
.
ZRList
;
this
.
GetList
=
this
.
ZRList
;
}
}
if
(
this
.
GetList
.
length
<
1
){
if
(
this
.
GetList
.
length
<
1
){
this
.
noData
=
true
;
this
.
noData
=
true
;
}
else
{
}
else
{
...
@@ -332,6 +331,11 @@
...
@@ -332,6 +331,11 @@
})
})
})
})
this
.
GetList
=
newList
;
this
.
GetList
=
newList
;
}
else
{
this
.
GetList
.
forEach
(
y
=>
{
y
.
showYes
=
true
newList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
y
)))
})
}
}
},
},
Financial_post_GetList
(){
//获取
Financial_post_GetList
(){
//获取
...
...
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
View file @
c3f56d0f
...
@@ -135,6 +135,25 @@
...
@@ -135,6 +135,25 @@
{{totalYB.toFixed(2)}}
{{totalYB.toFixed(2)}}
</span>
</span>
</div>
</div>
<div
style=
"display: flex;flex-wrap: nowrap; padding: 10px;"
>
<div
style=
"display: flex;flex-wrap: wrap;"
>
<span>
已选数据:
</span>
<
template
v-if=
"multipleSelection.length>0"
>
<el-tag
size=
"mini"
closable
style=
"margin-right: 5px;margin-bottom: 5px;"
v-for=
"(x,index) in multipleSelection"
:key=
"x.FrID"
@
close=
"handleClose([multipleSelection[index]])"
>
{{
x
.
FinanceId
}}
/
{{
x
.
OriginalMoney
}}
</el-tag>
</
template
>
<
template
v-else
>
无
</
template
>
</div>
<div
style=
"margin-left: 20px;flex-shrink: 0;"
>
总金额:{{totalZD}}
</div>
</div>
<div
class=
"_fnDm_content"
v-loading=
'loading'
>
<div
class=
"_fnDm_content"
v-loading=
'loading'
>
<el-table
<el-table
ref=
"multipleTable"
ref=
"multipleTable"
...
@@ -282,6 +301,14 @@
...
@@ -282,6 +301,14 @@
</div>
</div>
</
template
>
</
template
>
</el-dialog>
</el-dialog>
<
template
v-if=
"showDialog"
>
<selectListData
:totalZD=
"totalZD"
:totalBWZD=
"totalBWZD"
:multipleSelection=
"multipleSelection"
@
success=
"showDialog=false,getPageList()"
@
close=
"showDialog=false"
></selectListData>
</
template
>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -289,9 +316,11 @@ import myBill from "../FinancialSubmodule/BillModule.vue";
...
@@ -289,9 +316,11 @@ import myBill from "../FinancialSubmodule/BillModule.vue";
import
myrbvBill
from
"../FinancialSubmodule/ReceivablesModule.vue"
;
import
myrbvBill
from
"../FinancialSubmodule/ReceivablesModule.vue"
;
import
myhrBill
from
"../FinancialSubmodule/MergeBillModule.vue"
;
import
myhrBill
from
"../FinancialSubmodule/MergeBillModule.vue"
;
import
Vue
from
'vue'
import
Vue
from
'vue'
import
selectListData
from
"./components/selectListData"
;
export
default
{
export
default
{
data
(){
data
(){
return
{
return
{
showDialog
:
false
,
shezhiMsg
:{
shezhiMsg
:{
FinanceId
:
0
,
FinanceId
:
0
,
HandFeeFrId
:
null
HandFeeFrId
:
null
...
@@ -411,6 +440,7 @@ export default {
...
@@ -411,6 +440,7 @@ export default {
components
:
{
components
:
{
"my-Bill"
:
myBill
,
"my-Bill"
:
myBill
,
"my-RVB-Bill"
:
myrbvBill
,
"my-RVB-Bill"
:
myrbvBill
,
selectListData
},
},
mounted
(){
mounted
(){
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
...
@@ -428,6 +458,25 @@ export default {
...
@@ -428,6 +458,25 @@ export default {
this
.
GetHandFee
()
//手配费公司
this
.
GetHandFee
()
//手配费公司
},
},
methods
:{
methods
:{
getMoney
(){
let
Money
=
0
let
totalZD
=
0
let
totalBWZD
=
0
this
.
multipleSelection
.
forEach
(
x
=>
{
totalZD
+=
(
x
.
OriginalMoney
*
100
)
totalBWZD
+=
(
x
.
Money
*
100
)
})
this
.
totalZD
=
totalZD
/
100
this
.
totalBWZD
=
totalBWZD
/
100
},
handleClose
(
rows
){
if
(
rows
)
{
rows
.
forEach
(
row
=>
{
this
.
$refs
.
multipleTable
.
toggleRowSelection
(
row
);
});
}
// this.multipleSelection.splice(index,1)
},
// 单据详情
// 单据详情
openDetails
(
item
)
{
openDetails
(
item
)
{
let
query
=
{
let
query
=
{
...
@@ -461,12 +510,9 @@ export default {
...
@@ -461,12 +510,9 @@ export default {
if
(
ids
.
length
==
0
){
if
(
ids
.
length
==
0
){
return
this
.
$message
.
error
(
'请勾选需要制单的数据'
);
return
this
.
$message
.
error
(
'请勾选需要制单的数据'
);
}
}
this
.
totalZD
=
0
this
.
getMoney
()
this
.
totalBWZD
=
0
this
.
showDialog
=
true
this
.
multipleSelection
.
forEach
(
x
=>
{
return
this
.
totalZD
+=
x
.
OriginalMoney
this
.
totalBWZD
+=
x
.
Money
})
this
.
BillMakingMsg
.
Money
=
this
.
totalZD
this
.
BillMakingMsg
.
Money
=
this
.
totalZD
this
.
iszhidanBox
=
true
this
.
iszhidanBox
=
true
this
.
apipost
(
'Financial_post_SetFinanceHandFeeCode'
,{
this
.
apipost
(
'Financial_post_SetFinanceHandFeeCode'
,{
...
...
src/components/FinancialModule/HandFee/components/selectListData.vue
0 → 100644
View file @
c3f56d0f
<
template
>
<div>
<el-dialog
:title=
"`已选数据$
{dataList.length}条`"
:visible.sync="showDialog" center @close="close"
width="600px">
<el-table
:data=
"dataList"
tooltip-effect=
"dark"
style=
"width: 100%"
>
<el-table-column
label=
"单号"
width=
"120"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
FinanceId
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
""
label=
"原币金额"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
OriginalMoney
?
scope
.
row
.
OriginalMoney
+
'/'
+
scope
.
row
.
CurrencyName
:
''
}}
</
template
>
</el-table-column>
<el-table-column
prop=
""
label=
"本位币金额"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
Money
}}
</
template
>
</el-table-column>
<
template
slot=
"append"
>
<div
class=
"totalMoney-box"
>
<div>
<span>
原币合计:
</span>
<span
style=
"color: red;"
>
{{
totalZD
}}
</span>
</div>
<div>
<span>
本位币合计:
</span>
<span
style=
"color: red;"
>
{{
totalBWZD
}}
</span>
</div>
</div>
</
template
>
</el-table>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
class=
"hollowFixedBtn"
@
click=
"close"
>
{{$t('pub.cancelBtn')}}
</el-button>
<el-button
class=
"normalBtn"
type=
"primary"
@
click=
"clicksubmit"
>
{{$t('pub.sureBtn')}}生成
</el-button>
</div>
</el-dialog>
</div>
</template>
<
script
>
export
default
{
name
:
'selectListData'
,
props
:
[
'multipleSelection'
,
'totalZD'
,
'totalBWZD'
],
data
()
{
return
{
showDialog
:
true
,
dataList
:
[],
OriginalMoney
:
0
,
//原币合计
balanceMoney
:
null
,
//差额
isHandlingCharge
:
false
,
HandlingChargeMoney
:
null
,
//手续费
};
},
watch
:
{
multipleSelection
:{
handler
(
val
,
oldval
)
{
this
.
dataList
=
JSON
.
parse
(
JSON
.
stringify
(
val
))
},
deep
:
true
,
immediate
:
true
}
},
methods
:
{
clicksubmit
(){
let
ids
=
this
.
dataList
.
map
(
x
=>
{
return
x
.
FinanceId
})
this
.
apipost
(
'Financial_post_SetFinanceHandFeeCode'
,{
FrIds
:
ids
.
join
(
','
)
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
BillMakingMsg
.
StandardCurrencyName
=
res
.
data
.
data
this
.
$emit
(
'success'
)
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
close
(){
this
.
$emit
(
'close'
)
},
},
mounted
()
{
}
};
</
script
>
<
style
scoped
>
.DetailList-box
{
display
:
flex
;
justify-content
:
space-between
;
}
.DetailList-box
p
{
/* width: 230px; */
color
:
black
;
}
/* .DetailList-box p:nth-child(2),.DetailList-box p:nth-child(3){
width: 150px;
} */
.DetailList-box
p
span
{
margin-right
:
3px
;
color
:
#666666
;
}
.totalMoney-box
{
display
:
flex
;
justify-content
:
end
;
align-items
:
center
;
padding
:
10px
0
;
}
.totalMoney-box
>
div
{
display
:
flex
;
align-items
:
center
;
margin-left
:
20px
;
}
.totalMoney-box
>
div
>
span
{
flex-shrink
:
0
;
}
</
style
>
src/components/FinancialModule/MonthlyCostStatement/components/selectListData.vue
0 → 100644
View file @
c3f56d0f
<
template
>
<div>
<el-dialog
:title=
"`已选数据$
{dataList.length}条`"
:visible.sync="showDialog" center @close="close"
width="1000px">
<div
style=
"height: 400px;overflow: auto;"
>
<el-table
:data=
"dataList"
tooltip-effect=
"dark"
style=
"width: 100%;"
>
<el-table-column
label=
"单号"
width=
"120"
>
<template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
FrID
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
""
label=
"原币金额"
show-overflow-tooltip
width=
"150"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
WBMoney
?
scope
.
row
.
WBMoney
+
'/'
+
scope
.
row
.
CurrencyName
:
''
}}
</
template
>
</el-table-column>
<el-table-column
prop=
""
label=
"本位币金额"
show-overflow-tooltip
width=
"150"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
Money
}}
</
template
>
</el-table-column>
<el-table-column
prop=
""
label=
"明细"
show-overflow-tooltip
>
<
template
slot-scope=
"scope"
>
<div
v-for=
"(x,index) in scope.row.DetailList"
class=
"DetailList-box"
>
<p><span>
费用:
</span>
{{
x
.
CostTypeName
}}
</p>
<p><span>
原币:
</span>
{{
x
.
OriginalMoney
}}
</p>
<p><span>
汇率:
</span>
{{
x
.
Rate
}}
</p>
<p><span>
本位币:
</span>
{{
x
.
Money
}}
</p>
</div>
</
template
>
</el-table-column>
</el-table>
</div>
<div
class=
"totalMoney-box"
>
<div>
<span>
原币合计:
</span>
<span
style=
"color: red;"
>
{{OriginalMoney}}
</span>
</div>
<
template
v-if=
"isHandlingCharge"
>
<div
v-if=
"HandlingChargeMoney"
>
<span>
手续费合计:
</span>
<span
style=
"color: red;"
>
{{
HandlingChargeMoney
}}
</span>
</div>
<div>
<span>
手续费差额:
</span>
<div>
<el-input
v-model=
"balanceMoney"
type=
"Number"
placeholder=
"请输入手续费差额"
></el-input>
</div>
</div>
</
template
>
</div>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
class=
"hollowFixedBtn"
@
click=
"close"
>
{{$t('pub.cancelBtn')}}
</el-button>
<el-button
class=
"normalBtn"
type=
"primary"
@
click=
"clicksubmit"
>
{{$t('pub.sureBtn')}}生成
</el-button>
</div>
</el-dialog>
</div>
</template>
<
script
>
export
default
{
name
:
'selectListData'
,
props
:
[
'multipleSelection'
],
data
()
{
return
{
showDialog
:
true
,
dataList
:
[],
OriginalMoney
:
0
,
//原币合计
balanceMoney
:
null
,
//差额
isHandlingCharge
:
false
,
HandlingChargeMoney
:
null
,
//手续费
};
},
watch
:
{
multipleSelection
:{
handler
(
val
,
oldval
)
{
this
.
dataList
=
JSON
.
parse
(
JSON
.
stringify
(
val
))
this
.
OriginalMoney
=
0
let
OriginalMoney
=
0
let
HandlingChargeMoney
=
0
this
.
dataList
.
forEach
(
x
=>
{
x
.
DetailList
.
forEach
(
y
=>
{
if
(
y
.
CostTypeId
==
114
){
this
.
isHandlingCharge
=
true
HandlingChargeMoney
+=
(
y
.
OriginalMoney
*
100
)
}
if
(
y
.
CostTypeId
!=
114
){
OriginalMoney
+=
(
y
.
OriginalMoney
*
100
)
}
})
})
this
.
OriginalMoney
=
OriginalMoney
/
100
this
.
HandlingChargeMoney
=
HandlingChargeMoney
/
100
},
deep
:
true
,
immediate
:
true
}
},
methods
:
{
clicksubmit
(){
let
ids
ids
=
this
.
dataList
.
map
(
x
=>
{
return
x
.
FrID
})
let
orderObj
=
{
CostType
:
1547
,
CostType2
:
this
.
isHandlingCharge
?
114
:
null
,
//114转账手续费
CostType3
:
this
.
isHandlingCharge
&&
this
.
balanceMoney
?
114
:
null
,
HandlingChargeMoney
:
this
.
isHandlingCharge
?
this
.
HandlingChargeMoney
:
null
,
//手续费
balanceMoney
:
this
.
isHandlingCharge
&&
this
.
balanceMoney
?
this
.
balanceMoney
:
null
,
//差额
OtherType
:
75
,
Money
:
this
.
OriginalMoney
,
isVerifyMoney
:
true
,
ReFinanceIds
:
ids
.
join
(
','
),
//单号
ReFinanceId2
:
3
,
//成本
}
this
.
$emit
(
'close'
)
this
.
$router
.
push
({
name
:
'ChoiceAddFinancialDocuments'
,
query
:
{
'Type'
:
2
,
'searchTitle'
:
'月结付款'
,
'blank'
:
'y'
,
'orderObj'
:
JSON
.
stringify
(
orderObj
),
}
});
// this.$emit('success')
},
close
(){
this
.
$emit
(
'close'
)
},
},
mounted
()
{
}
};
</
script
>
<
style
scoped
>
.DetailList-box
{
display
:
flex
;
}
.DetailList-box
p
{
color
:
black
;
margin-right
:
20px
;
}
.DetailList-box
p
:last-child
{
margin-right
:
0
;
}
.DetailList-box
p
span
{
margin-right
:
3px
;
color
:
#666666
;
}
.totalMoney-box
{
display
:
flex
;
justify-content
:
end
;
align-items
:
center
;
padding
:
10px
0
;
}
.totalMoney-box
>
div
{
display
:
flex
;
align-items
:
center
;
margin-left
:
20px
;
}
.totalMoney-box
>
div
>
span
{
flex-shrink
:
0
;
}
</
style
>
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @
c3f56d0f
...
@@ -235,7 +235,12 @@
...
@@ -235,7 +235,12 @@
<el-tag
size=
"mini"
closable
<el-tag
size=
"mini"
closable
style=
"margin-right: 5px;margin-bottom: 5px;"
style=
"margin-right: 5px;margin-bottom: 5px;"
v-for=
"(x,index) in multipleSelection"
v-for=
"(x,index) in multipleSelection"
:key=
"x.FrID"
@
close=
"handleClose([multipleSelection[index]])"
>
{{
x
.
FrID
}}
应付:
{{
x
.
Money
}}
</el-tag>
:key=
"x.FrID"
@
close=
"handleClose([multipleSelection[index]])"
>
{{
x
.
FrID
}}
/
<template
v-for=
"(y,i) in x.DetailList"
>
{{
y
.
CostTypeName
}}
:
{{
y
.
OriginalMoney
}}
{{
i
!=
(
x
.
DetailList
.
length
-
1
)?
','
:
''
}}
</
template
>
</el-tag>
</template>
</template>
<
template
v-else
>
<
template
v-else
>
无
无
...
@@ -253,7 +258,6 @@
...
@@ -253,7 +258,6 @@
style=
"width: 100%"
style=
"width: 100%"
row-key=
"FrID"
row-key=
"FrID"
@
selection-change=
"handleSelectionChange"
@
selection-change=
"handleSelectionChange"
>
>
<el-table-column
<el-table-column
type=
"selection"
type=
"selection"
...
@@ -369,12 +373,21 @@
...
@@ -369,12 +373,21 @@
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
""
prop=
""
label=
"金额"
label=
"原币金额"
show-overflow-tooltip
width=
"150"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
WBMoney
?
scope
.
row
.
WBMoney
+
'/'
+
scope
.
row
.
CurrencyName
:
''
}}
</
template
>
</el-table-column>
<el-table-column
prop=
""
label=
"本位币金额"
show-overflow-tooltip
width=
"150"
>
show-overflow-tooltip
width=
"150"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<p
style=
"line-height:20px"
v-if=
"scope.row.Money>0"
>
{{
scope
.
row
.
Type
==
1
?
'应收'
:
'应付'
}}
:
<span>
{{
scope
.
row
.
Money
}}
</span></p>
{{
scope
.
row
.
Money
}}
<!--
<p
style=
"line-height:20px"
v-if=
"scope.row.Money>0"
>
{{
scope
.
row
.
Type
==
1
?
'应收'
:
'应付'
}}
:
<span>
{{
scope
.
row
.
Money
}}
</span></p>
<p
style=
"line-height:20px"
v-if=
"scope.row.PayMoney>0"
>
{{
scope
.
row
.
Type
==
1
?
'实收'
:
'实付'
}}
:
<span>
{{
scope
.
row
.
PayMoney
}}
</span></p>
<p
style=
"line-height:20px"
v-if=
"scope.row.PayMoney>0"
>
{{
scope
.
row
.
Type
==
1
?
'实收'
:
'实付'
}}
:
<span>
{{
scope
.
row
.
PayMoney
}}
</span></p>
<p
v-if=
"scope.row.IsAdvanceFinance==1&&scope.row.MatchMoney>0"
style=
"line-height:20px"
>
冲抵:
<span>
{{
scope
.
row
.
MatchMoney
}}
</span></p>
<p
v-if=
"scope.row.IsAdvanceFinance==1&&scope.row.MatchMoney>0"
style=
"line-height:20px"
>
冲抵:
<span>
{{
scope
.
row
.
MatchMoney
}}
</span></p>
-->
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
...
@@ -445,14 +458,23 @@
...
@@ -445,14 +458,23 @@
</el-pagination>
</el-pagination>
</div>
</div>
</div>
</div>
<
template
v-if=
"showDialog"
>
<selectListData
:multipleSelection=
"multipleSelection"
@
close=
"showDialog=false"
></selectListData>
</
template
>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
import
Vue
from
'vue'
import
Vue
from
'vue'
import
selectListData
from
"./components/selectListData"
;
export
default
{
export
default
{
components
:{
selectListData
},
data
(){
data
(){
return
{
return
{
showDialog
:
false
,
multipleSelection
:
[],
multipleSelection
:
[],
SelectAduitingList
:[
SelectAduitingList
:[
{
Name
:
'不限'
,
Id
:
'0'
},
{
Name
:
'不限'
,
Id
:
'0'
},
...
@@ -574,8 +596,6 @@ export default {
...
@@ -574,8 +596,6 @@ export default {
this
.
transactionDate
[
0
]
=
this
.
$route
.
query
.
StartDate
;
this
.
transactionDate
[
0
]
=
this
.
$route
.
query
.
StartDate
;
this
.
transactionDate
[
1
]
=
this
.
$route
.
query
.
StartDate
;
this
.
transactionDate
[
1
]
=
this
.
$route
.
query
.
StartDate
;
}
}
},
components
:
{
},
},
mounted
(){
mounted
(){
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
...
@@ -1013,7 +1033,12 @@ export default {
...
@@ -1013,7 +1033,12 @@ export default {
getMoney
(){
getMoney
(){
let
Money
=
0
let
Money
=
0
this
.
multipleSelection
.
forEach
(
x
=>
{
this
.
multipleSelection
.
forEach
(
x
=>
{
Money
+=
Number
(
x
.
Money
*
100
)
x
.
DetailList
.
forEach
(
y
=>
{
if
(
y
.
CostTypeId
!=
114
){
Money
+=
(
y
.
OriginalMoney
*
100
)
}
})
})
})
return
Money
/
100
return
Money
/
100
},
},
...
@@ -1022,6 +1047,8 @@ export default {
...
@@ -1022,6 +1047,8 @@ export default {
this
.
Error
(
'请选择需要制单的数据'
);
this
.
Error
(
'请选择需要制单的数据'
);
return
;
return
;
}
}
this
.
showDialog
=
true
return
let
ids
let
ids
ids
=
this
.
multipleSelection
.
map
(
x
=>
{
return
x
.
FrID
})
ids
=
this
.
multipleSelection
.
map
(
x
=>
{
return
x
.
FrID
})
let
orderObj
=
{
let
orderObj
=
{
...
...
src/components/FinancialModule/addFinancialDocuments.vue
View file @
c3f56d0f
...
@@ -639,7 +639,7 @@
...
@@ -639,7 +639,7 @@
</td>
</td>
<td>
<td>
<el-select
filterable
v-model=
'detailList.CurrencyId'
:placeholder=
"$t('rule.qxzbzhong')"
<el-select
filterable
v-model=
'detailList.CurrencyId'
:placeholder=
"$t('rule.qxzbzhong')"
@
change=
"getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"
class=
" _border_b_1"
>
@
change=
"getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)
,Calculation(1)
"
class=
" _border_b_1"
>
<el-option
v-for=
'item in coinGetList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
<el-option
v-for=
'item in coinGetList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-option>
</el-select>
</el-select>
...
@@ -1063,6 +1063,7 @@
...
@@ -1063,6 +1063,7 @@
],
//类型
],
//类型
isHandFee
:
false
,
isHandFee
:
false
,
is_HandFee
:
true
,
//是否开启
is_HandFee
:
true
,
//是否开启
HandlingChargeType
:
0
,
//月结制单 1转账手续费 2转账手续费差额
}
}
},
},
methods
:
{
methods
:
{
...
@@ -1362,6 +1363,12 @@
...
@@ -1362,6 +1363,12 @@
e
.
target
.
value
=
(
e
.
target
.
value
.
match
(
/^
\d
*
(\.?\d{0,1})
/g
)[
0
])
||
null
e
.
target
.
value
=
(
e
.
target
.
value
.
match
(
/^
\d
*
(\.?\d{0,1})
/g
)[
0
])
||
null
},
},
AddFinancial
(
z
)
{
//保存
AddFinancial
(
z
)
{
//保存
for
(
let
i
=
0
;
i
<
this
.
msg
.
detailList
.
length
;
i
++
){
if
(
!
this
.
msg
.
detailList
[
i
].
CurrencyId
){
this
.
Error
(
'请完善费用的相关信息'
)
return
}
}
//手配费参数
//手配费参数
if
(
this
.
is_HandFee
)
{
if
(
this
.
is_HandFee
)
{
if
(
!
this
.
HandFee
.
BranchId
)
{
if
(
!
this
.
HandFee
.
BranchId
)
{
...
@@ -1440,6 +1447,7 @@
...
@@ -1440,6 +1447,7 @@
return
return
}
}
// 台湾提成汇率 验证原币总金额是否一致
// 台湾提成汇率 验证原币总金额是否一致
// 月结制单 ||(this.orderObj.isVerifyMoney)
if
(
this
.
orderObj
&&
this
.
orderObj
.
Money
&&
this
.
orderObj
.
Rate
)
{
if
(
this
.
orderObj
&&
this
.
orderObj
.
Money
&&
this
.
orderObj
.
Rate
)
{
let
yballPrice
=
0
let
yballPrice
=
0
let
totalAmount
let
totalAmount
...
@@ -1455,7 +1463,7 @@
...
@@ -1455,7 +1463,7 @@
}
}
//验证总金额是否一致
//验证总金额是否一致
if
(
this
.
commissionObj
||
(
this
.
orderObj
&&
this
.
orderObj
.
isVerifyMoney
)
)
{
if
(
this
.
commissionObj
)
{
let
totalAmount
let
totalAmount
if
(
this
.
commissionObj
){
if
(
this
.
commissionObj
){
this
.
msg
.
OtherType
=
this
.
commissionObj
.
OtherType
?
this
.
commissionObj
.
OtherType
:
0
;
this
.
msg
.
OtherType
=
this
.
commissionObj
.
OtherType
?
this
.
commissionObj
.
OtherType
:
0
;
...
@@ -1463,9 +1471,9 @@
...
@@ -1463,9 +1471,9 @@
this
.
msg
.
RelevanceFrId
=
this
.
commissionObj
.
EmpIds
?
this
.
commissionObj
.
EmpIds
:
0
;
this
.
msg
.
RelevanceFrId
=
this
.
commissionObj
.
EmpIds
?
this
.
commissionObj
.
EmpIds
:
0
;
totalAmount
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
this
.
commissionObj
.
totalAmount
*
100
)
/
100
)
totalAmount
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
this
.
commissionObj
.
totalAmount
*
100
)
/
100
)
}
}
if
(
this
.
orderObj
&&
this
.
orderObj
.
Money
&&
this
.
orderObj
.
isVerifyMoney
)
{
//
if (this.orderObj && this.orderObj.Money && this.orderObj.isVerifyMoney) {
totalAmount
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
this
.
orderObj
.
Money
*
100
)
/
100
)
//
totalAmount = this.$commonUtils.addCommas(Math.round(this.orderObj.Money * 100) / 100)
}
//
}
if
(
this
.
allPriceTo
!=
totalAmount
)
{
if
(
this
.
allPriceTo
!=
totalAmount
)
{
this
.
Error
(
`实付金额必须等于
${
totalAmount
}
!`
)
this
.
Error
(
`实付金额必须等于
${
totalAmount
}
!`
)
return
return
...
@@ -1683,6 +1691,20 @@
...
@@ -1683,6 +1691,20 @@
bTotalPriceTo
:
''
,
bTotalPriceTo
:
''
,
show
:
false
,
show
:
false
,
}
}
// this.HandlingChargeType++
//月结制单 HandlingChargeType 1转账手续费 2转账手续费差额
// if(this.orderObj.CostType2&&this.HandlingChargeType==1){
// this.detailList.Number = 1
// this.detailList.UnitPrice = this.orderObj.HandlingChargeMoney
// this.detailList.CostTypeId = this.orderObj.CostType2
// this.detailList.CostTypeName = '转账手续费'
// }
// if(this.orderObj.CostType3&&((!this.orderObj.CostType2&&this.HandlingChargeType==1)||this.HandlingChargeType==2)){
// this.detailList.Number = 1
// this.detailList.UnitPrice = this.orderObj.balanceMoney
// this.detailList.CostTypeId = this.orderObj.CostType3
// this.detailList.CostTypeName = '转账手续费'
// }
this
.
chooseHandFee
()
this
.
chooseHandFee
()
},
},
chages
(
e
)
{
//处理输入框不能输入问题
chages
(
e
)
{
//处理输入框不能输入问题
...
@@ -2064,7 +2086,6 @@
...
@@ -2064,7 +2086,6 @@
this
.
Description
=
this
.
GetDetail
.
Description
;
this
.
Description
=
this
.
GetDetail
.
Description
;
}
}
if
(
this
.
orderObj
)
{
if
(
this
.
orderObj
)
{
this
.
msg
.
OrderID
=
this
.
orderObj
.
OrderID
?
this
.
orderObj
.
OrderID
:
0
;
this
.
msg
.
OrderID
=
this
.
orderObj
.
OrderID
?
this
.
orderObj
.
OrderID
:
0
;
this
.
OrderSource
=
this
.
msg
.
OrderSource
=
this
.
orderObj
.
OrderSource
?
this
.
orderObj
.
OrderSource
:
0
;
this
.
OrderSource
=
this
.
msg
.
OrderSource
=
this
.
orderObj
.
OrderSource
?
this
.
orderObj
.
OrderSource
:
0
;
this
.
msg
.
TCID
=
this
.
orderObj
.
TCID
?
this
.
orderObj
.
TCID
:
0
;
this
.
msg
.
TCID
=
this
.
orderObj
.
TCID
?
this
.
orderObj
.
TCID
:
0
;
...
@@ -2073,9 +2094,54 @@
...
@@ -2073,9 +2094,54 @@
this
.
msg
.
Obj
=
this
.
orderObj
.
Obj
?
this
.
orderObj
.
Obj
:
''
;
this
.
msg
.
Obj
=
this
.
orderObj
.
Obj
?
this
.
orderObj
.
Obj
:
''
;
this
.
msg
.
SourceID
=
this
.
orderObj
.
SourceID
?
this
.
orderObj
.
SourceID
:
0
;
this
.
msg
.
SourceID
=
this
.
orderObj
.
SourceID
?
this
.
orderObj
.
SourceID
:
0
;
this
.
msg
.
CallType
=
this
.
orderObj
.
CallType
?
this
.
orderObj
.
CallType
:
0
;
this
.
msg
.
CallType
=
this
.
orderObj
.
CallType
?
this
.
orderObj
.
CallType
:
0
;
this
.
detailList
.
CostTypeId
=
this
.
orderObj
.
CostType
?
this
.
orderObj
.
CostType
:
''
;
this
.
detailList
.
UnitPrice
=
this
.
orderObj
.
Money
?
this
.
orderObj
.
Money
:
0
;
if
(
this
.
orderObj
.
OtherType
==
75
)
{
this
.
detailList
.
Number
=
this
.
orderObj
.
CostType
?
1
:
0
let
msgObj
=
{
ID
:
0
,
UnitPrice
:
''
,
UnitPriceTo
:
''
,
Number
:
1
,
Rate
:
''
,
CostTypeId
:
''
,
CurrencyId
:
''
,
Remark
:
''
,
CostTypeName
:
''
,
yTotalPrice
:
''
,
yTotalPriceTo
:
''
,
bTotalPrice
:
''
,
bTotalPriceTo
:
''
,
show
:
false
,
}
this
.
msg
.
detailList
=
[]
if
(
this
.
orderObj
.
CostType
){
msgObj
.
CostTypeId
=
this
.
orderObj
.
CostType
msgObj
.
CostTypeName
=
'支付月结预提成本或费用'
msgObj
.
UnitPrice
=
this
.
orderObj
.
Money
msgObj
.
UnitPriceTo
=
this
.
orderObj
.
Money
this
.
msg
.
detailList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
msgObj
)))
}
if
(
this
.
orderObj
.
CostType2
||
this
.
orderObj
.
CostType3
){
msgObj
.
CostTypeName
=
'转账手续费'
if
(
this
.
orderObj
.
CostType2
){
msgObj
.
CostTypeId
=
this
.
orderObj
.
CostType2
msgObj
.
UnitPrice
=
this
.
orderObj
.
HandlingChargeMoney
msgObj
.
UnitPriceTo
=
this
.
orderObj
.
HandlingChargeMoney
this
.
msg
.
detailList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
msgObj
)))
}
if
(
this
.
orderObj
.
CostType3
){
msgObj
.
CostTypeId
=
this
.
orderObj
.
CostType3
msgObj
.
UnitPrice
=
this
.
orderObj
.
balanceMoney
msgObj
.
UnitPriceTo
=
this
.
orderObj
.
balanceMoney
this
.
msg
.
detailList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
msgObj
)))
}
}
}
else
{
this
.
detailList
.
CostTypeId
=
this
.
orderObj
.
CostType
?
this
.
orderObj
.
CostType
:
''
;
this
.
detailList
.
UnitPrice
=
this
.
orderObj
.
Money
?
this
.
orderObj
.
Money
:
0
;
this
.
detailList
.
Number
=
this
.
orderObj
.
CostType
?
1
:
0
}
this
.
msg
.
OtherType
=
this
.
orderObj
.
OtherType
?
this
.
orderObj
.
OtherType
:
0
;
this
.
msg
.
OtherType
=
this
.
orderObj
.
OtherType
?
this
.
orderObj
.
OtherType
:
0
;
this
.
XSTC
=
this
.
orderObj
.
XSTC
?
true
:
false
this
.
XSTC
=
this
.
orderObj
.
XSTC
?
true
:
false
if
(
!
JSON
.
parse
(
sessionStorage
.
getItem
(
"saveGuestInfo"
)))
{
if
(
!
JSON
.
parse
(
sessionStorage
.
getItem
(
"saveGuestInfo"
)))
{
...
...
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