Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
1730532197@qq.com
5463bd42 1 parent 628a5078

lwj

Inline Side-by-side
Showing 4 changed files with 202 additions and 173 deletions
import request from '@/utils/request'
// 航班信息维护查询条件
export function findFltConditionDataApi() {
return request({
url: '/FlightPreserveController/findFltConditionData',
method: 'post'
})
}
// 航班信息维护查询
export function findAllFltDataApi(data) {
return request({
url: '/FlightPreserveController/findAllFltData',
method: 'post',
data: data
})
}
......@@ -7,6 +7,7 @@ const baseURL = process.env.VUE_APP_BASE_API
// 日期格式化
export function parseTime(time, pattern) {
debugger
if (arguments.length === 0 || !time) {
return null
}
......
......@@ -236,7 +236,7 @@
},
/** 查询原航班顺位规则*/
findSourceFlightRules() {
//this.loading = true;
this.loading = true;
if (this.queryParams.pageNum > 1) {
this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit
} else {
......
......@@ -4,47 +4,47 @@
<el-row>
<el-col :span="8">
<el-form-item label="航班日期从" prop="flightDate">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期">
<el-form-item label="航班日期从" prop="fltDateStart">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="到" prop="flightDate">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期">
<el-form-item label="到" prop="fltDateEnd">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="航班号" prop="sourceFlightNo">
<el-input v-model="queryParams.sourceFlightNo" placeholder="请输入航班号" clearable size="small" />
<el-form-item label="航班号" prop="fltNo">
<el-input v-model="queryParams.fltNo" placeholder="请输入航班号" clearable size="small" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="航班类型" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
<el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
<el-form-item label="航班类型" prop="typeId">
<el-select v-model="queryParams.typeId" placeholder="请选择航班类型" clearable size="small">
<el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="航班状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
<el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
<el-form-item label="航班状态" prop="statusId">
<el-select v-model="queryParams.statusId" placeholder="请选择航班状态" clearable size="small">
<el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="航班种类" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
<el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
<el-form-item label="航班种类" prop="flightKindId">
<el-select v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable size="small">
<el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
</el-select>
</el-form-item>
</el-col>
......@@ -66,37 +66,45 @@
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple">删除
</el-button>
</el-col>
</el-row>
<el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="sourceFlightRulesList"
<el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="findAllFltDatList"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="航班日期" align="center" prop="sourceFlightNo" />
<el-table-column label="航班起飞时间" align="center" prop="flightRank" width="280" />
<el-table-column label="航班号" align="center" prop="dayOfWeek" width="180" />
<el-table-column label="航班路线" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="航班类型" align="center" prop="startDate" width="100" />
<el-table-column label="航班种类" align="center" prop="endDate" width="100" />
<el-table-column label="航班状态" align="center" prop="updateUserName" />
<el-table-column label="总重量(KG)" align="center" prop="updateTime" width="130" />
<el-table-column label="原始重量(KG)" align="center" prop="updateTime" width="130" />
<el-table-column label="总体积(cm³)" align="center" prop="updateTime" width="130" />
<el-table-column label="是否限制一票一件" align="center" prop="updateTime" width="150" />
<el-table-column label="是否需要预审" align="center" prop="updateTime" width="150" />
<el-table-column label="额外增重百分比" align="center" prop="updateTime" width="150" />
<el-table-column label="高价百分比" align="center" prop="updateTime" width="150" />
<el-table-column label="低价百分比" align="center" prop="updateTime" width="150" />
<el-table-column label="是否开启高地价" align="center" prop="updateTime" width="150" />
<el-table-column label="已配重量(KG)" align="center" prop="updateTime" width="150" />
<el-table-column label="已配体积(cm³)" align="center" prop="updateTime" width="150" />
<el-table-column label="航班优先级" align="center" prop="updateTime" width="150" />
<el-table-column label="配舱优先级" align="center" prop="updateTime" width="150" />
<el-table-column label="创建人" align="center" prop="updateTime" width="100" />
<el-table-column label="创建时间" align="center" prop="updateTime" width="100" />
<el-table-column label="最后修改人" align="center" prop="updateTime" width="100" />
<el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" />
<el-table-column label="航班日期" align="center" prop="fltDate" width="120" />
<el-table-column label="航班起飞时间" align="center" prop="takeOffTime" width="120" />
<el-table-column label="航班号" align="center" prop="fltNo" />
<el-table-column label="航班路线" align="center" prop="route" />
<el-table-column label="航班类型" align="center" prop="typeName" width="100" />
<el-table-column label="航班种类" align="center" prop="flightKindName" width="130" />
<el-table-column label="航班状态" align="center" prop="statusName" />
<el-table-column label="总重量(KG)" align="center" prop="totalWeight" width="130" />
<el-table-column label="原始重量(KG)" align="center" prop="originalWeight" width="130" />
<el-table-column label="总体积(cm³)" align="center" prop="totalVolume" width="130" />
<el-table-column label="是否限制一票一件" align="center" prop="ticketToPiece" width="150" :formatter="ticketToPieceFormat" />
<el-table-column label="是否需要预审" align="center" prop="needRequired" width="150" :formatter="needRequiredFormat" />
<el-table-column label="额外增重百分比" align="center" prop="extraWeightPercent" width="150" />
<el-table-column label="高价百分比" align="center" prop="highPriceWeightPercent" width="150" />
<el-table-column label="低价百分比" align="center" prop="lowPriceWeightPercent" width="150" />
<el-table-column label="是否开启高地价" align="center" prop="highLowPriceFlg" width="150":formatter="highLowPriceFlgFormat"/>
<el-table-column label="已配重量(KG)" align="center" prop="alloctedWeight" width="150" />
<el-table-column label="已配体积(cm³)" align="center" prop="alloctedVolume" width="150" />
<el-table-column label="航班优先级" align="center" prop="priorityName" width="150" />
<el-table-column label="配舱优先级" align="center" prop="priorityRuleName" width="150" />
<el-table-column label="创建人" align="center" prop="createUserName" width="120" />
<el-table-column label="创建时间" align="center" prop="createTime" width="155">
<template slot-scope="scope">
<span>{{ renderTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="最后修改人" align="center" prop="lastModifyUserName" width="120" />
<el-table-column label="最后修改时间" align="center" prop="lastModifyTime" width="155">
<template slot-scope="scope">
<span>{{ renderTime(scope.row.lastModifyTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
......@@ -107,27 +115,9 @@
</el-table>
<pagination v-show="total>0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
:page.sync="queryParams.pageNum" :limit.sync="queryParams.limitSize" @pagination="findAllFltData" />
<!-- 查看目的航班对话框 -->
<el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%">
<el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
<el-table-column label="原航班" align="center" prop="sourceFlightNo" />
<el-table-column label="实际配载航班" align="center" prop="actualFlight" width="280" />
<el-table-column label="航班日期" align="center" prop="flightDate" />
<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.sourceFlightNo, 'detail')">查看配置维度</el-button>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelFlightDate">返 回</el-button>
</div>
</el-dialog>
<!-- 添加或修改对话框 -->
......@@ -158,9 +148,7 @@
<el-col :span="12">
<el-form-item label="航班起飞时间" prop="sourceFlightNo">
<el-time-picker
v-model="form.startDate"
placeholder="航班起飞时间">
<el-time-picker v-model="form.startDate" placeholder="航班起飞时间">
</el-time-picker>
</el-form-item>
</el-col>
......@@ -170,104 +158,99 @@
<el-col :span="12">
<el-form-item label="航班种类" prop="startDate">
<el-select v-model="form.value" placeholder="请选择航班种类">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
<el-option v-for="item in flightKindlist" :key="item.id" :label="item.label" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班类型" prop="startDate">
<el-select v-model="form.value1" placeholder="请选择航班类型">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
<!-- <el-select v-model="form.value1" placeholder="请选择航班类型">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班状态" prop="startDate">
<el-select v-model="form.value2" placeholder="请选择航班状态">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
<!-- <el-select v-model="form.value2" placeholder="请选择航班状态">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="原始重量(KG)" prop="startDate" >
<el-input placeholder="请输入原始重量(KG)" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
<el-form-item label="原始重量(KG)" prop="startDate">
<el-input placeholder="请输入原始重量(KG)" style="width:93%" min="0"
oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
v-model="form.input"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="额外增重百分比" prop="startDate" >
<el-input placeholder="请输入额外增重百分比" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
<el-form-item label="额外增重百分比" prop="startDate">
<el-input placeholder="请输入额外增重百分比" style="width:93%" min="0"
oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
v-model="form.input"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否限制一票一件" prop="startDate" >
<el-switch
v-model="form.value4"
active-color="#13ce66"
>
<el-form-item label="是否限制一票一件" prop="startDate">
<el-switch v-model="form.value4" active-color="#13ce66">
</el-switch>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高价百分比" prop="startDate" >
<el-input placeholder="请输入高价百分比" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
<el-form-item label="高价百分比" prop="startDate">
<el-input placeholder="请输入高价百分比" style="width:93%" min="0"
oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
v-model="form.input"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低价百分比" prop="startDate" >
<el-input placeholder="请输入低价百分比" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
<el-form-item label="低价百分比" prop="startDate">
<el-input placeholder="请输入低价百分比" style="width:93%" min="0"
oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
v-model="form.input"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已配重量（KG）" prop="startDate" >
<el-input placeholder="请输入已配重量（KG）" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
<el-form-item label="已配重量（KG）" prop="startDate">
<el-input placeholder="请输入已配重量（KG）" style="width:93%" min="0"
oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
v-model="form.input"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="航班优先级" prop="startDate" >
<el-select v-model="form.value5" placeholder="请选择航班优先级">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
<el-form-item label="航班优先级" prop="startDate">
<!-- <el-select v-model="form.value5" placeholder="请选择航班优先级">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-select> -->
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="总体积 （cm³）" prop="startDate" >
<el-input placeholder="请输入总体积 （cm³）" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
<el-form-item label="总体积 （cm³）" prop="startDate">
<el-input placeholder="请输入总体积 （cm³）" style="width:93%" min="0"
oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
v-model="form.input"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="已配体积（cm³）" prop="startDate" >
<el-input placeholder="请输入已配体积（cm³）" style="width:93%" min="0" oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number" v-model="form.input"></el-input>
<el-form-item label="已配体积（cm³）" prop="startDate">
<el-input placeholder="请输入已配体积（cm³）" style="width:93%" min="0"
oninput="value=value.indexOf('.') > -1?value.slice(0, value.indexOf('.') + 3):value" type="number"
v-model="form.input"></el-input>
</el-form-item>
</el-col>
......@@ -284,31 +267,20 @@
</template>
<script>
import {
findSourceFlightRulesApi,
sourceFlightRulesSaveApi,
delOrEnableORDisableApi,
findSourceFlightAndFlightDateApi
} from "@/api/sourceFlightRules";
findFltConditionDataApi,
findAllFltDataApi
} from "@/api/findAllFltData";
export default {
name: "SourceFlightRules",
name: "findAllFltData",
data() {
return {
options: [{
value: '选项1',
label: '黄金糕'
}, {
value: '选项2',
label: '双皮奶'
}, {
value: '选项3',
label: '蚵仔煎'
}, {
value: '选项4',
label: '龙须面'
}, {
value: '选项5',
label: '北京烤鸭'
}],
//航班种类
flightKindlist: [],
//航班状态
flightStatuslist: [],
//航班类型
flightTypelist: [],
// 选中数组
ids: [],
// 非单个禁用
......@@ -337,9 +309,6 @@
}
}
},
//周期段
dayOfWeekList: ['D1', 'D2', 'D3', 'D4', 'D5', 'D6', 'D7'],
// 遮罩层
loading: false,
// 遮罩层
......@@ -349,7 +318,7 @@
// 总条数
total: 0,
// 原航班规则数据
sourceFlightRulesList: [],
findAllFltDatList: [],
//目的航班数据
sourceFlightAndFlightDate: [],
statusList: [{
......@@ -365,19 +334,22 @@
openFlightDate: false,
// 查询参数
queryParams: {
start: 0, //当前条数【代表第几条数据 +1开始】
limitStart: 0, //当前条数【代表第几条数据 +1开始】
pageNum: 1,
limit: 20, //一页显示多少条数据
sourceFlightNo: undefined, //原航班号
status: undefined, //状态
flightDate: undefined //日期
limitSize: 20, //一页显示多少条数据
fltDateStart: undefined, //航班日期开始
fltDateEnd: undefined, //航班日期结束
typeId: undefined, //航班类型
statusId: undefined, //航班状态
flightKindId: undefined, //航班种类
fltNo: undefined //航班号，要大写
},
dayOfWeek: [],
// 表单参数
form: {
dayOfWeek: []
},
currentRow: null,
// 表单校验
rules: {
sourceFlightNo: [{
......@@ -394,9 +366,60 @@
};
},
created() {
this.findSourceFlightRules();
//查询条件数据源
this.findFltConditionData();
this.findAllFltData();
},
methods: {
// 是否一票一件
ticketToPieceFormat(row) {
if (row.ticketToPiece === 1) {
return '是'
} else {
return '否'
}
return row.ticketToPiece;
},
// 是否需要预审 1 预审 0 取消预审
needRequiredFormat(row) {
if (row.needRequired === 1) {
return '预审'
} else {
return '取消预审'
}
return row.ticketToPiece;
},
//是否开启高低价
highLowPriceFlgFormat(row) {
if (row.highLowPriceFlg === 1) {
return '开启'
} else {
return '未开启'
}
return row.ticketToPiece;
},
//时间格式化
renderTime(date) {
var dateee = new Date(date).toJSON();
return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
},
//查询条件数据源
findFltConditionData() {
findFltConditionDataApi().then(response => {
if (response.code == 200) {
//航班种类
this.flightKindlist = response.data.flightKind;
//航班类型
this.flightTypelist = response.data.flightType;
//航班状态
this.flightStatuslist = response.data.flightStatus;
} else {
this.msgError(response.msg);
}
});
},
// 多选框选中数据
handleSelectionChange(selection) {
......@@ -404,27 +427,23 @@
this.single = selection.length != 1
this.multiple = !selection.length
},
//跳转到查看，修改页面
handleClick(flightiId, handle) {
this.$router.push({
name: "Info",
params: {
handle: handle,
id: flightiId
},
});
},
/** 查询原航班顺位规则*/
findSourceFlightRules() {
//this.loading = true;
/** 航班信息维护查询*/
findAllFltData() {
this.loading = true;
if (this.queryParams.pageNum > 1) {
this.queryParams.start = (this.queryParams.pageNum - 1) * this.queryParams.limit
this.queryParams.limitStart = (this.queryParams.pageNum - 1) * this.queryParams.limitSize
} else {
this.queryParams.start = 0;
this.queryParams.limitStart = 0;
}
if (this.queryParams.fltNo != null && this.queryParams.fltNo != undefined && this.queryParams.fltNo != '') {
this.queryParams.fltNo = this.queryParams.fltNo.toUpperCase();
}
findSourceFlightRulesApi(this.queryParams).then(response => {
findAllFltDataApi(this.queryParams).then(response => {
if (response.code == 200) {
this.sourceFlightRulesList = response.data.list;
this.findAllFltDatList = response.data.list;
this.total = response.data.totalCount;
this.loading = false;
} else {
......@@ -554,17 +573,7 @@
this.open = false;
// this.reset();
},
// 状态字典翻译
statusFormat(row) {
if (row.status === '1') {
return '有效'
} else if (row.status === '2') {
return '配置中'
} else if (row.status === '3') {
return '停用'
}
return row.status;
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
......