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
a1c850dc
Commit
a1c850dc
authored
Sep 23, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
异常登记的bug
parent
9632029e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
6 deletions
+26
-6
dict.js
src/utils/dict.js
+1
-0
indexAir.vue
src/views/ecw/box/indexAir.vue
+9
-1
regError.vue
src/views/ecw/box/regError.vue
+16
-5
No files found.
src/utils/dict.js
View file @
a1c850dc
...
@@ -216,6 +216,7 @@ export const DICT_TYPE = {
...
@@ -216,6 +216,7 @@ export const DICT_TYPE = {
BOX_SHIPPING_PRICE_UNIT
:
'
shipping_price_unit
'
,
// 金额单位
BOX_SHIPPING_PRICE_UNIT
:
'
shipping_price_unit
'
,
// 金额单位
BOX_SHIPPING_TICKET_EXCEPTION
:
'
shipping_ticket_exception
'
,
// 票异常
BOX_SHIPPING_TICKET_EXCEPTION
:
'
shipping_ticket_exception
'
,
// 票异常
BOX_SHIPPING_PROCESS
:
'
shipping_process
'
,
// 海运出货流程
BOX_SHIPPING_PROCESS
:
'
shipping_process
'
,
// 海运出货流程
BOX_AIR_SHIPMENT_PROCESS
:
'
air_shipment_process
'
,
// 空运出货
BOX_SEA_AIR
:
'
shipping_process_sea_air
'
,
// 海空联运流程流程
BOX_SEA_AIR
:
'
shipping_process_sea_air
'
,
// 海空联运流程流程
BOX_SHIPPING_BRAND_TYPE
:
'
shipping_brand_type
'
,
// 出货品牌类型
BOX_SHIPPING_BRAND_TYPE
:
'
shipping_brand_type
'
,
// 出货品牌类型
BOX_SHIPPING_NOTICE_TYPE
:
'
shipping_notice_type
'
,
// 出货通知类型
BOX_SHIPPING_NOTICE_TYPE
:
'
shipping_notice_type
'
,
// 出货通知类型
...
...
src/views/ecw/box/indexAir.vue
View file @
a1c850dc
...
@@ -157,7 +157,7 @@
...
@@ -157,7 +157,7 @@
<costForm
v-if=
"dialogCfg.open"
@
closeDialog=
"closeDialog"
:shipmentObj=
"currRow"
/>
<costForm
v-if=
"dialogCfg.open"
@
closeDialog=
"closeDialog"
:shipmentObj=
"currRow"
/>
</
template
>
</
template
>
<
template
v-if=
"dialogCfg.dialogType === 'error'"
>
<
template
v-if=
"dialogCfg.dialogType === 'error'"
>
<regError
v-if=
"dialogCfg.open"
@
closeDialog=
"closeDialog"
:shipmentObj=
"currRow"
:allUsers=
"allUsers"
/>
<regError
v-if=
"dialogCfg.open"
@
closeDialog=
"closeDialog"
:shipmentObj=
"currRow"
:allUsers=
"allUsers"
flag=
"air"
/>
</
template
>
</
template
>
<
template
v-if=
"dialogCfg.dialogType === 'editLadingBill'"
>
<
template
v-if=
"dialogCfg.dialogType === 'editLadingBill'"
>
<ladingBill
v-if=
"dialogCfg.open"
@
closeDialog=
"closeDialog"
:shipmentObj=
"currRow"
:getCabinetName=
"getCabinetName"
type=
"air"
/>
<ladingBill
v-if=
"dialogCfg.open"
@
closeDialog=
"closeDialog"
:shipmentObj=
"currRow"
:getCabinetName=
"getCabinetName"
type=
"air"
/>
...
@@ -220,6 +220,7 @@ import {
...
@@ -220,6 +220,7 @@ import {
}
from
"
./shippingAir/utils
"
;
}
from
"
./shippingAir/utils
"
;
import
{
getCabinetPage
}
from
"
@/api/ecw/cabinet
"
;
import
{
getCabinetPage
}
from
"
@/api/ecw/cabinet
"
;
import
LadingBill
from
"
@/views/ecw/box/ladingBill/index.vue
"
;
import
LadingBill
from
"
@/views/ecw/box/ladingBill/index.vue
"
;
import
{
listUser
}
from
"
@/api/system/user
"
;
export
default
{
export
default
{
name
:
'
indexAir
'
,
name
:
'
indexAir
'
,
...
@@ -311,6 +312,7 @@ export default {
...
@@ -311,6 +312,7 @@ export default {
this
.
$t
(
"
部分完成
"
),
this
.
$t
(
"
部分完成
"
),
this
.
$t
(
"
已完成
"
),
this
.
$t
(
"
已完成
"
),
],
],
allUsers
:
[]
}
}
}
,
}
,
computed
:
{
computed
:
{
...
@@ -356,6 +358,12 @@ export default {
...
@@ -356,6 +358,12 @@ export default {
this
.
getList
()
this
.
getList
()
this
.
getChannelList
()
this
.
getChannelList
()
this
.
queryNotice
()
this
.
queryNotice
()
// 用户
listUser
({
pageNo
:
"
1
"
,
pageSize
:
"
10000
"
}
).
then
((
res
)
=>
{
const
{
data
}
=
res
;
this
.
allUsers
=
data
.
list
??
[];
}
);
}
,
}
,
methods
:
{
methods
:
{
formatDate
,
formatDate
,
...
...
src/views/ecw/box/regError.vue
View file @
a1c850dc
...
@@ -2,12 +2,12 @@
...
@@ -2,12 +2,12 @@
<div
class=
"shippingSea-dialog"
>
<div
class=
"shippingSea-dialog"
>
<el-form
ref=
"errorForm"
:model=
"errorObj"
label-width=
"140px"
>
<el-form
ref=
"errorForm"
:model=
"errorObj"
label-width=
"140px"
>
<el-form-item
:label=
"$t('操作步骤')"
>
<el-form-item
:label=
"$t('操作步骤')"
>
<el-select
v-
if=
"flag=='sea'"
v-
model=
"errorObj.opStep"
:placeholder=
"$t('请选择操作步骤')"
>
<el-select
v-model=
"errorObj.opStep"
:placeholder=
"$t('请选择操作步骤')"
>
<el-option
v-for=
"type in this.getDictDatas(DICT_TYPE
.BOX_SHIPPING_PROCESS
)"
:key=
"type.value"
:label=
"$l(type, 'label')"
:value=
"type.value"
></el-option>
<el-option
v-for=
"type in this.getDictDatas(DICT_TYPE
[this.process]
)"
:key=
"type.value"
:label=
"$l(type, 'label')"
:value=
"type.value"
></el-option>
</el-select>
</el-select>
<el-select
v-if=
"flag=='seaAir'"
v-model=
"errorObj.opStep"
:placeholder=
"$t('请选择操作步骤')"
>
<
!--
<
el-select
v-if=
"flag=='seaAir'"
v-model=
"errorObj.opStep"
:placeholder=
"$t('请选择操作步骤')"
>
<el-option
v-for=
"type in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR)"
:key=
"type.value"
:label=
"$l(type, 'label')"
:value=
"type.value"
></el-option>
<el-option
v-for=
"type in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR)"
:key=
"type.value"
:label=
"$l(type, 'label')"
:value=
"type.value"
></el-option>
</el-select>
</el-select>
-->
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('票异常')"
>
<el-form-item
:label=
"$t('票异常')"
>
<el-select
v-model=
"errorObj.billAbnId"
:placeholder=
"$t('请选择票异常')"
>
<el-select
v-model=
"errorObj.billAbnId"
:placeholder=
"$t('请选择票异常')"
>
...
@@ -75,10 +75,21 @@ export default {
...
@@ -75,10 +75,21 @@ export default {
label
:
this
.
$t
(
"
否
"
),
label
:
this
.
$t
(
"
否
"
),
},
},
],
],
flag
:
"
sea
"
,
delayDay
:
0
,
delayDay
:
0
,
};
};
},
},
computed
:{
flag
(){
return
this
.
$attrs
.
flag
||
'
sea
'
},
process
(){
return
{
'
air
'
:
'
BOX_AIR_SHIPMENT_PROCESS
'
,
'
sea
'
:
'
BOX_SHIPPING_PROCESS
'
,
'
seaAir
'
:
'
BOX_SEA_AIR
'
}[
this
.
flag
]
}
},
created
()
{
created
()
{
const
{
currNode
}
=
this
.
$attrs
;
const
{
currNode
}
=
this
.
$attrs
;
this
.
errorObj
=
{
opStep
:
currNode
?.
dataKey
??
undefined
};
this
.
errorObj
=
{
opStep
:
currNode
?.
dataKey
??
undefined
};
...
...
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