Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
0b4cefbc 1 parent cf9f8b21

错误提示页面修改，输入验证修正，页面状态修正

Inline Side-by-side
Showing 11 changed files with 69 additions and 112 deletions
......@@ -84,6 +84,12 @@ export const constantRoutes = [
name: 'weatherTable',
meta: { title: '流水表', icon: 'user' }
},
{
path: '/upDateResult->:from',
component: (resolve) => require(['@/views/preMdeConfig/upDateResult'], resolve),
name: 'UpDateResult',
meta: { title: '导入信息', icon: 'user' }
}
]
},
]
......
......@@ -23,7 +23,8 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6" v-if="infoForm.route != null">
<el-col :span="6"
v-if="infoForm.route != null && routeSatus != 'flightInformationMaintenancePurple Tail'">
<el-form-item label="航线">
<el-input v-model.trim="infoForm.route" @change="getRoutes" disabled>
</el-input>
......@@ -576,7 +577,9 @@ export default {
this.getRouteDimension({ fltNo: this.infoForm.fltNo, fltDate: this.infoForm.fltDate, route: route ? route : '', status: this.$route.params.status })
}
if (this.$route.params.handle == 'add') {
this.getRoutes(this.infoForm.fltNo)
if (this.infoForm.fltNo && this.infoForm.fltNo != null && this.infoForm.fltNo != '') {
this.getRoutes(this.infoForm.fltNo)
}
}
},
deep: true
......@@ -761,15 +764,14 @@ export default {
})
} 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,
// })
// })
this.routeList.forEach((route) => {
this.infoForm.list.push({
purposeOfFlightNo: this.infoForm.fltNo,
ruleDate: this.infoForm.fltDate,
flightRoute: route.route,
routePriority: route.routePriority,
})
})
}
}
}).catch(err => {
......@@ -779,6 +781,7 @@ export default {
} else {
//航线为空，提示未找到维度数据
if (this.routeSatus == 'flightInformationMaintenancePurple Tail') {
console.log(this.infoForm.fltNo, this.infoForm.route, this.$route.params.status)
findDestinationFltRuleByFlightNo({
purposeOfFlightNo: this.infoForm.fltNo,
flightRoute: this.infoForm.route,
......@@ -808,7 +811,14 @@ export default {
}
})
} else {
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
......@@ -861,9 +871,9 @@ export default {
submit(val) {
let routeArr = []
let data = this.setDataHandle(JSON.parse(JSON.stringify(this.infoForm.list[val])))
if (data.minNumOfPieces > data.maxNumOfPieces) {
if (new Number(data.minNumOfPieces) > new Number(data.maxNumOfPieces)) {
this.msgWarning('件数前区间不能大于后区间')
} else if (data.minWeight > data.maxWeight) {
} else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
this.msgWarning('重量前区间不能大于后区间')
} else {
this.loading = true
......
......@@ -457,7 +457,7 @@ export default {
return this.form.flightRank;
},
set: function (val) {
const reg = /^([a-zA-Z0-9]{0,20}(\;[a-zA-Z0-9]{0,20})*)$/
const reg = /^([a-zA-Z0-9\+\-]{0,20}(\;[a-zA-Z0-9\+\-]{0,20})*)$/
if (reg.test(val)) {
this.$set(this.form, 'flightRank', val)
}
......
......@@ -58,7 +58,7 @@
<el-table-column label="申报类别" align="center" prop="typeName" />
<el-table-column label="件数" align="center" prop="qty" width="70" />
<el-table-column label="实际重量" align="center" prop="actualWeight" width="100" />
<el-table-column :show-overflow-tooltip="true" label="品牌描述" align="center" prop="nameDescription" />
<el-table-column :show-overflow-tooltip="true" label="品名描述" align="center" prop="nameDescription" />
<el-table-column label="航班日期" align="center" prop="fltDate" />
<el-table-column label="航班号" align="center" prop="fltNo" width="100" />
<el-table-column label="航班路线" align="center" prop="route" />
......
......@@ -569,10 +569,10 @@ export default {
kindChange(val) {
this.selectOption.flightKindlist.forEach(item => {
if (item.id == val) {
if (item.chineseName == 'White Tail') {
if (item.chineseName.indexOf('White') >= 0) {
this.form.route = ''
this.routeMultiple = false
} else if (item.chineseName == 'Purple Tail') {
} else if (item.chineseName.indexOf('Purple') >= 0) {
this.form.route = []
this.routeMultiple = true
}
......
<template>
<div>
<el-form class="form-header" ref="selectForm" label-position="right" label-width="auto"
style="margin-bottom:10px" @submit.native.prevent size="small">
<el-form class="form-header" ref="goodsStationForm" :model="selectionData" label-position="right"
label-width="auto" size="small" @submit.native.prevent>
<el-row>
<el-col :span="6">
<el-form-item label="货站名称">
<el-input v-model="selectionData.goodsStation" placeholder="请输入货站名称" maxlength="50" clearable />
<el-input class="formItem" v-model="selectionData.goodsStation" placeholder="请输入货站名称"
maxlength="50" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="品名">
<el-input v-model="selectionData.goodsName" placeholder="请输入货站名称" maxlength="50" clearable />
<el-input class="formItem" v-model="selectionData.goodsName" placeholder="请输入货站名称"
maxlength="50" clearable />
</el-form-item>
</el-col>
</el-row>
......@@ -60,13 +62,11 @@
import { downLoadTemplate } from "@/api/flightInfoImport";
import { importGoods, batchDeleteGoods, searchGoods } from "@/api/goodsStation"
import Dialog from './dialog.vue'
import UpDateResult from './upDateResult.vue'
export default {
name: 'GoodsStation',
components: {
Dialog,
UpDateResult
},
data() {
return {
......@@ -200,12 +200,12 @@ export default {
confirmButtonText: "确定",
type: "warning",
});
} else if (res.code === 201) {
this.$message.warning(res.msg);
this.errorData = res.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
} else {
if (this.errorData.length > 0) {
this.$message.warning(res.msg);
this.errorData = res.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
}
this.$message.warning(res.msg);
}
} else {
this.$message.success(res.msg);
......
<template>
<div>
<el-dialog title="新 增" :visible.sync="dialogVisible" width="50%" top="1vh" :close-on-click-modal="false"
:show-close="false" append-to-body center>
<el-table ref="filterTable" class="mt20" :data="resultData" size="small" border>
<el-table-column label="行号" prop="line" width="50" align="center">
</el-table-column>
<el-table-column label="错误信息" prop="errorMessage" width="200">
<template slot-scope="scope">
<div v-for="(m, key) in scope.row.errorMessage" :key="key">
{{ m }}
</div>
</template>
</el-table-column>
<el-table-column v-if="resultData.length == 0"></el-table-column>
<el-table-column v-for="(value, key) in this.resultData[0]" :key="key"
v-if="key != 'errorMessage' && key != 'line'" header-align="center" align="center" :label="key"
:prop="key"></el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="close">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
name: 'UpDateResult',
props: {
dialogVisible: {
type: Boolean,
default: false
},
resultData: {
type: Array,
default: null
}
},
data() {
return {
}
},
wactch: {
dialogVisible(val) {
if (val) {
}
}
},
methods: {
close() {
this.$emit('close')
}
}
}
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
<template>
<div>
<el-form class="form-header" ref="dictForm" label-position="right" label-width="auto" style="margin-bottom:10px"
@submit.native.prevent size="small">
<el-form class="form-header" ref="goodsStationFlightForm" :model="selectionData" label-position="right"
label-width="auto" size="small" style="margin-bottom:10px" @submit.native.prevent>
<el-row>
<el-col :span="6">
<el-form-item label="货站名称">
<el-input v-model="selectionData.goodsStation" placeholder="请输入货站名称" maxlength="50" clearable />
<el-input class="formItem" v-model="selectionData.goodsStation" placeholder="请输入货站名称"
maxlength="50" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班号">
<el-input v-model="selectionData.fltNo" placeholder="请输入航班号" maxlength="20" clearable />
<el-input class="formItem" v-model="selectionData.fltNo" placeholder="请输入航班号" maxlength="20"
clearable />
</el-form-item>
</el-col>
</el-row>
......
......@@ -153,12 +153,12 @@ export default {
confirmButtonText: "确定",
type: "warning",
});
} else if (res.code === 201) {
this.msgWarning(res.data.msg);
this.errorData = res.data.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } })
} else {
this.msgWarning(res.data.msg);
if (res.data.data && res.data.data.length > 0) {
this.errorData = res.data.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightToArea' } })
}
}
} else {
this.msgSuccess("导入成功");
......
<template>
<div>
<el-button class="ml20 mb20" size="small" icon="el-icon-back" @click="close">返 回</el-button>
<el-table ref="filterTable" class="mt20" :data="tableData" size="small" border>
<el-table-column label="行号" prop="line" width="50" align="center">
</el-table-column>
<el-table-column label="错误信息" prop="errorMessage" width="200">
<!-- <el-table-column label="行号" prop="line" width="50" align="center">
</el-table-column> -->
<el-table-column label="序号" type="index" width="70" align="center" />
<el-table-column label="错误信息" prop="errorMessage">
<template slot-scope="scope">
<div v-for="(m, key) in scope.row.errorMessage" :key="key">
{{scope.row}}
<!-- <div v-for="(m, key) in scope.row.errorMessage" :key="key">
{{ m }}
</div>
</div> -->
</template>
</el-table-column>
<el-table-column v-if="tableData.length == 0"></el-table-column>
<el-table-column v-for="(value, key) in this.tableData[0]" :key="key"
v-if="key != 'errorMessage' && key != 'line'" header-align="center" align="center" :label="key"
:prop="key"></el-table-column>
<!-- <el-table-column v-if="tableData.length == 0"></el-table-column>
<el-table-column v-for="(value, key) in tableData" :key="key" v-if="key != 'errorMessage' && key != 'line'"
header-align="center" align="center" :label="key" :prop="key"></el-table-column> -->
</el-table>
</div>
......
......@@ -159,12 +159,12 @@ export default {
confirmButtonText: "确定",
type: "warning",
});
} else if (res.code === 201) {
this.msgWarning(res.data.msg);
this.errorData = res.data.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
} else {
this.msgWarning(res.data.msg);
if (res.data.data && res.data.data.length > 0) {
this.errorData = res.data.data;
this.$router.push({ name: 'UpDateResult', params: { data: this.errorData, from: 'FlightInformationImport' } })
}
}
} else {
this.msgSuccess("导入成功");
......