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
2dffa81d
Commit
2dffa81d
authored
Nov 02, 2022
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1345 海空联运的异常登记、费用登记操作步骤缺少二程到港,二程起飞
parent
262ff4a2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
dict.js
src/utils/dict.js
+1
-0
costForm.vue
src/views/ecw/box/costForm.vue
+8
-1
indexSeaAir.vue
src/views/ecw/box/indexSeaAir.vue
+1
-0
regError.vue
src/views/ecw/box/regError.vue
+8
-1
No files found.
src/utils/dict.js
View file @
2dffa81d
...
...
@@ -198,6 +198,7 @@ export const DICT_TYPE = {
BOX_SHIPPING_PRICE_UNIT
:
'
shipping_price_unit
'
,
// 金额单位
BOX_SHIPPING_TICKET_EXCEPTION
:
'
shipping_ticket_exception
'
,
// 票异常
BOX_SHIPPING_PROCESS
:
'
shipping_process
'
,
// 海运出货流程
BOX_SEA_AIR
:
'
shipping_process_sea_air
'
,
// 海空联运流程流程
BOX_SHIPPING_BRAND_TYPE
:
'
shipping_brand_type
'
,
// 出货品牌类型
BOX_SHIPPING_NOTICE_TYPE
:
'
shipping_notice_type
'
,
// 出货通知类型
BOX_ORDER_SHIPMENT_STATE
:
'
order_shipment_state
'
...
...
src/views/ecw/box/costForm.vue
View file @
2dffa81d
...
...
@@ -3,9 +3,12 @@
<el-form
ref=
"costForm"
:model=
"costObj"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
:label=
"$t('操作步骤')"
prop=
"opStepType"
>
<el-select
v-model=
"costObj.opStepType"
:placeholder=
"$t('请选择操作步骤')"
>
<el-select
v-
if=
"flag=='sea'"
v-
model=
"costObj.opStepType"
: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-select>
<el-select
v-if=
"flag=='seaAir'"
v-model=
"costObj.opStepType"
: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-select>
</el-form-item>
<el-form-item
:label=
"$t('费用类型')"
prop=
"costType"
>
...
...
@@ -67,6 +70,7 @@ export default {
price
:
[{
required
:
true
,
message
:
this
.
$t
(
"
金额不能为空
"
),
trigger
:
"
blur
"
}],
priceUnit
:
[{
required
:
true
,
message
:
this
.
$t
(
"
金额单位不能为空
"
),
trigger
:
"
blur
"
}]
},
flag
:
'
sea
'
};
},
created
()
{
...
...
@@ -80,6 +84,9 @@ export default {
getCurrencyList
().
then
((
res
)
=>
{
this
.
currencyList
=
res
.
data
??
[];
});
if
(
this
.
$attrs
.
shipmentObj
.
bosType
==
'
seaAir
'
){
this
.
flag
=
'
seaAir
'
;
}
},
methods
:
{
submit
()
{
...
...
src/views/ecw/box/indexSeaAir.vue
View file @
2dffa81d
...
...
@@ -621,6 +621,7 @@ export default {
}
if
([
"
editLadingBill
"
,
"
cost
"
,
"
error
"
].
includes
(
command
))
{
this
.
currRow
=
row
;
this
.
currRow
.
bosType
=
'
seaAir
'
this
.
$set
(
this
.
dialogCfg
,
"
dialogType
"
,
command
);
this
.
$set
(
this
.
dialogCfg
,
"
width
"
,
"
600px
"
);
this
.
$set
(
this
.
dialogCfg
,
"
open
"
,
true
);
...
...
src/views/ecw/box/regError.vue
View file @
2dffa81d
...
...
@@ -2,9 +2,12 @@
<div
class=
"shippingSea-dialog"
>
<el-form
ref=
"errorForm"
:model=
"errorObj"
label-width=
"140px"
>
<el-form-item
:label=
"$t('操作步骤')"
>
<el-select
v-model=
"errorObj.opStep"
:placeholder=
"$t('请选择操作步骤')"
>
<el-select
v-
if=
"flag=='sea'"
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-select>
<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-select>
</el-form-item>
<el-form-item
:label=
"$t('票异常')"
>
<el-select
v-model=
"errorObj.billAbnId"
:placeholder=
"$t('请选择票异常')"
>
...
...
@@ -63,11 +66,15 @@ export default {
label
:
this
.
$t
(
"
否
"
),
},
],
flag
:
'
sea
'
};
},
created
()
{
const
{
currNode
}
=
this
.
$attrs
;
this
.
errorObj
=
{
opStep
:
currNode
?.
dataKey
??
undefined
};
if
(
this
.
$attrs
.
shipmentObj
.
bosType
==
'
seaAir
'
){
this
.
flag
=
'
seaAir
'
;
}
},
methods
:
{
/** 提交 */
...
...
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