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
61f82789
Commit
61f82789
authored
Jul 19, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
列表添加提单状态以及筛选
parent
10b4778a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
12 deletions
+48
-12
indexAir.vue
src/views/ecw/box/indexAir.vue
+28
-12
indexSea.vue
src/views/ecw/box/indexSea.vue
+20
-0
No files found.
src/views/ecw/box/indexAir.vue
View file @
61f82789
...
@@ -26,17 +26,22 @@
...
@@ -26,17 +26,22 @@
<el-option
v-for=
"dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)"
:key=
"dict.value"
:label=
"$l(dict, 'label')"
:value=
"dict.value"
/>
<el-option
v-for=
"dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)"
:key=
"dict.value"
:label=
"$l(dict, 'label')"
:value=
"dict.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-row>
<el-form-item
label=
""
prop=
"date"
>
<el-form-item
:label=
"$t('时间')"
prop=
"date"
>
<el-select
v-model=
"queryParams.dateType"
:placeholder=
"$t('请选择时间类型')"
clearable
size=
"small"
>
<el-select
v-model=
"queryParams.dateType"
:placeholder=
"$t('请选择时间类型')"
clearable
size=
"small"
>
<el-option
v-for=
"item in dateTypes"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
<el-option
v-for=
"item in dateTypes"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
""
>
<el-form-item
label=
""
>
<el-date-picker
v-model=
"queryParams.dateRangeCreateTime"
style=
"width: 240px"
value-format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetimerange"
range-separator=
"-"
start-:placeholder=
"$t('开始日期')"
end-:placeholder=
"$t('结束日期')"
/>
<el-date-picker
v-model=
"queryParams.dateRangeCreateTime"
style=
"width: 240px"
value-format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetimerange"
range-separator=
"-"
start-:placeholder=
"$t('开始日期')"
end-:placeholder=
"$t('结束日期')"
/>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('提单制作')"
prop=
"ladingBillStatus"
>
<el-select
v-model=
"queryParams.ladingBillStatus"
:placeholder=
"$t('请选择提单制作状态')"
clearable
size=
"small"
>
<el-option
v-for=
"(item,index) in ladingBillStatusData"
:key=
"index"
:label=
"item"
:value=
"index"
>
</el-option>
</el-select>
</el-form-item>
</el-row>
<el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
'
重置
'
)
}}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
'
重置
'
)
}}
</el-button>
...
@@ -86,6 +91,12 @@
...
@@ -86,6 +91,12 @@
<el-table-column
:label=
"$t('状态')"
align=
"center"
prop=
"shipmentStatusText"
/>
<el-table-column
:label=
"$t('状态')"
align=
"center"
prop=
"shipmentStatusText"
/>
<el-table-column
:label=
"$t('提单状态')"
align=
"center"
prop=
"ladingBillStatus"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
ladingBillStatusData
[
scope
.
row
.
ladingBillStatus
]
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('日期')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<el-table-column
:label=
"$t('日期')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
new
Date
(
scope
.
row
.
createTime
).
format
(
'
yyyy-MM-dd hh:mm:ss
'
)
}}
</span>
<span>
{{
new
Date
(
scope
.
row
.
createTime
).
format
(
'
yyyy-MM-dd hh:mm:ss
'
)
}}
</span>
...
@@ -267,7 +278,12 @@ export default {
...
@@ -267,7 +278,12 @@ export default {
trigger
:
'
blur
'
trigger
:
'
blur
'
}
}
]
]
}
}
,
ladingBillStatusData
:
[
this
.
$t
(
"
未完成
"
),
this
.
$t
(
"
部分完成
"
),
this
.
$t
(
"
已完成
"
),
],
}
}
}
,
}
,
computed
:
{
computed
:
{
...
...
src/views/ecw/box/indexSea.vue
View file @
61f82789
...
@@ -56,6 +56,14 @@
...
@@ -56,6 +56,14 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('提单制作')"
prop=
"ladingBillStatus"
>
<el-select
v-model=
"queryParams.ladingBillStatus"
:placeholder=
"$t('请选择提单制作状态')"
clearable
size=
"small"
>
<el-option
v-for=
"(item,index) in ladingBillStatusData"
:key=
"index"
:label=
"item"
:value=
"index"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
{{
$t
(
'
搜索
'
)
}}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
'
重置
'
)
}}
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
{{
$t
(
'
重置
'
)
}}
</el-button>
...
@@ -107,6 +115,13 @@
...
@@ -107,6 +115,13 @@
<el-table-column
:label=
"$t('状态')"
align=
"center"
prop=
"shipmentStatusText"
/>
<el-table-column
:label=
"$t('状态')"
align=
"center"
prop=
"shipmentStatusText"
/>
<el-table-column
:label=
"$t('提单状态')"
align=
"center"
prop=
"ladingBillStatus"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
ladingBillStatusData
[
scope
.
row
.
ladingBillStatus
]
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('日期')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<el-table-column
:label=
"$t('日期')"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span>
{{
new
Date
(
scope
.
row
.
createTime
).
format
(
'
yyyy-MM-dd hh:mm:ss
'
)
}}
</span>
<span>
{{
new
Date
(
scope
.
row
.
createTime
).
format
(
'
yyyy-MM-dd hh:mm:ss
'
)
}}
</span>
...
@@ -268,6 +283,11 @@ export default {
...
@@ -268,6 +283,11 @@ export default {
// 通知列表
// 通知列表
noticeList
:
[],
noticeList
:
[],
allUsers
:
[],
allUsers
:
[],
ladingBillStatusData
:
[
this
.
$t
(
"
未完成
"
),
this
.
$t
(
"
部分完成
"
),
this
.
$t
(
"
已完成
"
),
],
}
;
}
;
}
,
}
,
computed
:
{
computed
:
{
...
...
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