Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
imac-vue
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Elements-SY
2023-10-17 21:43:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
bb4d92487327b7db88a08c43d226c1fb54962aff
bb4d9248
1 parent
89f65666
modify
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
43 additions
and
28 deletions
src/components/YlTable/index.vue
src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
src/views/allocationConfig/flightAllocConfig/mixins/index.js
src/views/et86Config/errorInfo/index.vue
src/views/et86Config/errorInfo/tableConfig.js
src/views/et86Config/et86HsCodeBlack/index.vue
src/views/et86Config/et86HsCodeBlack/tableConfig.js
src/views/et86Config/et86RuleConfig/edit/index.vue
src/views/et86Config/et86RuleConfig/edit/tableConfig.js
src/views/et86Config/et86RuleConfig/index.vue
src/views/et86Config/et86RuleConfig/tableConfig.js
src/views/et86Config/et86ShipmentDesc/index.vue
src/views/et86Config/et86ShipmentDesc/tableConfig.js
src/components/YlTable/index.vue
View file @
bb4d924
...
...
@@ -49,7 +49,7 @@
:max-height="attrs.maxHeight"
:empty-text="emptyText"
v-bind="attrs"
v-loading="
loadingTable
"
v-loading="
tableLoading
"
:data="tableData"
@selection-change="selectionChange"
ref="tableRef"
...
...
@@ -118,7 +118,7 @@ export default {
type: String,
default: "暂无数据",
},
loadingTable
: {
tableLoading
: {
type: Boolean,
default: false,
},
...
...
src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
View file @
bb4d924
<template>
<div ref="barEcharts" class="route-info-container">
<div ref="barEcharts" class="route-info-container"
v-loading="pageLoading"
>
<!-- 航线设置规则信息查询条件 -->
<el-row style="padding: 0 50px">
<el-col>
...
...
@@ -69,6 +69,7 @@ export default {
mixins: [indexMixins],
data() {
return {
pageLoading: false,
loading: false, // 折叠面板
dragOptions: {
// 航线优先级拖拽配置
...
...
src/views/allocationConfig/flightAllocConfig/mixins/index.js
View file @
bb4d924
...
...
@@ -210,6 +210,7 @@ export default {
// 【接口调用和数据去重整合】普通级别
noDateLevelRoute
(
parmas
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
pageLoading
=
true
;
findDestinationFltRuleByFlightNo
(
parmas
)
.
then
((
res
)
=>
{
const
{
code
,
data
,
msg
}
=
res
;
...
...
@@ -248,12 +249,15 @@ export default {
mergeNoDateRouteInfo
,
});
})
.
catch
(()
=>
{});
.
catch
(()
=>
{
this
.
pageLoading
=
false
;
});
});
},
// 【接口调用和数据去重整合】日期级别
dateLevelRoute
(
parmas
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
this
.
pageLoading
=
true
;
findDestinationFltRuleByFlightNo
(
parmas
)
.
then
((
res
)
=>
{
const
{
code
,
data
,
msg
}
=
res
;
...
...
@@ -302,6 +306,7 @@ export default {
},
// 根据航班号ID查看航班航线配置详情
getFindByFlightId
(
parmas
)
{
this
.
pageLoading
=
true
;
findByFlightId
(
parmas
)
.
then
((
res
)
=>
{
const
{
code
,
data
,
msg
}
=
res
;
...
...
@@ -348,8 +353,11 @@ export default {
);
});
this
.
routesInfo
=
mergeRouteInfo
;
// 航班航线配置信息列表
this
.
pageLoading
=
false
;
})
.
catch
(()
=>
{});
.
catch
(()
=>
{
this
.
pageLoading
=
false
;
});
},
// 拿到【接口调用和数据去重整合】的数据做数据页面显示处理:非日期级别
noDateLevelData
(
noDateParmas
)
{
...
...
@@ -375,6 +383,7 @@ export default {
);
});
this
.
routesInfo
=
mergeNoDateRouteInfo
;
// 航班航线配置信息列表
this
.
pageLoading
=
false
;
}
);
},
...
...
@@ -411,6 +420,7 @@ export default {
if
(
this
.
$route
.
query
.
flightKindName
==
"Purple Tail"
)
{
this
.
showFlightKind
(
dateDataLists
);
}
this
.
pageLoading
=
false
;
}
else
{
// 当前航线有缺省的航线配置
// 航班航线有规则配置的
...
...
@@ -492,6 +502,7 @@ export default {
);
});
this
.
routesInfo
=
result
;
this
.
pageLoading
=
false
;
}
else
{
// 日期级别和非日期级别都没有配置信息的时候,
// 从数据整合的里面取一个对应的航线数据作为回显暂无数据处理。
...
...
@@ -505,6 +516,7 @@ export default {
);
});
this
.
routesInfo
=
noDateRouteInfo
;
this
.
pageLoading
=
false
;
}
}
else
{
// 日期级别和航班种类为Purple Tail的时候
...
...
@@ -575,9 +587,11 @@ export default {
);
});
this
.
routesInfo
=
result
;
this
.
pageLoading
=
false
;
}
else
{
this
.
queryForm
=
this
.
$route
.
query
;
// 获取跳转过来的参数
this
.
routesInfo
=
dateList
;
this
.
pageLoading
=
false
;
}
}
},
...
...
src/views/et86Config/errorInfo/index.vue
View file @
bb4d924
...
...
@@ -2,7 +2,7 @@
<div class="form-header container">
<yl-table
:attrs="tableAttr"
:
loadingTable="tableAttr.loadingTable
"
:
tableLoading="tableAttr.tableLoading
"
:columns="columns"
:tableData="tableData"
:pageConfig="pageConfig"
...
...
src/views/et86Config/errorInfo/tableConfig.js
View file @
bb4d924
export
const
tableAttr
=
{
border
:
true
,
loadingTable
:
false
,
tableLoading
:
false
,
isDragSort
:
false
,
// 拖拽tableData数据一定要加id字段
maxHeight
:
800
,
btnCofig
:
{
...
...
src/views/et86Config/et86HsCodeBlack/index.vue
View file @
bb4d924
...
...
@@ -14,7 +14,7 @@
<yl-table
ref="ylTable"
:attrs="tableAttr"
:
loadingTable="tableAttr.loadingTable
"
:
tableLoading="tableAttr.tableLoading
"
:columns="columns"
:tableData="tableData"
:pageConfig="pageConfig"
...
...
@@ -99,10 +99,10 @@ export default {
limitSize: size,
...this.queryForm,
};
this.tableAttr.
loadingTable
= true;
this.tableAttr.
tableLoading
= true;
findHsCodeList(params)
.then((res) => {
this.tableAttr.
loadingTable
= false;
this.tableAttr.
tableLoading
= false;
const { code, data } = res;
if (code == 200) {
this.tableData = data.list;
...
...
src/views/et86Config/et86HsCodeBlack/tableConfig.js
View file @
bb4d924
export
const
tableAttr
=
{
border
:
true
,
loadingTable
:
false
,
tableLoading
:
false
,
isDragSort
:
false
,
// 拖拽tableData数据一定要加id字段
maxHeight
:
0
,
btnCofig
:
{
...
...
src/views/et86Config/et86RuleConfig/edit/index.vue
View file @
bb4d924
<template>
<div class="form-header" v-loading="
l
oading">
<div class="form-header" v-loading="
pageL
oading">
<el-row style="padding-bottom: 20px">
<el-col>
<el-divider content-position="left">ET86配舱航班顺位</el-divider>
...
...
@@ -26,7 +26,7 @@
ref="ylTable"
emptyText="请添加配舱航班"
:attrs="tableAttr"
:
loadingTable="tableAttr.loadingTable
"
:
tableLoading="tableAttr.tableLoading
"
:tableData="tableData"
:pageConfig="{
isPagination: false,
...
...
@@ -445,7 +445,7 @@ export default {
mixins: [indexMixins, inputBlurValidate],
data() {
return {
l
oading: false,
pageL
oading: false,
queryForm: {
// ET86配舱航班顺位维度
// 表单参数
...
...
@@ -536,10 +536,10 @@ export default {
},
// ET86详情
queryFindEtesRuleById({ id, status, name }) {
this.
l
oading = true;
this.
pageL
oading = true;
findEtesRuleById({ id: id, status: status })
.then((res) => {
this.
l
oading = false;
this.
pageL
oading = false;
const { code, data, msg } = res;
if (code == 200) {
data.list.flightRankDtoList.map((item) => {
...
...
@@ -593,7 +593,7 @@ export default {
}
})
.catch(() => {
this.
l
oading = false;
this.
pageL
oading = false;
});
},
// ET86编辑
...
...
@@ -627,11 +627,11 @@ export default {
},
// 航线查询
getQueryRouteByFltNo(item) {
this.tableAttr.
loadingTable
= true;
this.tableAttr.
tableLoading
= true;
this.tableData[this.currentIndex].flightRoute;
queryRouteByFltNo(item)
.then((res) => {
this.tableAttr.
loadingTable
= false;
this.tableAttr.
tableLoading
= false;
if (res.code == 200) {
const list = res.data.list;
if (list.length) {
...
...
src/views/et86Config/et86RuleConfig/edit/tableConfig.js
View file @
bb4d924
export
const
tableAttr
=
{
border
:
true
,
loadingTable
:
false
,
tableLoading
:
false
,
isDragSort
:
true
,
// 拖拽tableData数据一定要加id字段
maxHeight
:
300
,
btnCofig
:
{
...
...
src/views/et86Config/et86RuleConfig/index.vue
View file @
bb4d924
...
...
@@ -15,7 +15,7 @@
<yl-table
ref="ylTable"
:attrs="tableAttr"
:
loadingTable="tableAttr.loadingTable
"
:
tableLoading="tableAttr.tableLoading
"
:columns="columns"
:tableData="tableData"
:pageConfig="pageConfig"
...
...
@@ -110,10 +110,10 @@ export default {
if (this.queryForm.status == "有效") {
params.status = "1";
}
this.tableAttr.
loadingTable
= true;
this.tableAttr.
tableLoading
= true;
findAllEtesRules(params)
.then((res) => {
this.tableAttr.
loadingTable
= false;
this.tableAttr.
tableLoading
= false;
const { code, data } = res;
if (code == 200) {
const valid = data.list.filter((item) => item.status == "1"); // 有效
...
...
src/views/et86Config/et86RuleConfig/tableConfig.js
View file @
bb4d924
...
...
@@ -4,7 +4,7 @@ const state = {
};
export
const
tableAttr
=
{
border
:
true
,
loadingTable
:
false
,
tableLoading
:
false
,
isDragSort
:
false
,
// 拖拽tableData数据一定要加id字段
maxHeight
:
0
,
// defaultSort: { prop: "updateTime", order: "descending" },
...
...
src/views/et86Config/et86ShipmentDesc/index.vue
View file @
bb4d924
...
...
@@ -14,7 +14,7 @@
<yl-table
ref="ylTable"
:attrs="tableAttr"
:
loadingTable="tableAttr.loadingTable
"
:
tableLoading="tableAttr.tableLoading
"
:columns="columns"
:tableData="tableData"
:pageConfig="pageConfig"
...
...
@@ -101,10 +101,10 @@ export default {
limitSize: size,
...this.queryForm,
};
this.tableAttr.
loadingTable
= true;
this.tableAttr.
tableLoading
= true;
findShipmentDescList(params)
.then((res) => {
this.tableAttr.
loadingTable
= false;
this.tableAttr.
tableLoading
= false;
const { code, data } = res;
if (code == 200) {
this.tableData = data.list;
...
...
src/views/et86Config/et86ShipmentDesc/tableConfig.js
View file @
bb4d924
export
const
tableAttr
=
{
border
:
true
,
loadingTable
:
false
,
tableLoading
:
false
,
isDragSort
:
false
,
// 拖拽tableData数据一定要加id字段
maxHeight
:
300
,
btnCofig
:
{
...
...
Please
register
or
login
to post a comment