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
390d870d
Commit
390d870d
authored
Nov 15, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
放货弹窗上的bug
parent
cf0065b2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
191 additions
and
184 deletions
+191
-184
Release.vue
src/views/ecw/order/components/Release.vue
+191
-184
No files found.
src/views/ecw/order/components/Release.vue
View file @
390d870d
<
template
>
<
template
>
<el-dialog
:title=
"title"
visible
:before-close=
"closeDialog"
:close-on-click-modal=
"false"
width=
"1000px"
>
<el-dialog
:title=
"title"
visible
:before-close=
"closeDialog"
:close-on-click-modal=
"false"
width=
"1000px"
>
<el-form
v-if=
"agreement"
ref=
"form"
:model=
"formData"
:rules=
"rules"
size=
"small"
label-width=
"100px"
>
<el-form
v-if=
"agreement"
ref=
"form"
:model=
"formData"
:rules=
"rules"
size=
"small"
label-width=
"100px"
>
<el-row>
<el-row>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('订单号')"
>
<el-form-item
:label=
"$t('订单号')"
>
{{
detail
.
orderNo
}}
{{
detail
.
orderNo
}}
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('总箱数')"
>
<el-form-item
:label=
"$t('总箱数')"
>
{{
detail
.
sumNum
}}
{{
detail
.
sumNum
}}
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('体积')"
>
<el-form-item
:label=
"$t('体积')"
>
{{
detail
.
sumVolume
}}
m³
{{
detail
.
sumVolume
}}
m³
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('重量')"
>
<el-form-item
:label=
"$t('重量')"
>
{{
detail
.
sumWeight
}}
kg
{{
detail
.
sumWeight
}}
kg
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('总控货箱数')"
>
<el-form-item
:label=
"$t('总控货箱数')"
>
{{
detail
.
sumNum
}}
{{
detail
.
sumNum
}}
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
:label=
"$t('剩余放货箱数')"
>
<el-form-item
:label=
"$t('剩余放货箱数')"
>
{{
detail
.
sumNum
-
detail
.
releaseNum
}}
{{
detail
.
sumNum
-
detail
.
releaseNum
}}
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('到仓日期/卸柜日期')"
label-width=
"200px"
>
<el-form-item
:label=
"$t('到仓日期/卸柜日期')"
label-width=
"200px"
>
{{
detail
.
unloadTime
}}
{{
detail
.
unloadTime
}}
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('放货锁定收货人到期')"
label-width=
"200px"
>
<el-form-item
:label=
"$t('放货锁定收货人到期')"
label-width=
"200px"
>
{{
detail
.
lockConsigneeTime
||
'
-
'
}}
{{
detail
.
lockConsigneeTime
||
'
-
'
}}
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<div
class=
"title"
>
{{
$t
(
'
请填写放货信息
'
)
}}
</div>
<div
class=
"title"
>
{{
$t
(
'
请填写放货信息
'
)
}}
</div>
<div
class=
"flex"
>
<div
class=
"flex"
>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeName"
>
<el-form-item
:label=
"$t('收货人')"
prop=
"consigneeName"
>
<el-input
v-model=
"formData.consigneeName"
:placeholder=
"$t('请输入收货人')"
clearable
class=
"w-150"
></el-input>
<el-input
v-model=
"formData.consigneeName"
:placeholder=
"$t('请输入收货人')"
clearable
class=
"w-150"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('收货人电话')"
prop=
"consigneePhone"
>
<el-form-item
:label=
"$t('收货人电话')"
prop=
"consigneePhone"
>
<!--
<el-input
v-model=
"formData.field109"
:placeholder=
"$t('区号')"
clearable
class=
"w-150"
></el-input>
-->
<!--
<el-input
v-model=
"formData.field109"
:placeholder=
"$t('区号')"
clearable
class=
"w-150"
></el-input>
-->
<area-code-selector
v-model=
"formData.consigneeCountryCode"
class=
"w-150"
/>
<area-code-selector
v-model=
"formData.consigneeCountryCode"
class=
"w-150"
/>
<el-input
v-model=
"formData.consigneePhone"
:placeholder=
"$t('请输入收货人电话')"
clearable
class=
"w-150 ml-10"
></el-input>
<el-input
v-model=
"formData.consigneePhone"
:placeholder=
"$t('请输入收货人电话')"
clearable
class=
"w-150 ml-10"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('收货人邮箱')"
prop=
"consigneeEmail"
>
<el-form-item
:label=
"$t('收货人邮箱')"
prop=
"consigneeEmail"
>
<el-input
v-model=
"formData.consigneeEmail"
:placeholder=
"$t('请输入收货人邮箱')"
clearable
class=
"w-150"
></el-input>
<el-input
v-model=
"formData.consigneeEmail"
:placeholder=
"$t('请输入收货人邮箱')"
clearable
class=
"w-150"
></el-input>
</el-form-item>
</el-form-item>
</div>
</div>
<el-table
:data=
"[formData]"
border
class=
"release-table"
>
<el-table
:data=
"[formData]"
border
class=
"release-table"
>
<el-table-column
:label=
"$t('控货箱数')"
>
<el-table-column
:label=
"$t('控货箱数')"
>
{{
detail
.
sumNum
-
detail
.
releaseNum
}}
{{
detail
.
sumNum
-
detail
.
releaseNum
}}
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('放货箱数')"
>
<el-table-column
:label=
"$t('放货箱数')"
>
<template
slot-scope=
"
{row}">
<template
slot-scope=
"
{row}">
...
@@ -87,27 +90,28 @@
...
@@ -87,27 +90,28 @@
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<el-form-item
:label=
"$t('控货手机号')"
prop=
"field117"
style=
"margin-top:20px"
>
<el-form-item
:label=
"$t('控货手机号')"
prop=
"field117"
style=
"margin-top:20px"
>
<el-input
:value=
"'+' + detail.dialCode + detail.phone"
readonly
:placeholder=
"$t('请输入控货手机号')"
>
<el-input
:value=
"'+' + detail.dialCode + detail.phone"
readonly
:placeholder=
"$t('请输入控货手机号')"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('手机验证码')"
prop=
"code"
>
<el-form-item
:label=
"$t('手机验证码')"
prop=
"code"
>
<el-input
v-model=
"formData.code"
:placeholder=
"$t('请输入手机验证码')"
clearable
class=
"w-150 mr-10"
></el-input>
<el-input
v-model=
"formData.code"
:placeholder=
"$t('请输入手机验证码')"
clearable
class=
"w-150 mr-10"
></el-input>
<!-- <el-button type="success">{{ $t('获取验证码') }}</el-button> -->
<!-- <el-button type="success">{{ $t('获取验证码') }}</el-button> -->
<send-sms-code
:order-id=
"detail.orderId"
scene=
"5"
/>
<send-sms-code
:order-id=
"detail.orderId"
scene=
"5"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
""
style=
"margin-top:20px"
>
<el-form-item
label=
""
style=
"margin-top:20px"
>
<el-button
type=
"success"
@
click=
"submit"
>
{{$t('确认提货')
}}
</el-button>
<el-button
type=
"success"
@
click=
"submit"
>
{{ $t('确认提货')
}}
</el-button>
<el-button
type=
"default"
@
click=
"closeDialog"
>
{{$t('关闭')
}}
</el-button>
<el-button
type=
"default"
@
click=
"closeDialog"
>
{{ $t('关闭')
}}
</el-button>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
<div
v-else
>
<div
v-else
>
<!-- <release-agreement /> -->
<!-- <release-agreement /> -->
<need-know
ref=
"needKnow"
keyname=
"control"
/>
<need-know
ref=
"needKnow"
keyname=
"control"
/>
<div
style=
"margin-top:30px"
>
<div
style=
"margin-top:30px"
>
<el-button
type=
"primary"
@
click=
"agreement=true"
>
{{$t('我同意')
}}
</el-button>
<el-button
type=
"primary"
@
click=
"agreement=true"
>
{{ $t('我同意')
}}
</el-button>
<!-- <el-button type="primary" @click="$refs.needKnow.download()">{{ $t('保存协议') }}</el-button> -->
<!-- <el-button type="primary" @click="$refs.needKnow.download()">{{ $t('保存协议') }}</el-button> -->
<el-button
@
click=
"closeDialog"
>
{{$t('关闭')
}}
</el-button>
<el-button
@
click=
"closeDialog"
>
{{ $t('关闭')
}}
</el-button>
</div>
</div>
</div>
</div>
</el-dialog>
</el-dialog>
...
@@ -119,16 +123,17 @@ import AreaCodeSelector from '@/components/AreaCodeSelector'
...
@@ -119,16 +123,17 @@ import AreaCodeSelector from '@/components/AreaCodeSelector'
import
SendSmsCode
from
'
@/views/ecw/order/components/SendSmsCode
'
import
SendSmsCode
from
'
@/views/ecw/order/components/SendSmsCode
'
import
NeedKnow
from
'
@/components/NeedKnow
'
import
NeedKnow
from
'
@/components/NeedKnow
'
import
Decimal
from
'
decimal.js
'
import
Decimal
from
'
decimal.js
'
export
default
{
export
default
{
props
:
{
props
:
{
orderId
:
[
String
,
Number
]
orderId
:
[
String
,
Number
]
},
},
components
:
{
AreaCodeSelector
,
SendSmsCode
,
NeedKnow
},
components
:
{
AreaCodeSelector
,
SendSmsCode
,
NeedKnow
},
data
()
{
data
()
{
return
{
return
{
show
:
false
,
show
:
false
,
detail
:
null
,
detail
:
null
,
formData
:
{
formData
:
{
"
pickNum
"
:
0
,
"
pickNum
"
:
0
,
"
pickQuantity
"
:
0
,
"
pickQuantity
"
:
0
,
"
pickVolume
"
:
0
,
"
pickVolume
"
:
0
,
...
@@ -138,14 +143,14 @@ export default {
...
@@ -138,14 +143,14 @@ export default {
agreement
:
false
,
// 是否同意协议
agreement
:
false
,
// 是否同意协议
}
}
},
},
watch
:
{
watch
:
{
'
formData.pickNum
'
(
pickNum
)
{
'
formData.pickNum
'
(
pickNum
)
{
this
.
$set
(
this
.
formData
,
'
pickVolume
'
,
Decimal
(
this
.
detail
.
sumVolume
).
mul
(
pickNum
).
div
(
this
.
detail
.
sumNum
).
toFixed
(
2
))
this
.
$set
(
this
.
formData
,
'
pickVolume
'
,
Decimal
(
this
.
detail
.
sumVolume
).
mul
(
pickNum
).
div
(
this
.
detail
.
sumNum
).
toFixed
(
2
))
this
.
$set
(
this
.
formData
,
'
pickWeight
'
,
Decimal
(
this
.
detail
.
sumWeight
).
mul
(
pickNum
).
div
(
this
.
detail
.
sumNum
).
toFixed
(
2
))
this
.
$set
(
this
.
formData
,
'
pickWeight
'
,
Decimal
(
this
.
detail
.
sumWeight
).
mul
(
pickNum
).
div
(
this
.
detail
.
sumNum
).
toFixed
(
2
))
}
}
},
},
computed
:
{
computed
:
{
rules
()
{
rules
()
{
return
{
return
{
consigneeName
:
{
required
:
true
,
message
:
this
.
$t
(
'
请填写收货人
'
)},
consigneeName
:
{
required
:
true
,
message
:
this
.
$t
(
'
请填写收货人
'
)},
code
:
{
required
:
true
,
message
:
this
.
$t
(
'
请填写验证码
'
)},
code
:
{
required
:
true
,
message
:
this
.
$t
(
'
请填写验证码
'
)},
...
@@ -157,35 +162,35 @@ export default {
...
@@ -157,35 +162,35 @@ export default {
}
}
}
}
},
},
title
()
{
title
()
{
let
t
=
this
.
$t
(
'
放货
'
)
let
t
=
this
.
$t
(
'
放货
'
)
if
(
this
.
detail
)
{
if
(
this
.
detail
)
{
t
+=
'
-
'
+
this
.
detail
.
orderNo
t
+=
'
-
'
+
this
.
detail
.
orderNo
}
}
return
t
return
t
}
}
},
},
created
()
{
created
()
{
this
.
show
=
true
this
.
show
=
true
this
.
loadData
()
this
.
loadData
()
},
},
methods
:
{
methods
:
{
loadData
()
{
loadData
()
{
getReleaseInfo
(
this
.
orderId
).
then
(
res
=>
{
getReleaseInfo
(
this
.
orderId
).
then
(
res
=>
{
this
.
detail
=
res
.
data
this
.
detail
=
res
.
data
this
.
$set
(
this
.
formData
,
'
consigneeName
'
,
res
.
data
.
consigneeName
)
this
.
$set
(
this
.
formData
,
'
consigneeName
'
,
res
.
data
.
consigneeName
)
this
.
$set
(
this
.
formData
,
'
consigneeCountryCode
'
,
'
+
'
+
res
.
data
.
consigneeCountryCode
)
this
.
$set
(
this
.
formData
,
'
consigneeCountryCode
'
,
res
.
data
.
consigneeCountryCode
?
(
'
+
'
+
res
.
data
.
consigneeCountryCode
)
:
null
)
this
.
$set
(
this
.
formData
,
'
consigneePhone
'
,
res
.
data
.
consigneePhone
)
this
.
$set
(
this
.
formData
,
'
consigneePhone
'
,
res
.
data
.
consigneePhone
)
this
.
$set
(
this
.
formData
,
'
consigneeEmail
'
,
res
.
data
.
consigneeEmail
)
this
.
$set
(
this
.
formData
,
'
consigneeEmail
'
,
res
.
data
.
consigneeEmail
)
})
})
},
},
closeDialog
()
{
closeDialog
()
{
this
.
show
=
false
this
.
show
=
false
this
.
$emit
(
'
close
'
)
this
.
$emit
(
'
close
'
)
},
},
submit
()
{
submit
()
{
this
.
$refs
.
form
.
validate
(
valid
=>
{
this
.
$refs
.
form
.
validate
(
valid
=>
{
if
(
!
valid
)
{
if
(
!
valid
)
{
return
false
return
false
}
}
createPick
(
Object
.
assign
({
orderId
:
this
.
orderId
},
this
.
formData
)).
then
(
res
=>
{
createPick
(
Object
.
assign
({
orderId
:
this
.
orderId
},
this
.
formData
)).
then
(
res
=>
{
...
@@ -201,20 +206,22 @@ export default {
...
@@ -201,20 +206,22 @@ export default {
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.title
{
.title
{
font-size
:
16px
;
font-size
:
16px
;
margin
:
20px
0
;
margin
:
20px
0
;
display
:flex
;
display
:
flex
;
align-items
:center
;
align-items
:
center
;
&
:before
{
&
:before
{
content
:
''
;
content
:
''
;
width
:
5px
;
width
:
5px
;
height
:
15px
;
height
:
15px
;
background
:
#666
;
background
:
#666
;
margin-right
:
10px
;
margin-right
:
10px
;
}
}
}
}
::v-deep
.release-table
.el-form-item__error
{
::v-deep
.release-table
.el-form-item__error
{
position
:
static
;
position
:
static
;
}
}
</
style
>
</
style
>
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