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
eed1600a
Commit
eed1600a
authored
Oct 23, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复几个bug
parent
6f641352
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
detail.vue
src/views/ecw/order/detail.vue
+1
-1
edit.vue
src/views/ecw/order/edit.vue
+1
-1
prepayDeal.vue
src/views/ecw/order/prepayDeal.vue
+1
-1
No files found.
src/views/ecw/order/detail.vue
View file @
eed1600a
...
...
@@ -145,7 +145,7 @@
{{
order
.
inWarehouseState
>
1
&&
row
.
warehouseInInfoVO
?
row
.
warehouseInInfoVO
.
weight
:
row
.
weight
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"
quantity
"
:label=
"$t('数量') + '(个)'"
width=
"90px"
/>
<el-table-column
prop=
"
warehouseInInfoVO.quantityAll
"
:label=
"$t('数量') + '(个)'"
width=
"90px"
/>
<el-table-column
prop=
""
:label=
"$t('费用类型')"
>
<
template
slot-scope=
"{row}"
>
<dict-tag
:type=
"DICT_TYPE.ECW_PAY_ADVANCE"
:value=
"row.isPayAdvance"
/>
...
...
src/views/ecw/order/edit.vue
View file @
eed1600a
...
...
@@ -270,7 +270,7 @@
</el-form-item>
<!--代收货款,只有非控货订单、并且线路开通了代收货款后,才显示是否代收货款选项-->
<el-form-item
:label=
"$t('代收货款金额')"
v-if=
"collectionProxy && form.isCollection"
prop=
"collectionProxy"
class=
"ml-20"
>
<el-input
v-model=
"form.collectionProxy"
class=
"w-200 mr-10"
:disabled=
"false"
></el-input>
<el-input
type=
"number"
v-model=
"form.collectionProxy"
class=
"w-200 mr-10"
:disabled=
"false"
></el-input>
<selector
v-model=
"form.collectionProxyCurrency"
:options=
"currencyList"
label-field=
"titleZh"
value-field=
"id"
defaultable
class=
"w-100"
:disabled=
"false"
/>
</el-form-item>
</div>
...
...
src/views/ecw/order/prepayDeal.vue
View file @
eed1600a
...
...
@@ -40,7 +40,7 @@
{{
(
orderData
.
costVO
.
totalNum
||
0
)
+
$t
(
'
箱
'
)
+
(
orderData
.
costVO
.
totalVolume
||
0
)
+
'
m³
'
+
(
orderData
.
costVO
.
totalWeight
||
0
)
+
'
kg
'
+
(
orderData
.
costVO
.
totalQuantity
||
0
)
+
$t
(
'
个
'
)
}}
</
template
>
</el-form-item>
<el-form-item
:label=
"$t('代收金额')+':'"
>
<el-form-item
:label=
"$t('代收金额')+':'"
v-if=
"orderExceptionData.orderExceptionType == 'order_cod_exception'"
>
<
template
v-if=
"orderData && orderData.costVO"
>
{{
orderExceptionData
.
orderExceptionAmount
}}
{{
currencyMap
[
orderExceptionData
.
orderExceptionCurrencyId
]
}}
</
template
>
...
...
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