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
dc20d9b8
Commit
dc20d9b8
authored
Sep 10, 2024
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复订单部分的bug
parent
87d3d90f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
12 deletions
+10
-12
main.js
src/main.js
+1
-1
edit.vue
src/views/ecw/order/edit.vue
+9
-11
No files found.
src/main.js
View file @
dc20d9b8
...
@@ -123,7 +123,7 @@ Vue.prototype.$showFormValidateErrors = (errors) => {
...
@@ -123,7 +123,7 @@ Vue.prototype.$showFormValidateErrors = (errors) => {
let
createElement
=
vm
.
$createElement
let
createElement
=
vm
.
$createElement
let
fieldList
=
Object
.
values
(
errors
)
let
fieldList
=
Object
.
values
(
errors
)
Element
.
Notification
({
Element
.
Notification
({
title
:
this
.
$t
(
'
表单错误
'
),
title
:
i18n
.
$t
(
'
表单错误
'
),
type
:
'
warning
'
,
type
:
'
warning
'
,
duration
:
3000
,
duration
:
3000
,
message
:
createElement
(
'
div
'
,
fieldList
.
map
(
function
(
errorList
)
{
message
:
createElement
(
'
div
'
,
fieldList
.
map
(
function
(
errorList
)
{
...
...
src/views/ecw/order/edit.vue
View file @
dc20d9b8
...
@@ -485,7 +485,7 @@
...
@@ -485,7 +485,7 @@
</div>
</div>
<div
class=
"form-section flex"
>
<div
class=
"form-section flex"
>
<el-form-item
:label=
"$t('收货方式')"
prop=
"harvestMethod"
class=
"ml-20"
>
<el-form-item
:label=
"$t('收货方式')"
prop=
"harvestMethod"
class=
"ml-20"
>
<el-select
v-model=
"
harvestMethod2
"
@
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>
...
@@ -701,7 +701,7 @@ let makeDefaultFormData = () => {
...
@@ -701,7 +701,7 @@ let makeDefaultFormData = () => {
externalWarehouseDtoList
:[],
externalWarehouseDtoList
:[],
orderItemVOList
:[],
orderItemVOList
:[],
drawee
:
2
,
drawee
:
2
,
harvestMethod
:
"
1
"
,
harvestMethod
:
1
,
displayBillLadingPrice
:
true
displayBillLadingPrice
:
true
}
}
}
}
...
@@ -762,7 +762,7 @@ export default {
...
@@ -762,7 +762,7 @@ export default {
offerIdNochange
:
false
,
offerIdNochange
:
false
,
offerNumber
:
null
,
offerNumber
:
null
,
showAdress
:
false
,
showAdress
:
false
,
harvestMethod2
:
null
,
//
harvestMethod2: null,
/* lunchList: [
/* lunchList: [
{ label: "自提", value: 1 },
{ label: "自提", value: 1 },
{ label: "送货上门", value: 2 },
{ label: "送货上门", value: 2 },
...
@@ -1052,7 +1052,7 @@ export default {
...
@@ -1052,7 +1052,7 @@ export default {
this
.
calculationPrice
()
this
.
calculationPrice
()
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
// 如果开启了默认送货上门,则默认选择送货上门,2是送货上门,10是默认送货上门
// 如果开启了默认送货上门,则默认选择送货上门,2是送货上门,10是默认送货上门
this
.
$set
(
this
.
form
,
'
harvestMethod
'
,
this
.
routeOtherServices
.
indexOf
(
'
2
'
)
>
-
1
&&
this
.
routeOtherServices
.
indexOf
(
'
10
'
)
>
-
1
?
'
2
'
:
'
1
'
)
this
.
$set
(
this
.
form
,
'
harvestMethod
'
,
this
.
routeOtherServices
.
indexOf
(
'
2
'
)
>
-
1
&&
this
.
routeOtherServices
.
indexOf
(
'
10
'
)
>
-
1
?
2
:
1
)
// controlStatus 0 支持控货,1不支持控货
// controlStatus 0 支持控货,1不支持控货
// 如果不支持控货,则控货不能选择是
// 如果不支持控货,则控货不能选择是
...
@@ -1555,7 +1555,7 @@ export default {
...
@@ -1555,7 +1555,7 @@ export default {
this
.
showAdress
=
false
;
this
.
showAdress
=
false
;
}
else
{
}
else
{
if
(
this
.
homeDeliveryService
==
false
)
{
if
(
this
.
homeDeliveryService
==
false
)
{
this
.
harvestMethod2
=
1
;
this
.
form
.
harvestMethod
=
1
;
this
.
$message
.
error
(
"
此路线未开通上门服务。
"
);
this
.
$message
.
error
(
"
此路线未开通上门服务。
"
);
return
;
return
;
}
}
...
@@ -1572,11 +1572,8 @@ export default {
...
@@ -1572,11 +1572,8 @@ export default {
/** 提交按钮 */
/** 提交按钮 */
// type 在新建的时候表示状态,0草稿,2带入仓
// type 在新建的时候表示状态,0草稿,2带入仓
submitForm
(
submitType
)
{
submitForm
(
submitType
)
{
this
.
form
.
harvestMethod
=
this
.
harvestMethod2
;
if
(
this
.
form
.
harvestMethod
==
2
&&
this
.
homeDeliveryService
==
false
)
{
if
(
this
.
harvestMethod2
==
2
&&
return
this
.
$message
.
error
(
"
此路线未开通上门服务。
"
);
this
.
homeDeliveryService
==
false
)
{
this
.
$message
.
error
(
"
此路线未开通上门服务。
"
);
}
}
this
.
$refs
[
"
form
"
].
validate
(
async
(
valid
,
errors
)
=>
{
this
.
$refs
[
"
form
"
].
validate
(
async
(
valid
,
errors
)
=>
{
...
@@ -1840,8 +1837,9 @@ export default {
...
@@ -1840,8 +1837,9 @@ export default {
this
.
form
.
lineId
=
null
this
.
form
.
lineId
=
null
this
.
selectedRouter
=
null
this
.
selectedRouter
=
null
this
.
form
.
destCountryId
=
this
.
destCityList
.
find
(
item
=>
item
.
shi
===
val
)?.
guojia
this
.
form
.
destCountryId
=
this
.
destCityList
.
find
(
item
=>
item
.
shi
===
val
)?.
guojia
await
this
.
updateRoutes
(
'
handleChangeDestCity
'
)
}
}
await
this
.
updateRoutes
(
'
handleChangeDestCity
'
)
},
},
// 切换路线
// 切换路线
setLineId
(
lineId
){
setLineId
(
lineId
){
...
...
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