朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 37fc0d84262e7586a082f1390798dd78fa452fda 1 个父辈 ad417333

跨天配置

内嵌 并排对比
正在显示 3 个修改的文件 包含 136 行增加 和 51 行删除
... ... @@ -3,9 +3,9 @@ let baseUrl = 'nmms-server-import/nmms/mt1201'
let baseUrlCross = 'nmms-server-import/nmms/crossday'
//跨天配置
export const addCrossday=params=>{return http.get(`${baseUrlCross}/addCrossday`, params);};
export const ediCrossday=params=>{return http.get(`${baseUrlCross}/ediCrossday`, params);};
export const delCrossday=params=>{return http.get(`${baseUrlCross}/delCrossday`, params);};
export const addCrossday=params=>{return http.post(`${baseUrlCross}/addCrossday`, params);};
export const ediCrossday=params=>{return http.post(`${baseUrlCross}/ediCrossday`, params);};
export const delCrossday=params=>{return http.post(`${baseUrlCross}/delCrossday`, params);};
export const selectLists=params=>{return http.get(`${baseUrlCross}/selectLists`, params);};
... ...
... ... @@ -4,17 +4,13 @@
<!--检索条件-->
<el-row class="toolbar" style="background-color: white;margin-bottom: 10px">
<el-col :span="6">
<template>
承运人
</template>
<el-input v-model="queryinfo.carrier" placeholder="承运人" style="width: 150px">
<el-input v-model="queryinfo.carrier" placeholder="承运人" style="width: 200px">
<template slot="prepend">承运人</template>
</el-input>
</el-col>
<el-col :span="6">
<template>
航班号
</template>
<el-input v-model="queryinfo.flightno" placeholder="航班号" style="width: 150px">
<el-input v-model="queryinfo.flightno" placeholder="航班号" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-col>
... ... @@ -55,15 +51,18 @@
</el-table-column>
<el-table-column
prop="effectivedate"
label="航班计划开始时间">
label="航班计划开始时间"
width="120">
</el-table-column>
<el-table-column
prop="expirationdate"
label="航班计划结束时间">
label="航班计划结束时间"
width="120">
</el-table-column>
<el-table-column
prop="schedule"
label="航班计划航班时刻">
label="航班计划航班时刻"
width="120">
</el-table-column>
<el-table-column
prop="remark"
... ... @@ -72,7 +71,7 @@
<el-table-column
fixed="right"
label="操作"
width="180">
width="150">
<template slot-scope="scope">
<el-button type="success" size="small" @click="toEditDialog(scope.row)">编辑</el-button>
<el-button type="danger" size="small" @click="del(scope.$index,scope.row)">删除</el-button>
... ... @@ -82,6 +81,19 @@
</template>
</el-row>
<!--分页模块-->
<!-- <el-row style="float: right;margin-top: 20px">-->
<!-- <div class="block">-->
<!-- <el-pagination-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"-->
<!-- :current-page="currentPage"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- :total="total">-->
<!-- </el-pagination>-->
<!-- </div>-->
<!-- </el-row>-->
<el-row style="float: right;margin-top: 20px">
<div class="block">
<el-pagination
... ... @@ -98,37 +110,86 @@
<!-- 新增弹框-->
<el-row>
<el-dialog :title="dialogMap[dialogStatus]"
:visible.sync="dialogCross.addDialog" align="center" style="margin-top: -20px">
<el-form ref="form" :model="form" label-width="150px" label-position="right" :inline="true" :rules="rules">
<el-form-item label="启/禁用" style="margin-top: 15px">
:visible.sync="dialogCross.addDialog" align="center" style="margin-left: 40px" width="70%">
<el-form ref="form" :model="form" label-width="200px" label-position="right" :inline="true" :rules="rules">
<el-row>
<el-col :span="11">
<el-form-item label="" prop="state">
<div class="ipt" style="padding-right: 110px">
&emsp;&emsp;启/禁用&emsp;&emsp;
</div>
<el-select v-model="form.state" placeholder="请选择" style="width: 200px" :clearable="true">
<el-option label="启用" value="1"></el-option>
<el-option label="禁用" value="0"></el-option>
</el-select>
<!-- <el-input v-model="form.state" :clearable="true"></el-input>-->
<!-- <el-input v-model="form.state" :clearable="true"></el-input>-->
</el-form-item>
<el-form-item label="承运人">
<el-input v-model="form.carrier" :clearable="true"></el-input>
</el-col>
<el-col :span="11">
<el-form-item label="" prop="carrier">
<el-input v-model="form.carrier" :clearable="true">
<template slot="prepend">&emsp;&emsp;承运人&emsp;&emsp;</template>
</el-input>
</el-form-item>
<el-form-item label="航班号">
<el-input v-model="form.flightno" :clearable="true"></el-input>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="" prop="flightno">
<el-input v-model="form.flightno" :clearable="true">
<template slot="prepend">&emsp;&emsp;航班号&emsp;&emsp;</template>
</el-input>
</el-form-item>
<el-form-item label="起始站">
<el-input v-model="form.originatingstation" :clearable="true"></el-input>
</el-col>
<el-col :span="11">
<el-form-item label="" prop="originatingstation">
<el-input v-model="form.originatingstation" :clearable="true">
<template slot="prepend">&emsp;&emsp;起始站&emsp;&emsp;</template>
</el-input>
</el-form-item>
<el-form-item label="目的站">
<el-input v-model="form.destinationstation" :clearable="true"></el-input>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="" prop="destinationstation">
<el-input v-model="form.destinationstation" :clearable="true">
<template slot="prepend">&emsp;&emsp;目的站&emsp;&emsp;</template>
</el-input>
</el-form-item>
<el-form-item label="跨天天数">
<el-input v-model="form.crossdays" :clearable="true"></el-input>
</el-col>
<el-col :span="11">
<el-form-item label="" prop="crossdays">
<el-input v-model="form.crossdays" :clearable="true">
<template slot="prepend">&emsp;跨天天数&emsp;&emsp;</template>
</el-input>
</el-form-item>
<el-form-item label="航班计划开始时间">
<el-date-picker type="date" v-model="form.effectivedate" style="width: 200px" :clearable="true"></el-date-picker>
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="" prop="effectivedate">
<div class="ipt" style="padding-right: 110px">
航班计划开始时间
</div>
<el-date-picker type="date" v-model="form.effectivedate" value-format="yyyy-MM-dd" style="width: 200px" :clearable="true"></el-date-picker>
</el-form-item>
<el-form-item label="航班计划结束时间">
<el-date-picker type="date" v-model="form.expirationdate" style="width: 200px" :clearable="true"></el-date-picker>
</el-col>
<el-col :span="11">
<el-form-item label="" prop="expirationdate" >
<div class="ipt" style="padding-right: 110px">
航班计划结束时间
</div>
<el-date-picker type="date" v-model="form.expirationdate" value-format="yyyy-MM-dd" style="width: 200px" :clearable="true"></el-date-picker>
<!-- <el-date-picker type="date" value-format="yyyyMMdd" v-model="form.expirationdate" style="width: 200px" :clearable="true"></el-date-picker>-->
</el-form-item>
<el-form-item label="航班计划航班时刻">
</el-col>
</el-row>
<el-row>
<el-col :span="11">
<el-form-item label="" prop="schedule">
<div class="ipt" style="padding-right: 110px">
航班计划航班时刻
</div>
<el-select v-model="form.schedule" placeholder="请选择" style="width: 200px" :clearable="true">
<el-option label="周一" value="1"></el-option>
<el-option label="周二" value="2"></el-option>
... ... @@ -138,14 +199,20 @@
<el-option label="周六" value="6"></el-option>
<el-option label="周日" value="7"></el-option>
</el-select>
<!-- <el-date-picker type="date" prefix-icon=0 v-model="form.schedule" style="width: 200px" :clearable="true"></el-date-picker>-->
<!-- <el-date-picker type="date" prefix-icon=0 v-model="form.schedule" style="width: 200px" :clearable="true"></el-date-picker>-->
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" :clearable="true"></el-input>
</el-col>
<el-col :span="11">
<el-form-item label="" prop="remark">
<el-input v-model="form.remark" :clearable="true">
<template slot="prepend">&emsp;&emsp;备&emsp;&emsp;注&emsp;&emsp;</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" align="center">
<el-button type="info" @click="dialogCross.addDialog = false">取消</el-button>
<el-button type="info" @click="cancel">取消</el-button>
<el-button type="primary" @click="dialogStatus==='create'?add():edit()">提 交</el-button>
</div>
</el-dialog>
... ... @@ -172,7 +239,7 @@
},
total:0,
tableData: [],
tableloading:true,
tableloading:false,
dialogMap: {
update: '编辑',
create: '新增'
... ... @@ -225,16 +292,18 @@
this.getList()
},
handleCurrentChange(val) {
this.queryinfo.pageNum = val
this.queryinfo.currentPage = val
this.getList()
},
// 自动获取列表
activated(){
//取消
cancel(){
this.dialogCross.addDialog = false
this.getList();
},
//查询
getList() {
const _this = this
this.tableloading = true;
selectLists(this.queryinfo).then((response) => {
const res = response.data
if (res.code != '200') {
... ... @@ -244,6 +313,7 @@
_this.tableData = res.data.list
// 获取列表的总记录数
_this.total = res.data.total
this.tableloading = false;
_this.$message.success('获取消息收发记录，成功！')
}).catch(error => {
// 关闭加载
... ... @@ -266,10 +336,6 @@
schedule:'',
remark:''
}
// this.$nextTick(() => {
// this.form = Object.assign({}, row)
// })
},
// 新增功能
add() {
... ... @@ -303,7 +369,7 @@
this.form=row;
},
// 编辑功能
edit() {
edit(row) {
// 进行表单的预验证
this.$refs.form.validate(valid => {
// 未通过，表单预校验
... ... @@ -334,13 +400,13 @@
}
).then(() => {
console.log(row);
delCrossday(row.autoid).then((response) => {
delCrossday(row).then((response) => {
// console.log(row)
const res = response.data
this.$message.success(res.msg)
this.getList()
}).catch(error => {
this.$message.error(res.msg)
this.$message.error(error.msg)
})
}).catch(() => {
})
... ... @@ -351,7 +417,10 @@
// this.$refs.dangerousAddForm.resetFields()
// },
},
// 自动获取列表
activated(){
this.getList();
},
}
</script>
... ... @@ -359,4 +428,20 @@
.el-input-group{
display: table;
}
.ipt{
max-width: 100px;
margin-right: -4px;
display: inline-block;
background-color: #6F8294;
color: #ffffff;
border: 1px solid #DCDFE6;
vertical-align: middle;
padding: 0 18px;
white-space: nowrap;
border-top-right-radius: 0px;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 0px;
font-size: 10px;
}
</style>
... ...
{
"nmmsVer": "1.09"
"nmmsVer": "1.10"
}
... ...