Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
e10e1abc
Commit
e10e1abc
authored
Oct 08, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决几个bug
parent
b1041f6b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
8 deletions
+31
-8
index.vue
src/views/ecw/customer/index.vue
+2
-2
edit.vue
src/views/ecw/offer/edit.vue
+24
-5
index.vue
src/views/ecw/offer/index.vue
+5
-1
No files found.
src/views/ecw/customer/index.vue
View file @
e10e1abc
...
...
@@ -721,8 +721,8 @@ export default {
return
exportCustomerExcel
(
params
);
}).
then
(
response
=>
{
this
.
$download
.
excel
(
response
,
`
${
this
.
$t
(
'
客户信息
'
)}
.xls`
);
console
.
log
(
response
,
'
response
'
)
this
.
$download
.
excel
(
response
,
`
${
this
.
$t
(
'
全部客户信息
'
)}
.xls`
);
/*
console.log(response,'response')
this.$download.excel(response, `${this.$t('全部客户信息')}.xls`);
*/
this
.
exportLoading
=
false
;
}).
catch
(()
=>
{});
},
...
...
src/views/ecw/offer/edit.vue
View file @
e10e1abc
...
...
@@ -355,9 +355,11 @@
</div>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('预计费用')"
:span=
"1"
>
<
template
v-for=
"item in estimatedCosts"
>
<div
:key=
"item.currencyId"
>
{{
item
.
amount
||
0
}}{{
currencyMap
[
item
.
currencyId
]
}}
</div>
</
template
>
<div>
<
template
v-for=
"item in estimatedCosts"
>
<div
:key=
"item.currencyId"
>
{{
item
.
amount
||
0
}}{{
currencyMap
[
item
.
currencyId
]
}}
</div>
</
template
>
</div>
</el-descriptions-item>
</el-descriptions>
</el-card>
...
...
@@ -627,7 +629,7 @@ export default {
sum
.
totalNum
=
sum
.
totalNum
.
plus
(
item
.
num
||
0
)
sum
.
totalVolume
=
sum
.
totalVolume
.
plus
(
item
.
volume
||
0
)
sum
.
totalWeight
=
sum
.
totalWeight
.
plus
(
item
.
weight
||
0
)
sum
.
total
totalWorthNum
=
sum
.
totalWorth
.
plus
(
item
.
worth
||
0
)
sum
.
total
Worth
=
sum
.
totalWorth
.
plus
(
item
.
worth
||
0
)
sum
.
totalQuatity
=
sum
.
totalQuatity
.
plus
(
item
.
quantity
||
0
)
})
return
sum
...
...
@@ -695,6 +697,7 @@ export default {
estimatedCosts
(){
let
arr
=
[]
let
withInsuranceFee
=
false
let
withOtherFee
=
false
this
.
originalFeeList
.
forEach
(
item
=>
{
let
it
=
{
currencyId
:
item
.
currencyId
,
...
...
@@ -706,6 +709,7 @@ export default {
}
if
(
this
.
form
.
otherFee
&&
this
.
form
.
otherFeeCurrencyId
==
item
.
currencyId
){
it
.
amount
=
it
.
amount
.
plus
(
this
.
form
.
otherFee
)
withOtherFee
=
true
}
// 保价费(美元)
if
(
item
.
currencyId
==
1
&&
this
.
fee
&&
this
.
fee
.
insuranceFee
){
...
...
@@ -715,6 +719,21 @@ export default {
arr
.
push
(
it
)
})
// 如果没有累加其他费用,则另外增加货币
if
(
!
withOtherFee
&&
this
.
form
.
otherFee
){
let
fee
=
{
currencyId
:
this
.
form
.
otherFeeCurrencyId
,
amount
:
Decimal
(
this
.
form
.
otherFee
)
}
// 如果保价费跟其他费用是同一种货币(都是美元)
if
(
!
withInsuranceFee
&&
this
.
fee
&&
this
.
fee
.
insuranceFee
&&
this
.
form
.
otherFeeCurrencyId
==
1
){
fee
.
amount
=
fee
.
amount
.
plus
(
this
.
fee
.
insuranceFee
)
}
arr
.
push
(
fee
)
}
// 没有累加保价费(没有美元计价)但是有保价费则需要加上去
if
(
!
withInsuranceFee
&&
this
.
fee
&&
this
.
fee
.
insuranceFee
){
arr
.
push
({
...
...
@@ -953,7 +972,7 @@ export default {
}
updateOffer
(
data
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
修改成功
"
));
this
.
$r
outer
.
back
(
)
this
.
$r
edirect
(
'
index
'
)
});
return
;
}
...
...
src/views/ecw/offer/index.vue
View file @
e10e1abc
...
...
@@ -76,7 +76,11 @@
<!-- 列表 -->
<el-table
v-loading=
"loading"
:data=
"list"
border
>
<el-table-column
:label=
"$t('报价单号')"
align=
"left"
prop=
"number"
width=
"200px"
/>
<el-table-column
:label=
"$t('报价单号')"
align=
"left"
prop=
"number"
width=
"200px"
>
<template
slot-scope=
"
{row}">
<el-link
type=
"primary"
@
click.native=
"$router.push('detail?offerId=' + row.offerId)"
>
{{
row
.
number
}}
</el-link>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('订单编号')"
align=
"left"
prop=
"orderNo"
/>
<el-table-column
:label=
"$t('客户名称')"
align=
"left"
prop=
"relationName"
/>
<el-table-column
:label=
"$t('目的地')"
align=
"center"
prop=
"objectiveName"
/>
...
...
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