Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-web-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-web-master
Commits
ab1e2f90
Commit
ab1e2f90
authored
Nov 21, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
云效上的bug
parent
d51f2f51
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
52 deletions
+58
-52
delivery.vue
src/views/jiedao/profile/delivery.vue
+7
-2
orderdetail.vue
src/views/jiedao/profile/orderdetail.vue
+51
-50
No files found.
src/views/jiedao/profile/delivery.vue
View file @
ab1e2f90
...
...
@@ -2055,13 +2055,18 @@ export default {
if
(
this
.
$route
.
query
.
id
)
{
await
getOrderDetail
(
this
.
$route
.
query
.
id
).
then
(
async
(
res
)
=>
{
this
.
form
=
Object
.
assign
({},
res
.
data
,
{
orderItemVOList
:
[],
destCountryId
:
null
})
this
.
form
=
Object
.
assign
({},
res
.
data
,
{
orderItemVOList
:
[],
destCountryId
:
null
,
consigneeName
:
''
,
consigneePhone
:
''
})
this
.
form
.
deliveryDate
=
res
.
data
.
deliveryDate
if
(
res
.
data
.
consigneeVO
){
this
.
$set
(
this
.
form
,
'
consigneePhone
'
,
res
.
data
.
consigneeVO
.
phone
)
this
.
$set
(
this
.
form
,
'
countryCode
'
,
res
.
data
.
consigneeVO
.
countryCode
)
this
.
$set
(
this
.
form
,
'
consigneeCompany
'
,
res
.
data
.
consigneeVO
.
company
)
this
.
$set
(
this
.
form
,
'
consigneeCompanyEn
'
,
res
.
data
.
consigneeVO
.
companyEn
)
this
.
$set
(
this
.
form
,
'
consigneeCompanyEn
'
,
res
.
data
.
consigneeVO
.
companyEn
)
this
.
$set
(
this
.
form
,
'
consigneeEmail
'
,
res
.
data
.
consigneeVO
.
email
)
this
.
$set
(
this
.
form
,
'
consigneeName
'
,
res
.
data
.
consigneeVO
.
name
)
this
.
$set
(
this
.
form
,
'
consigneeNameEn
'
,
res
.
data
.
consigneeVO
.
nameEn
)
...
...
src/views/jiedao/profile/orderdetail.vue
View file @
ab1e2f90
...
...
@@ -128,58 +128,59 @@
<el-descriptions-item
:label=
"$t('特殊要求备注')"
>
{{ order.packageRemarks }}
</el-descriptions-item>
<
template
v-if=
"showMore"
>
<el-descriptions-item
:label=
"$t('送货时间')"
>
{{
order
.
deliveryDate
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('入仓类型')"
>
<dict-tag
:type=
"DICT_TYPE.ECW_WAREHOUSING_TYPE"
:value=
"order.warehouseType"
/>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('送货时间')"
>
{{ order.deliveryDate }}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('入仓类型')"
>
<dict-tag
:type=
"DICT_TYPE.ECW_WAREHOUSING_TYPE"
:value=
"order.warehouseType"
/>
</el-descriptions-item>
<!--下面几个是空运特有字段-->
<!--清关证书-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.customsClearCert')"
>
{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--清关证书备注-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.clearCertRemark')"
>
{{ order.clearCertRemark }}
</el-descriptions-item>
<!--是否拆包-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.isUnpack')"
>
{{ order.isUnpack?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--单票立刻转运-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.isSingleTicketTransport')"
>
{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--下面几个是空运特有字段-->
<!--清关证书-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.customsClearCert')"
>
{{
order
.
isSingleTicketTransport
?
$t
(
'
orderdetail.is
'
):
$t
(
'
orderdetail.no
'
)
}}
</el-descriptions-item>
<!--清关证书备注-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.clearCertRemark')"
>
{{
order
.
clearCertRemark
}}
</el-descriptions-item>
<!--是否拆包-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.isUnpack')"
>
{{
order
.
isUnpack
?
$t
(
'
orderdetail.is
'
):
$t
(
'
orderdetail.no
'
)
}}
</el-descriptions-item>
<!--单票立刻转运-->
<el-descriptions-item
v-if=
"[3, 4].indexOf(+order.transportId) > -1"
:label=
"$t('delivery.isSingleTicketTransport')"
>
{{
order
.
isSingleTicketTransport
?
$t
(
'
orderdetail.is
'
):
$t
(
'
orderdetail.no
'
)
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('代收货款')"
>
<dict-tag
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
:value=
"order.isCollection"
/>
<
template
v-if=
"order.isCollection == 1"
>
(
{{
order
.
collectionProxy
}}{{
currencyMap
[
order
.
collectionProxyCurrency
]
}}
)
</
template
>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('提单是否显示价格')"
>
{{order.displayBillLadingPrice ? $t('是') : $t('否')}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('仓库')"
>
{{order.isExternalWarehouse ? $t('外部仓库') : $t('自有仓') }}
<
template
v-if=
"order.isExternalWarehouse"
v-for=
"(item, index) in order.externalWarehouseDtoList"
>
<div
v-if=
"item.estLoadingTime || item.loadingAddress"
:key=
"index"
>
{{
$t
(
'
装柜时间
'
)
}}
:
{{
item
.
estLoadingTime
}}
{{
$t
(
'
装柜地址
'
)
}}
:
{{
item
.
loadingAddress
}}
</div>
</
template
>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('快递单号')"
>
{{order.number}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('创建人')"
>
{{order.creatorName}} ({{order.userType == 1 ? $t('会员') : $t('后台用户')}})
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('创建时间')"
>
{{order.createTime|parseTime}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户经理')"
>
{{order.salesmanName}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('代收货款')"
>
<dict-tag
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
:value=
"order.isCollection"
/>
<template
v-if=
"order.isCollection == 1"
>
(
{{
order
.
collectionProxy
}}{{
currencyMap
[
order
.
collectionProxyCurrency
]
}}
)
</
template
>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('提单是否显示价格')"
>
{{order.displayBillLadingPrice ? $t('是') : $t('否')}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('仓库')"
>
{{order.isExternalWarehouse ? $t('外部仓库') : $t('自有仓') }}
<
template
v-if=
"order.isExternalWarehouse"
v-for=
"(item, index) in order.externalWarehouseDtoList"
>
<div
v-if=
"item.estLoadingTime || item.loadingAddress"
:key=
"index"
>
{{
$t
(
'
装柜时间
'
)
}}
:
{{
item
.
estLoadingTime
}}
{{
$t
(
'
装柜地址
'
)
}}
:
{{
item
.
loadingAddress
}}
</div>
</
template
>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('快递单号')"
>
{{order.number}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('创建人')"
>
{{order.creatorName}} ({{order.userType == 1 ? $t('会员') : $t('后台用户')}})
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('创建时间')"
>
{{order.createTime|parseTime}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户经理')"
>
{{order.salesmanName}}
</el-descriptions-item>
</template>
</el-descriptions>
<!--<div v-if="[3, 4].indexOf(+order.transportId) > -1" style="display: flex;margin-top: 20px;">
...
...
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