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
454231f8
Commit
454231f8
authored
Oct 18, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复订单编辑bug
parent
f7107ee8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
15 deletions
+16
-15
edit.vue
src/views/ecw/order/edit.vue
+16
-15
No files found.
src/views/ecw/order/edit.vue
View file @
454231f8
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
<el-table-column
label=
"新内容"
prop=
"newValue"
></el-table-column>
<el-table-column
label=
"新内容"
prop=
"newValue"
></el-table-column>
</el-table>
</el-table>
</el-card>
</el-card>
<div
class=
"page-title"
>
{{
editMode
?
$t
(
'
编辑订单
'
)
+
'
-
'
+
form
.
orderNo
:
$t
(
'
新建订单
'
)
}}
</div>
<div
class=
"page-title"
>
{{
editMode
?
$t
(
'
编辑订单
'
)
+
'
-
'
+
(
form
.
orderNo
||
$t
(
'
草稿
'
))
:
$t
(
'
新建订单
'
)
}}
</div>
<el-card
class=
"form-section mt-10"
>
<el-card
class=
"form-section mt-10"
>
<template
#header
>
<template
#header
>
...
@@ -360,7 +360,7 @@
...
@@ -360,7 +360,7 @@
<el-card
class=
"mt-10"
>
<el-card
class=
"mt-10"
>
<div
class=
"card-title"
slot=
"header"
>
{{$t('通用')}}
</div>
<div
class=
"card-title"
slot=
"header"
>
{{$t('通用')}}
</div>
<div
class=
"form-section"
>
<div
class=
"form-section"
>
<el-form-item
:label=
"$t('唛头')"
prop=
"marks
"
>
<el-form-item
:label=
"$t('唛头')"
prop=
"marks"
class=
"w-500
"
>
<el-input
v-model=
"form.marks"
></el-input>
<el-input
v-model=
"form.marks"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('单证报关')"
:span=
"2"
prop=
"customsType"
>
<el-form-item
:label=
"$t('单证报关')"
:span=
"2"
prop=
"customsType"
>
...
@@ -379,7 +379,7 @@
...
@@ -379,7 +379,7 @@
<!--目的港清关:选择专线空运才显示,默认选中我司
<!--目的港清关:选择专线空运才显示,默认选中我司
我司选中后,按钮下方显示“多票”和“单票”的操作,默认选中多票。
我司选中后,按钮下方显示“多票”和“单票”的操作,默认选中多票。
客户选中后,按钮下方显示“单票”的操作,默认选中,无需点击-->
客户选中后,按钮下方显示“单票”的操作,默认选中,无需点击-->
<div
class=
"form-section"
>
<div
class=
"form-section
w-500
"
>
<el-form-item
:label=
"$t('目的港清关')"
>
<el-form-item
:label=
"$t('目的港清关')"
>
<el-radio-group
v-model=
"form.portDestCustomsClear"
>
<el-radio-group
v-model=
"form.portDestCustomsClear"
>
<el-radio
:label=
"1"
>
<el-radio
:label=
"1"
>
...
@@ -407,7 +407,7 @@
...
@@ -407,7 +407,7 @@
</div>
</div>
</div>
</div>
<div
class=
"form-section"
>
<div
class=
"form-section"
>
<el-form-item
:label=
"$t('是否控货')"
prop=
"isCargoControl"
class=
"
ml-2
0"
>
<el-form-item
:label=
"$t('是否控货')"
prop=
"isCargoControl"
class=
"
w-50
0"
>
<
template
#label
>
<
template
#label
>
{{
$t
(
'
是否控货
'
)
}}
{{
$t
(
'
是否控货
'
)
}}
<el-tooltip
effect=
"dark"
:content=
"$t('是指由发货人与收货人约定在货物的国际运输过程中,我司作为第三方对该货物货权的控制;需由发货人授权我司放货的情况下收货人才能提取该票货物的一种交易方式')"
placement=
"top"
>
<el-tooltip
effect=
"dark"
:content=
"$t('是指由发货人与收货人约定在货物的国际运输过程中,我司作为第三方对该货物货权的控制;需由发货人授权我司放货的情况下收货人才能提取该票货物的一种交易方式')"
placement=
"top"
>
...
@@ -425,7 +425,7 @@
...
@@ -425,7 +425,7 @@
}"
}"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('付款人')"
prop=
"drawee"
>
<el-form-item
:label=
"$t('付款人')"
prop=
"drawee"
class=
"w-500"
>
<dict-selector
:formatter=
"Number"
:type=
"DICT_TYPE.DRAWEE"
v-model=
"form.drawee"
defaultable
form-type=
"radio"
:disabled=
"false"
/>
<dict-selector
:formatter=
"Number"
:type=
"DICT_TYPE.DRAWEE"
v-model=
"form.drawee"
defaultable
form-type=
"radio"
:disabled=
"false"
/>
<el-table
:data=
"customDraweeList"
v-if=
"form.drawee==3"
>
<el-table
:data=
"customDraweeList"
v-if=
"form.drawee==3"
>
<el-table-column
:label=
"$t('费用类型')"
prop=
"label"
width=
"200px"
></el-table-column>
<el-table-column
:label=
"$t('费用类型')"
prop=
"label"
width=
"200px"
></el-table-column>
...
@@ -444,7 +444,7 @@
...
@@ -444,7 +444,7 @@
</el-form-item>
</el-form-item>
</div>
</div>
<div
class=
"form-section flex"
>
<div
class=
"form-section flex"
>
<el-form-item
:label=
"$t('入仓类型')"
prop=
"warehouseType"
>
<el-form-item
:label=
"$t('入仓类型')"
prop=
"warehouseType"
class=
"w-500"
>
<dict-selector
:type=
"DICT_TYPE.ECW_WAREHOUSING_TYPE"
v-model=
"form.warehouseType"
defaultable
:disabled=
"false"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_WAREHOUSING_TYPE"
v-model=
"form.warehouseType"
defaultable
:disabled=
"false"
/>
</el-form-item>
</el-form-item>
<div>
<div>
...
@@ -480,26 +480,25 @@
...
@@ -480,26 +480,25 @@
</div>
</div>
</div>
</div>
<div
class=
"form-section"
>
<div
class=
"form-section"
>
<el-form-item
:label=
"$t('预计送货日期')"
prop=
"deliveryDate"
v-if=
"!form.isExternalWarehouse"
>
<el-form-item
:label=
"$t('预计送货日期')"
prop=
"deliveryDate"
v-if=
"!form.isExternalWarehouse"
class=
"w-500"
>
<el-date-picker
v-model=
"form.deliveryDate"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
<el-date-picker
v-model=
"form.deliveryDate"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('是否代收货款')"
prop=
"isCollection"
v-if=
"collectionProxy"
>
<el-form-item
:label=
"$t('是否代收货款')"
prop=
"isCollection"
v-if=
"collectionProxy"
class=
"w-500"
>
<dict-selector
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
formatter=
"bool"
v-model=
"form.isCollection"
form-type=
"radio"
:disabled=
"false"
/>
<dict-selector
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
formatter=
"bool"
v-model=
"form.isCollection"
form-type=
"radio"
:disabled=
"false"
/>
</el-form-item>
</el-form-item>
<!--代收货款,只有非控货订单、并且线路开通了代收货款后,才显示是否代收货款选项-->
<!--代收货款,只有非控货订单、并且线路开通了代收货款后,才显示是否代收货款选项-->
<el-form-item
:label=
"$t('代收货款金额')"
v-if=
"collectionProxy && form.isCollection"
prop=
"collectionProxy"
class=
"ml-20"
>
<el-form-item
:label=
"$t('代收货款金额')"
v-if=
"collectionProxy && form.isCollection"
prop=
"collectionProxy"
>
<el-input
type=
"number"
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"
/>
<selector
v-model=
"form.collectionProxyCurrency"
:options=
"currencyList"
label-field=
"titleZh"
value-field=
"id"
defaultable
class=
"w-100"
:disabled=
"false"
/>
</el-form-item>
</el-form-item>
</div>
</div>
<div
class=
"form-section flex"
>
<div
class=
"form-section flex"
>
<el-form-item
:label=
"$t('收货方式')"
prop=
"harvestMethod"
class=
"
ml-2
0"
>
<el-form-item
:label=
"$t('收货方式')"
prop=
"harvestMethod"
class=
"
w-50
0"
>
<el-select
v-model=
"form.harvestMethod"
@
change=
"handleChange"
>
<el-select
v-model=
"form.harvestMethod"
@
change=
"handleChange"
>
<el-option
:label=
"$t('自提')"
:value=
"1"
></el-option>
<el-option
:label=
"$t('自提')"
:value=
"1"
></el-option>
<el-option
v-if=
"homeDeliveryService"
:label=
"$t('送货上门')"
:value=
"2"
></el-option>
<el-option
v-if=
"homeDeliveryService"
:label=
"$t('送货上门')"
:value=
"2"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('关联报价单')"
prop=
"offerId"
>
<el-form-item
:label=
"$t('关联报价单')"
prop=
"offerId"
>
<span
v-if=
"offerIdNochange&&offerNumber"
>
{{offerNumber}}
</span>
<span
v-if=
"offerIdNochange&&offerNumber"
>
{{offerNumber}}
</span>
<el-select
<el-select
...
@@ -1647,6 +1646,7 @@ export default {
...
@@ -1647,6 +1646,7 @@ export default {
customDraweeVOList
:
this
.
customDraweeList
,
customDraweeVOList
:
this
.
customDraweeList
,
// transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
// transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
orderItemVOList
:
this
.
getProductListWithDefaultValue
(),
orderItemVOList
:
this
.
getProductListWithDefaultValue
(),
hasConsignee
:
this
.
hasConsignee
})
})
data
.
type
=
data
.
type
.
join
(
'
,
'
)
data
.
type
=
data
.
type
.
join
(
'
,
'
)
updateApply
(
data
).
then
(
response
=>
{
updateApply
(
data
).
then
(
response
=>
{
...
@@ -1664,7 +1664,8 @@ export default {
...
@@ -1664,7 +1664,8 @@ export default {
customDraweeVOList
:
this
.
customDraweeList
,
customDraweeVOList
:
this
.
customDraweeList
,
// transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
// transportUpdateReqVOList: this.transportList.filter(item => item._enabled),
orderItemVOList
:
this
.
getProductListWithDefaultValue
(),
orderItemVOList
:
this
.
getProductListWithDefaultValue
(),
status
:
submitType
status
:
submitType
,
hasConsignee
:
this
.
hasConsignee
})
})
data
.
type
=
data
.
type
.
join
(
'
,
'
)
data
.
type
=
data
.
type
.
join
(
'
,
'
)
// 添加的提交
// 添加的提交
...
...
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