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
566706f1
Commit
566706f1
authored
Oct 26, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复部分bug
parent
d3333c8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
12 deletions
+31
-12
edit.vue
src/views/ecw/offer/edit.vue
+14
-11
edit.vue
src/views/ecw/order/edit.vue
+2
-0
release.vue
src/views/ecw/order/release.vue
+15
-1
No files found.
src/views/ecw/offer/edit.vue
View file @
566706f1
...
...
@@ -576,23 +576,26 @@ export default {
trigger
:
'
blur
'
}
],
lineId
:
[{
required
:
true
,
message
:
"
请选择线路
"
}],
lineId
:
[{
required
:
true
,
message
:
this
.
$t
(
"
请选择线路
"
)
}],
/* consignorId: [{ required: true, message: "发货人不能为空",}],
consigneeId: [{ required: true, message: "收货人不能为空"}], */
startTime
:
[{
required
:
true
,
message
:
"
有效期开始时间不能为空
"
}],
endTime
:
[{
required
:
true
,
message
:
"
有效期结束时间不能为空
"
}],
transportId
:
[{
required
:
true
,
message
:
"
选择运输方式
"
}],
channelId
:
[{
required
:
true
,
message
:
"
选择出货渠道
"
}],
stopTime
:
[{
required
:
true
,
message
:
"
不能为空
"
}],
relation
:
[{
required
:
true
,
message
:
"
请选择所属人
"
}],
control
:
[{
required
:
true
,
message
:
"
请选择是否控货
"
}],
importance
:
[{
required
:
true
,
message
:
"
请选择重要成都
"
}]
startTime
:
[{
required
:
true
,
message
:
this
.
$t
(
"
有效期开始时间不能为空
"
)}],
endTime
:
[{
required
:
true
,
message
:
this
.
$t
(
"
有效期结束时间不能为空
"
)}],
transportId
:
[{
required
:
true
,
message
:
this
.
$t
(
"
选择运输方式
"
)}],
channelId
:
[{
required
:
true
,
message
:
this
.
$t
(
"
选择出货渠道
"
)}],
stopTime
:
[{
required
:
true
,
message
:
this
.
$t
(
"
不能为空
"
)}],
relation
:
[{
required
:
true
,
message
:
this
.
$t
(
"
请选择所属人
"
)}],
control
:
[{
required
:
true
,
message
:
this
.
$t
(
"
请选择是否控货
"
)}],
importance
:
[
{
required
:
true
,
message
:
this
.
$t
(
"
请选择重要程度
"
)},
{
type
:
'
number
'
,
min
:
1
,
message
:
this
.
$t
(
"
请选择重要程度
"
)}
]
}
if
(
this
.
form
.
relation
==
1
){
rules
.
consignorId
=
[{
required
:
true
,
message
:
"
发货人不能为空
"
,
}]
rules
.
consignorId
=
[{
required
:
true
,
message
:
this
.
$t
(
"
发货人不能为空
"
)
}]
}
if
(
this
.
form
.
relation
==
2
){
rules
.
consigneeId
=
[{
required
:
true
,
message
:
"
收货人不能为空
"
,
}]
rules
.
consigneeId
=
[{
required
:
true
,
message
:
this
.
$t
(
"
收货人不能为空
"
)
}]
}
return
rules
},
...
...
src/views/ecw/order/edit.vue
View file @
566706f1
...
...
@@ -736,6 +736,8 @@ export default {
}))
})
}
// 更换运输方式之后,之前选择的路线会失效,需要重新选择
this
.
$set
(
this
.
form
,
'
lineId
'
,
undefined
)
this
.
getOpenedRouterList
()
},
'
form.lineId
'
(
lineId
){
...
...
src/views/ecw/order/release.vue
View file @
566706f1
...
...
@@ -4,6 +4,20 @@
<el-form-item
:label=
"$t('订单号')"
v-if=
"order"
>
{{
order
.
orderNo
}}
</el-form-item>
<el-form-item
label=
""
v-if=
"order"
>
<div>
{{
$t
(
'
箱数
'
)
}}
:
{{
order
.
sumNum
}}{{
$t
(
'
箱
'
)
}}
</div>
<div>
{{
$t
(
'
重量
'
)
}}
:
{{
order
.
sumWeight
}}
Kg
</div>
<div>
{{
$t
(
'
体积
'
)
}}
:
{{
order
.
sumVolume
}}
m³
</div>
<div>
{{
$t
(
'
数量
'
)
}}
:
{{
order
.
sumQuantity
}}{{
$t
(
'
个
'
)
}}
</div>
</el-form-item>
<el-form-item
:label=
"$t('放货方式')"
>
<dict-selector
:type=
"DICT_TYPE.ECW_HARVEST_METHOD"
v-model=
"form.pickType"
form-type=
"radio"
formatter=
"number"
></dict-selector>
</el-form-item>
...
...
@@ -16,7 +30,7 @@
{{
order
.
consigneeVO
.
name
}}
</el-form-item>
<el-form-item
:label=
"$t('收货电话')"
>
{{
order
.
consigneeVO
.
countryCode
}}
{{
order
.
consigneeVO
.
phone
}}
+
{{
order
.
consigneeVO
.
countryCode
}}
{{
order
.
consigneeVO
.
phone
}}
</el-form-item>
<el-form-item
:label=
"$t('收货地址')"
>
<!--缺少国城名字-->
...
...
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