Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
f3585e4f 1 parent 38a6838a

样式修改，提示语增加

Inline Side-by-side
Showing 4 changed files with 174 additions and 169 deletions
......@@ -142,10 +142,10 @@
</el-col>
<el-col :span="24">
<el-form-item label="Handling Code">
<el-empty description="暂无数据" v-if="
<!-- <el-empty description="暂无数据" v-if="
!selectData.HandlingCode || selectData.HandlingCode.length == 0
"></el-empty>
<el-checkbox-group v-model="handingCodes" v-else>
"></el-empty> -->
<el-checkbox-group v-model="handingCodes">
<el-row>
<el-col :span="2" v-for="item in selectData.HandlingCode" :key="item.id">
<el-checkbox :label="item.chineseName" v-model="item.chineseName">
......@@ -158,10 +158,10 @@
</el-col>
<el-col :span="24">
<el-form-item label="Sub Category">
<el-empty description="暂无数据" v-if="
<!-- <el-empty description="暂无数据" v-if="
!selectData.SubCategory || selectData.SubCategory.length == 0
"></el-empty>
<el-checkbox-group v-model="subCategorys" v-else>
"></el-empty> -->
<el-checkbox-group v-model="subCategorys">
<el-row>
<el-col :span="2" v-for="item in selectData.SubCategory" :key="item.id">
<el-checkbox :label="item.chineseName" v-model="item.chineseName">
......@@ -178,12 +178,12 @@
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
}}</el-button>
<el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
:disabled="tableData.length <= 0">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
}}</el-button>
<el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit"
:disabled="tableSelection.length <= 0">添加到航班</el-button>
......
......@@ -69,20 +69,20 @@ export default {
overweight: false,
},
cargoHeader: [
{ name: "口岸代码", value: "portName" },
{ name: "运单号", value: "waybillNo" },
{ name: "货物状态", value: "statusName" },
{ name: "站点", value: "siteName" },
{ name: "申报类型", value: "typeName" },
{ name: "URSA", value: "ursa" },
{ name: "实际重量", value: "actualWeight" },
{ name: "件数", value: "qty" },
{ name: "ACCS原航班号", value: "fltNoAccs" },
{ name: "ACCS原航班日期", value: "fltDateAccs" },
{ name: "品名描述", value: "nameDescription" },
{ name: "是否自动", value: "cargoRulesStatus" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
{ name: "口岸代码", value: "portName", width: "" },
{ name: "运单号", value: "waybillNo", width: "" },
{ name: "货物状态", value: "statusName" , width: ""},
{ name: "站点", value: "siteName", width: "" },
{ name: "申报类型", value: "typeName", width: "" },
{ name: "URSA", value: "ursa", width: "" },
{ name: "实际重量", value: "actualWeight", width: "" },
{ name: "件数", value: "qty", width: "" },
{ name: "ACCS原航班号", value: "fltNoAccs", width: "120" },
{ name: "ACCS原航班日期", value: "fltDateAccs", width: "130" },
{ name: "品名描述", value: "nameDescription" , width: ""},
{ name: "是否自动", value: "cargoRulesStatus" , width: ""},
{ name: "创建人", value: "createUserName", width: "" },
{ name: "创建时间", value: "createTime", width: "" },
],
routeList: [],
rules: {
......
......@@ -640,18 +640,43 @@ export default {
if (this.$route.params.handle != 'add') {
findDestinationFltRuleByFlightNo(obj).then(res => {
if (res.code === 200) {
this.routeList = res.data.routeList
if (res.data.list.length > 0) {
//请求到数据
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
//航线不为空，对应到这条航线下的这条维度(直接处理插入数据)
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
//如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度
res.data.list.forEach(item => {
this.infoForm.list.push(this.dataHandle(item))
})
if (res.data.routeList.length <= 0) {
this.msgWarning('未查询到航线信息！')
} else {
this.routeList = res.data.routeList
if (res.data.list.length > 0) {
//请求到数据
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
//航线不为空，对应到这条航线下的这条维度(直接处理插入数据)
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
//如果是从航班维护界面跳转且航班类型为White Tail则直接显示当前航线维度
res.data.list.forEach(item => {
this.infoForm.list.push(this.dataHandle(item))
})
} else {
//航班类型为Purple Tail则显示所有航线维度
this.routeList.forEach(route => {
let routeStatus = 1
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
//航线对应插入数据
routeStatus = 2
this.infoForm.list.push(this.dataHandle(item))
}
})
if (routeStatus == 1) {
//否则插入占位基础数据
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
} else {
//航班类型为Purple Tail则显示所有航线维度
//航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
this.routeList.forEach(route => {
let routeStatus = 1
res.data.list.forEach(item => {
......@@ -673,151 +698,130 @@ export default {
})
}
} else {
//航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
this.routeList.forEach(route => {
let routeStatus = 1
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
//航线对应插入数据
routeStatus = 2
this.infoForm.list.push(this.dataHandle(item))
}
})
if (routeStatus == 1) {
//否则插入占位基础数据
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
} else {
//未请求到数据
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
//航线不为空，获取该航线下无日期通用维度设置
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
status: this.$route.params.status
}).then(response => {
if (response.data.list.length > 0) {
//查询到通用维度，去除id status，航线赋值，航线优先级赋值
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
//航班类型White Tail只展示当前航线维度
response.data.list.forEach(item => {
item.id = undefined
item.status = undefined
item.flightRoute = this.infoForm.route
//未请求到数据
if (this.infoForm.route != null && this.infoForm.route != '' && this.infoForm.route != ' ') {
//航线不为空，获取该航线下无日期通用维度设置
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
status: this.$route.params.status
}).then(response => {
if (response.data.list.length > 0) {
//查询到通用维度，去除id status，航线赋值，航线优先级赋值
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
//航班类型White Tail只展示当前航线维度
response.data.list.forEach(item => {
item.id = undefined
item.status = undefined
item.flightRoute = this.infoForm.route
this.routeList.forEach(route => {
if (route.route === this.infoForm.route) {
item.routePriority = route.routePriority
}
})
this.infoForm.list.push(this.dataHandle(item))
})
} else {
//航班类型Purple Tail展示全部航线维度
let routesStatus = 1
this.routeList.forEach(route => {
if (route.route === this.infoForm.route) {
item.routePriority = route.routePriority
response.data.list.forEach(item => {
if (route.route === item.flightRoute) {
routesStatus = 2
item.id = undefined
item.status = undefined
item.flightRoute = this.infoForm.route
item.routePriority = route.routePriority
this.infoForm.list.push(this.dataHandle(item))
}
})
if (routesStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
this.infoForm.list.push(this.dataHandle(item))
})
}
} else {
//航班类型Purple Tail展示全部航线维度
let routesStatus = 1
this.routeList.forEach(route => {
response.data.list.forEach(item => {
if (route.route === item.flightRoute) {
routesStatus = 2
item.id = undefined
item.status = undefined
item.flightRoute = this.infoForm.route
item.routePriority = route.routePriority
this.infoForm.list.push(this.dataHandle(item))
//未查询到,插入占位基础数据使用户新建
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
//航班类型White Tail只展示当前航线维度
this.routeList.forEach((item) => {
if (item.route === this.infoForm.route) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: this.infoForm.route,
routePriority: item.routePriority,
})
}
})
if (routesStatus == 1) {
} else {
//航班类型Purple Tail展示全部航线维度
// this.isEmpty = true
this.routeList.forEach((route) => {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
}
} else {
//未查询到,插入占位基础数据使用户新建
if (this.routeSatus == 'flightInformationMaintenanceWhite Tail') {
//航班类型White Tail只展示当前航线维度
this.routeList.forEach((item) => {
if (item.route === this.infoForm.route) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: this.infoForm.route,
routePriority: item.routePriority,
})
}
})
} else {
//航班类型Purple Tail展示全部航线维度
// this.isEmpty = true
this.routeList.forEach((route) => {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
})
}
}
}
}).catch(err => {
this.isEmpty = true
console.log(err)
})
} else {
//航线为空，提示未找到维度数据
if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
status: this.$route.params.status
}).then(response => {
if (response.data.list.length > 0) {
this.routeList.forEach(route => {
let routeStatus = 1
response.data.list.forEach(item => {
if (item.flightRoute == route.route) {
routeStatus = 2
item.id = undefined
item.status = undefined
item.routePriority = route.routePriority
this.infoForm.list.push(
this.dataHandle(item)
)
}).catch(err => {
this.isEmpty = true
console.log(err)
})
} else {
//航线为空，提示未找到维度数据
if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
status: this.$route.params.status
}).then(response => {
if (response.data.list.length > 0) {
this.routeList.forEach(route => {
let routeStatus = 1
response.data.list.forEach(item => {
if (item.flightRoute == route.route) {
routeStatus = 2
item.id = undefined
item.status = undefined
item.routePriority = route.routePriority
this.infoForm.list.push(
this.dataHandle(item)
)
}
})
if (routeStatus == 1) {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
if (routeStatus == 1) {
} else {
this.routeList.forEach((route) => {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
}
})
} else {
this.routeList.forEach((route) => {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
})
}
}).catch(err => {
this.isEmpty = true
console.log(err)
})
}
}).catch(err => {
this.isEmpty = true
console.log(err)
})
}
}
}
}
......@@ -849,6 +853,7 @@ export default {
})
})
} else {
this.msgWarning('未查询到航线信息！')
this.routeList = []
this.infoForm.list = []
}
......
......@@ -69,20 +69,20 @@ export default {
overweight: false,
},
cargoHeader: [
{ name: "口岸代码", value: "portName" },
{ name: "运单号", value: "waybillNo" },
{ name: "货物状态", value: "statusName" },
{ name: "站点", value: "siteName" },
{ name: "申报类型", value: "typeName" },
{ name: "URSA", value: "ursa" },
{ name: "实际重量", value: "actualWeight" },
{ name: "件数", value: "qty" },
{ name: "ACCS原航班号", value: "fltNoAccs" },
{ name: "ACCS原航班日期", value: "fltDateAccs" },
{ name: "品名描述", value: "nameDescription" },
{ name: "是否自动", value: "cargoRulesStatus" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
{ name: "口岸代码", value: "portName", width: "" },
{ name: "运单号", value: "waybillNo", width: "" },
{ name: "货物状态", value: "statusName" , width: ""},
{ name: "站点", value: "siteName", width: "" },
{ name: "申报类型", value: "typeName", width: "" },
{ name: "URSA", value: "ursa", width: "" },
{ name: "实际重量", value: "actualWeight", width: "" },
{ name: "件数", value: "qty", width: "" },
{ name: "ACCS原航班号", value: "fltNoAccs", width: "120" },
{ name: "ACCS原航班日期", value: "fltDateAccs", width: "130" },
{ name: "品名描述", value: "nameDescription" , width: ""},
{ name: "是否自动", value: "cargoRulesStatus" , width: ""},
{ name: "创建人", value: "createUserName", width: "" },
{ name: "创建时间", value: "createTime", width: "" },
],
routeList: [],
rules: {
......