Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
524cf09e 1 parent a94fa6ae

页面跳转状态修正，bug修复，输入校验修复

Inline Side-by-side
Showing 5 changed files with 80 additions and 49 deletions
......@@ -80,6 +80,8 @@ export default {
})
},
close() {
this.routeList = []
this.submitData = []
this.$emit('close')
},
drag(val) {
......@@ -94,4 +96,5 @@ export default {
</script>
<style lang="scss" scoped>
</style>
\ No newline at end of file
......
......@@ -760,15 +760,15 @@ 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.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 => {
......@@ -807,7 +807,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
......@@ -858,39 +865,45 @@ export default {
},
//保存
submit(val) {
this.loading = true
let routeArr = []
let data = this.setDataHandle(this.infoForm.list[val])
this.routeList.forEach((item, idx) => {
routeArr.push(item.route)
})
data.routeSpecifyDateSeq = routeArr.join(';')
data.ruleDate = this.infoForm.fltDate
this.infoForm.list[val].routePriority = this.routeList[val].routePriority
if (this.infoForm.route != null && this.infoForm.route != '') {
this.routeList.forEach(item => {
if (item.route == this.infoForm.route) {
data.routePriority = item.routePriority
}
})
data.flightRoute = this.infoForm.route
let data = this.setDataHandle(JSON.parse(JSON.stringify(this.infoForm.list[val])))
if (new Number(data.minNumOfPieces) > new Number(data.maxNumOfPieces)) {
this.msgWarning('件数前区间不能大于后区间')
} else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
this.msgWarning('重量前区间不能大于后区间')
} else {
data.flightRoute = this.routeList[val].route
data.routePriority = this.routeList[val].routePriority
}
updateOrAddFlight(data).then(res => {
this.loading = false
if (res.code === 200) {
this.fltNoDisabled = true
this.$forceUpdate()
this.msgSuccess('保存成功！')
this.infoForm.list[val] = this.dataHandle(res.data)
this.loading = true
this.routeList.forEach((item, idx) => {
routeArr.push(item.route)
})
data.routeSpecifyDateSeq = routeArr.join(';')
data.ruleDate = this.infoForm.fltDate
this.infoForm.list[val].routePriority = this.routeList[val].routePriority
if (this.infoForm.route != null && this.infoForm.route != '') {
this.routeList.forEach(item => {
if (item.route == this.infoForm.route) {
data.routePriority = item.routePriority
}
})
data.flightRoute = this.infoForm.route
} else {
this.msgWarning(res.msg)
data.flightRoute = this.routeList[val].route
data.routePriority = this.routeList[val].routePriority
}
}).catch(err => {
console.log(err)
})
updateOrAddFlight(data).then(res => {
this.loading = false
if (res.code === 200) {
this.fltNoDisabled = true
this.$forceUpdate()
this.msgSuccess('保存成功！')
this.infoForm.list[val] = this.dataHandle(res.data)
} else {
this.msgWarning(res.msg)
}
}).catch(err => {
console.log(err)
})
}
},
//删除
del(val) {
......
......@@ -32,7 +32,7 @@
</el-form-item>
</el-form>
<Tables ref="newTables" ductName="flightRand" :data="sourceFlightRulesList" :headerData="tableHeaders['flightRand']"
:order="true" :totalCount="total" :loading="loading" :limitSize="queryParams.limit"
:order="true" :showOverflowTooltip="false" :totalCount="total" :loading="loading" :limitSize="queryParams.limit"
:limitStart="queryParams.start" :page="queryParams.pageNum" :pageSizes="[20]" :height="tableHeight"
@currentChange="currentChange">
<template slot="optionColumn">
......@@ -66,7 +66,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit"
@click="handleClick(scope.row.actualFlight, 'detail')">查看配置维度</el-button>
@click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate)">查看配置维度</el-button>
</template>
</el-table-column>
</el-table>
......@@ -115,7 +115,8 @@
</el-col>
<el-col :span="24">
<el-form-item label="配载航班" prop="flightRank">
<el-input type="textarea" v-model="form.flightRank" :rows="4"></el-input>
<el-input type="textarea" v-model="flightRank" rows="4" maxlength="255">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -217,6 +218,7 @@ export default {
dayOfWeek: [],
// 表单参数
form: {
flightRank: null,
dayOfWeek: [],
},
// 表单校验
......@@ -264,13 +266,14 @@ export default {
},
methods: {
//跳转到查看，修改页面
handleClick(flightiId, handle) {
handleClick(fltNo, handle, fltDate) {
this.openFlightDate = false;
this.$router.push({
name: "FlightAllocConfigInfo",
params: {
handle: handle,
id: flightiId,
fltNo: fltNo,
fltDate: fltDate
},
});
},
......@@ -438,7 +441,7 @@ export default {
this.queryParams.start = val.start;
this.queryParams.pageNum = val.page;
this.findSourceFlightRules();
}
},
},
computed: {
sourceFlightNo: {
......@@ -449,8 +452,20 @@ export default {
this.queryParams.sourceFlightNo = this.upCase(val);
},
},
flightRank: {
get: function () {
return this.form.flightRank;
},
set: function (val) {
const reg = /^([a-zA-Z0-9\+\-]{0,20}(\;[a-zA-Z0-9\+\-]{0,20})*)$/
if (reg.test(val)) {
this.$set(this.form, 'flightRank', val)
}
}
},
},
};
</script>
<style>
</style>
......
......@@ -49,7 +49,7 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="warning" :disabled="tableData.length == 0" v-hasPermi="['base:caExport:export']"
@click="xlse()" :loading="downLoadingTip.downloading" icon="el-icon-download" size="mini">{{
downLoadingTip.downloading ? downLoadingTip.tip : "导出"
downLoadingTip.downloading ? downLoadingTip.tip : "导出"
}}</el-button>
</div>
</el-form>
......@@ -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" />
......
......@@ -554,10 +554,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
}
......