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
feb5d141
Commit
feb5d141
authored
Oct 25, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/order_edit' into release
parents
7de45d5c
8aac3258
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
delivery.vue
src/views/jiedao/profile/delivery.vue
+3
-2
orderdetail.vue
src/views/jiedao/profile/orderdetail.vue
+1
-1
No files found.
src/views/jiedao/profile/delivery.vue
View file @
feb5d141
...
...
@@ -876,7 +876,7 @@
</el-form-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('外部仓')"
:span=
"2"
>
<el-descriptions-item
:label=
"$t('外部仓
库
')"
:span=
"2"
>
<el-form-item
prop=
"isExternalWarehouse"
>
<el-checkbox
label=
""
v-model=
"form.isExternalWarehouse"
@
change=
"form.isExternalWarehouse=$event"
:disabled=
"false"
></el-checkbox>
</el-form-item>
...
...
@@ -1651,7 +1651,8 @@ export default {
type
:
[],
orderItemVOList
:
[],
externalWarehouseDtoList
:[],
displayBillLadingPrice
:
true
displayBillLadingPrice
:
true
,
lineId
:
''
},
// 总条数
total
:
0
,
...
...
src/views/jiedao/profile/orderdetail.vue
View file @
feb5d141
...
...
@@ -160,7 +160,7 @@
{{order.displayBillLadingPrice ? $t('是') : $t('否')}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('仓库')"
>
{{order.isExternalWarehouse ? $t('外部仓') : $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
}}
...
...
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