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
ec9cb7ce
Commit
ec9cb7ce
authored
Jul 26, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自编号报表的bug,还没改完
parent
0d51c7fb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
selfNoReport.vue
src/views/ecw/financial/selfNoReport.vue
+8
-4
selfNoReportDetail.vue
src/views/ecw/financial/selfNoReportDetail.vue
+8
-2
No files found.
src/views/ecw/financial/selfNoReport.vue
View file @
ec9cb7ce
...
...
@@ -22,8 +22,8 @@
/>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('目的国')"
>
<el-select
v-model=
"queryParams.destCountryId"
:placeholder=
"$t('请选择')"
clearable
filterable
>
<el-form-item
:label=
"$t('目的国')"
:rules=
"
{required: true}"
>
<el-select
v-model=
"queryParams.destCountryId"
:placeholder=
"$t('请选择')"
filterable
default-first-option
>
<el-option
v-for=
"item in countryList"
:key=
"item.id"
...
...
@@ -33,7 +33,7 @@
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('目的仓')"
>
<el-select
v-model=
"queryParams.destWarehouseId"
:placeholder=
"
$t('请选择
')"
clearable
>
<el-select
v-model=
"queryParams.destWarehouseId"
:placeholder=
"
queryParams.destCountryId ? $t('请选择') : $t('请先选择目的国
')"
clearable
>
<el-option
v-for=
"item in importWarehouseList"
:key=
"item.id"
...
...
@@ -169,7 +169,11 @@ export default {
return
this
.
warehouseList
.
filter
(
item
=>
+
item
.
tradeType
===
2
||
+
item
.
tradeType
===
3
)
},
importWarehouseList
(){
return
this
.
warehouseList
.
filter
(
item
=>
+
item
.
tradeType
===
1
||
+
item
.
tradeType
===
3
)
// 目的仓根据选择的目的国过滤
if
(
!
this
.
queryParams
.
destCountryId
)
return
[]
return
this
.
warehouseList
.
filter
(
item
=>
{
return
this
.
queryParams
.
destCountryId
===
item
.
guojia
&&
(
+
item
.
tradeType
===
1
||
+
item
.
tradeType
===
3
)
})
},
},
methods
:
{
...
...
src/views/ecw/financial/selfNoReportDetail.vue
View file @
ec9cb7ce
...
...
@@ -2,6 +2,9 @@
<div
class=
"app-container"
>
<!-- 搜索 -->
<el-card>
<div
slot=
"header"
>
<div
class=
"card-title"
>
{{
$route
.
query
.
containerNumber
}}
-
{{
$t
(
'
订单费用报表
'
)
}}
</div>
</div>
<el-form
:model=
"queryParams"
ref=
"queryForm"
...
...
@@ -92,8 +95,11 @@
</el-table-column>
<el-table-column
:label=
"$t('是否重泡货')"
>
<
template
slot-scope=
"{row}"
>
<el-tooltip
v-if=
"row.orderType != 1"
effect=
"dark"
content=
"111"
placement=
"top-start"
>
<!--1 普货 2 重货 3 泡货-->
<dict-tag
:type=
"DICT_TYPE.ECW_YESNO"
:value=
"row.itemType != 1 ? '1' : '0'"
></dict-tag>
<span>
{{
$t
(
'
是
'
)
}}
</span>
</el-tooltip>
<span
v-else
>
{{
$t
(
'
否
'
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('收费数据')"
>
...
...
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