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
363a9bce
Commit
363a9bce
authored
Nov 01, 2022
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
货币修复
parent
803f4988
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
23 deletions
+32
-23
index.vue
src/views/ecw/customerComplaint/index.vue
+22
-21
payable.vue
src/views/ecw/financial/payable.vue
+9
-1
voucher.vue
src/views/ecw/financial/voucher.vue
+1
-1
No files found.
src/views/ecw/customerComplaint/index.vue
View file @
363a9bce
...
@@ -86,10 +86,7 @@
...
@@ -86,10 +86,7 @@
<el-table-column
:label=
"$t('赔付金额')"
align=
"center"
prop=
"handleAt"
width=
"180"
>
<el-table-column
:label=
"$t('赔付金额')"
align=
"center"
prop=
"handleAt"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
status
===
3
?
scope
.
row
.
indemnity
:
'
/
'
}}
{{
scope
.
row
.
status
===
3
?
scope
.
row
.
indemnity
:
'
/
'
}}
<dict-tag
<span
v-if=
"scope.row.status === 3"
>
{{
getCurrencyLabel
(
scope
.
row
.
currencyUnit
)
}}
</span>
v-if=
"scope.row.status === 3"
:value=
"scope.row.currencyUnit"
:type=
"DICT_TYPE.COMMISSION_CURRENCY_TYPE"
></dict-tag>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('操作')"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
:label=
"$t('操作')"
align=
"center"
class-name=
"small-padding fixed-width"
>
...
@@ -180,13 +177,9 @@
...
@@ -180,13 +177,9 @@
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('赔付金额')"
>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('赔付金额')"
>
<el-input
v-model=
"form.indemnity"
:placeholder=
"$t('请输入赔付金额')"
>
<el-input
v-model=
"form.indemnity"
:placeholder=
"$t('请输入赔付金额')"
>
<dict-selector
<el-select
slot=
"append"
defaultable
v-model=
"form.currencyUnit"
:placeholder=
"$t('请选择货币单位')"
style=
"width: 110px"
>
defaultable
<el-option
v-for=
"item in currencyList"
:key=
"item.id"
:label=
"item.titleZh"
:value=
"item.id"
/>
style=
"width: 110px"
</el-select>
:placeholder=
"$t('请选择货币单位')"
slot=
"append"
v-model=
"form.currencyUnit"
:type=
"DICT_TYPE.COMMISSION_CURRENCY_TYPE"
></dict-selector>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('处理时间')"
required
>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('处理时间')"
required
>
...
@@ -246,7 +239,7 @@
...
@@ -246,7 +239,7 @@
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('赔付金额')+':'"
>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('赔付金额')+':'"
>
<span>
{{form.indemnity||0}}
</span>
<span>
{{form.indemnity||0}}
</span>
<
dict-tag
:type=
"DICT_TYPE.COMMISSION_CURRENCY_TYPE"
:value=
"form.currencyUnit"
></dict-tag
>
<
span>
{{getCurrencyLabel(form.currencyUnit)}}
</span
>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('处理时间')+':'"
>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('处理时间')+':'"
>
<span>
{{parseTime(form.handleAt)}}
</span>
<span>
{{parseTime(form.handleAt)}}
</span>
...
@@ -280,13 +273,9 @@
...
@@ -280,13 +273,9 @@
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('赔付金额')"
>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('赔付金额')"
>
<el-input
v-model=
"form.indemnity"
:placeholder=
"$t('请输入赔付金额')"
>
<el-input
v-model=
"form.indemnity"
:placeholder=
"$t('请输入赔付金额')"
>
<dict-selector
<el-select
slot=
"append"
defaultable
v-model=
"form.currencyUnit"
:placeholder=
"$t('请选择货币单位')"
style=
"width: 110px"
>
defaultable
<el-option
v-for=
"item in currencyList"
:key=
"item.id"
:label=
"item.titleZh"
:value=
"item.id"
/>
style=
"width: 110px"
</el-select>
:placeholder=
"$t('请选择货币单位')"
slot=
"append"
v-model=
"form.currencyUnit"
:type=
"DICT_TYPE.COMMISSION_CURRENCY_TYPE"
></dict-selector>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('处理时间')"
required
>
<el-form-item
v-show=
"form.status == '3'"
:label=
"$t('处理时间')"
required
>
...
@@ -309,6 +298,8 @@ import DictSelector from '@/components/DictSelector'
...
@@ -309,6 +298,8 @@ import DictSelector from '@/components/DictSelector'
import
{
DICT_TYPE
,
getDictDataLabel
,
getDictDatas
}
from
'
@/utils/dict
'
import
{
DICT_TYPE
,
getDictDataLabel
,
getDictDatas
}
from
'
@/utils/dict
'
import
{
getBillNoSearch
,
getOrderNoSearch
}
from
'
@/api/ecw/order
'
import
{
getBillNoSearch
,
getOrderNoSearch
}
from
'
@/api/ecw/order
'
import
customerSelect
from
'
@/views/ecw/customer/customerSelect
'
import
customerSelect
from
'
@/views/ecw/customer/customerSelect
'
import
{
getCurrencyPage
}
from
"
@/api/ecw/currency
"
;
export
default
{
export
default
{
name
:
"
CustomerComplaint
"
,
name
:
"
CustomerComplaint
"
,
/**
/**
...
@@ -375,11 +366,17 @@ export default {
...
@@ -375,11 +366,17 @@ export default {
},
},
billList
:
[],
billList
:
[],
orderList
:
[]
orderList
:
[],
params
:
{
page
:
1
,
rows
:
20
,
},
currencyList
:[]
};
};
},
},
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
getCurrencyPage
(
this
.
params
).
then
(
res
=>
this
.
currencyList
=
res
.
data
.
list
)
},
},
methods
:
{
methods
:
{
...
@@ -391,7 +388,11 @@ export default {
...
@@ -391,7 +388,11 @@ export default {
}
}
})
})
},
},
getCurrencyLabel
(
id
){
var
label
=
this
.
currencyList
.
filter
(
item
=>
item
.
id
==
id
)
if
(
label
.
length
>
0
)
return
label
[
0
].
titleZh
return
''
},
getOrderList
(
key
){
getOrderList
(
key
){
getOrderNoSearch
({
key
,
pageNo
:
1
,
pageSize
:
20
}).
then
(
r
=>
{
getOrderNoSearch
({
key
,
pageNo
:
1
,
pageSize
:
20
}).
then
(
r
=>
{
if
(
r
.
code
===
0
){
if
(
r
.
code
===
0
){
...
...
src/views/ecw/financial/payable.vue
View file @
363a9bce
...
@@ -141,7 +141,7 @@
...
@@ -141,7 +141,7 @@
<el-table-column
:label=
"$t('金额')"
align=
"center"
prop=
"totalAmount"
>
<el-table-column
:label=
"$t('金额')"
align=
"center"
prop=
"totalAmount"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<span>
{{
scope
.
row
.
totalAmount
}}
</span>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
:value=
"scope.row.currencyId"
/
>
<span>
{{
getCurrencyLabel
(
scope
.
row
.
currencyId
)
}}
</span
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<!-- <el-table-column label="创建时间" align="center" prop="channelName" />
<!-- <el-table-column label="创建时间" align="center" prop="channelName" />
...
@@ -227,6 +227,7 @@ import { DICT_TYPE } from "@/utils/dict";
...
@@ -227,6 +227,7 @@ import { DICT_TYPE } from "@/utils/dict";
import
{
getTradeCityList
}
from
"
@/api/ecw/region
"
;
import
{
getTradeCityList
}
from
"
@/api/ecw/region
"
;
import
{
getPayableList
,
deletePayable
,
updatePayable
}
from
"
@/api/ecw/financial
"
import
{
getPayableList
,
deletePayable
,
updatePayable
}
from
"
@/api/ecw/financial
"
import
{
getSupplierPage
}
from
"
@/api/ecw/supplier
"
;
import
{
getSupplierPage
}
from
"
@/api/ecw/supplier
"
;
import
{
getCurrencyPage
}
from
"
@/api/ecw/currency
"
;
export
default
{
export
default
{
name
:
"
Payable
"
,
name
:
"
Payable
"
,
...
@@ -252,6 +253,7 @@ export default {
...
@@ -252,6 +253,7 @@ export default {
rows
:
20
,
rows
:
20
,
},
},
allSupplier
:
[],
allSupplier
:
[],
currencyList
:[]
};
};
},
},
computed
:
{
computed
:
{
...
@@ -264,6 +266,7 @@ export default {
...
@@ -264,6 +266,7 @@ export default {
},
},
created
()
{
created
()
{
let
that
=
this
;
let
that
=
this
;
getCurrencyPage
(
this
.
params
).
then
(
res
=>
this
.
currencyList
=
res
.
data
.
list
)
userList
(
"
salesman
"
).
then
((
res
)
=>
(
that
.
creatorData
=
res
.
data
));
userList
(
"
salesman
"
).
then
((
res
)
=>
(
that
.
creatorData
=
res
.
data
));
getTradeCityList
().
then
((
res
)
=>
(
that
.
tradeCityList
=
res
.
data
));
getTradeCityList
().
then
((
res
)
=>
(
that
.
tradeCityList
=
res
.
data
));
this
.
getList
()
this
.
getList
()
...
@@ -286,6 +289,11 @@ export default {
...
@@ -286,6 +289,11 @@ export default {
this
.
loading
=
false
;
this
.
loading
=
false
;
});
});
},
},
getCurrencyLabel
(
id
){
var
label
=
this
.
currencyList
.
filter
(
item
=>
item
.
id
==
id
)
if
(
label
.
length
>
0
)
return
label
[
0
].
titleZh
return
''
},
/** 搜索按钮操作 */
/** 搜索按钮操作 */
handleQuery
()
{
handleQuery
()
{
this
.
queryParams
.
pageNo
=
1
;
this
.
queryParams
.
pageNo
=
1
;
...
...
src/views/ecw/financial/voucher.vue
View file @
363a9bce
...
@@ -200,7 +200,7 @@
...
@@ -200,7 +200,7 @@
size
=
"
mini
"
size
=
"
mini
"
type
=
"
text
"
type
=
"
text
"
@
click
=
"
toprint(scope.row.id)
"
@
click
=
"
toprint(scope.row.id)
"
v
-
hasPermi
=
"
['ecw:
finanicial:open
']
"
v
-
hasPermi
=
"
['ecw:
verification:create
']
"
>
{{
$t
(
'
打印
'
)
}}
<
/el-butto
n
>
{{
$t
(
'
打印
'
)
}}
<
/el-butto
n
>
>
<
el
-
button
<
el
-
button
...
...
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