朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 cd352b67bdedade6d833f8dda1a96ac5aaecd13d 1 个父辈 dc39814b

添加业务删除报文 可以选择历史数据

内嵌 并排对比
正在显示 6 个修改的文件 包含 117 行增加 和 31 行删除
... ... @@ -31,6 +31,7 @@ module.exports = {
proxyTable: {
'/api':{
target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
// target: 'http://192.168.1.189:12343',//设置你调用的接口域名和端口号 别忘了加http
// target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http
changeOrigin: true,
pathRewrite: {
... ...
import axios from 'axios'
let baseUrl = 'nmms-server-export/history'
export const getHistoryList = params => { return axios.get(`${baseUrl}/list`, { params: params }); };
... ...
import axios from 'axios'
let base = '/wlpt-flight-scheduling-interface/inquiry';
export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
... ...
... ... @@ -8,9 +8,15 @@
<p style="font-size: 28px">航班号查询</p>
</el-row>
<el-row>
<el-input placeholder="请输入内容" v-model="input3" class="input-with-select">
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
<!--工具条-->
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input v-model="filters.flightNo" ></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" v-on:click="getDomesticClearance()">查询</el-button>
</el-form-item>
</el-form>
</el-row>
</el-col>
</el-row>
... ... @@ -21,19 +27,16 @@
<p style="font-size: 28px">条件查询</p>
</el-row>
<el-row>
<el-tabs v-model="activeName" @tab-click="handleClick" style="width: 100%">
<el-tabs v-model="activeName" @tab-click="getDomesticClearance()" style="width: 100%">
<el-tab-pane label="国内出港" name="first">
<div style=";margin-top: 15px">
<el-time-picker
v-model="value1"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
<el-time-picker
arrow-control
v-model="value2"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
... ... @@ -96,14 +99,13 @@
<div style=";margin-top: 15px">
<el-time-picker
v-model="value1"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
<el-time-picker
arrow-control
v-model="value2"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
... ... @@ -166,14 +168,12 @@
<div style=";margin-top: 15px">
<el-time-picker
v-model="value1"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
<el-time-picker
arrow-control
v-model="value2"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
... ... @@ -236,14 +236,12 @@
<div style=";margin-top: 15px">
<el-time-picker
v-model="value1"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
<el-time-picker
arrow-control
v-model="value2"
:picker-options="{selectableRange: '18:30:00 - 20:30:00' }"
placeholder="任意时间点"
style="width: 140px">
</el-time-picker>
... ... @@ -306,15 +304,8 @@
</el-row>
<el-row>
<div>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
:page-sizes="[100, 200, 300, 400]"
:page-size="100"
layout="total, sizes, prev, pager, next, jumper"
:total="400">
</el-pagination>
<pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="pageSize" :limit.sync="pageNum"
@pagination="getDomesticClearance"/>
</div>
</el-row>
... ... @@ -325,19 +316,45 @@
</template>
<script>
import {getList} from '../../api/inquiry/inquiry'
export default {
data() {
return {
currentPage4: 4,
activeName: 'first'
activeName: 'first',
filters: {
flightNo: ''
},
total: 1,
pageSize: 1,
pageNum: 30,
domesticClearanceList: [],
};
},
methods: {
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
//获取列表集合
getDomesticClearance() {
// this.listLoading = true;
// //NProgress.start();
// getList().then((res) => {
// this.total = res.data.total;
// this.domesticClearanceList = res.data.list;
// this.listLoading = false;
// //NProgress.done();
// }).catch((error) => {
//
// this.listLoading = false;
// if(null!= error.response && error.response!==undefined){
// let status= error.response.status;
// let msg = error.response.statusText;
// alert(status+msg);
// }else {
// alert(error);
// }
//
// });
}
},
... ...
... ... @@ -9,7 +9,7 @@
class="filter-item" value-format="yyyy-MM-dd"></el-date-picker>
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
</div>
<el-table :data="flightData" stripe style="font-size: 14px" border>
<el-table :data="flightData" v-loading="listLoading" stripe style="font-size: 14px" border>
<el-table-column label="航班号" width="180px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
... ... @@ -55,6 +55,7 @@
inject: ['reload'],
data() {
return {
listLoading: false,
total: 1,
listQuery: {
pageSize: 1,
... ... @@ -74,9 +75,11 @@
this.listQuery.flightDate = new Date();
},
getList() {
this.listLoading = true;
getFlightListForParam(this.listQuery).then(res => {
this.flightData = res.data.data.list
this.total = res.data.data.total
this.listLoading = false;
})
},
handleSearch() {
... ...
... ... @@ -126,7 +126,7 @@
</el-button>
<el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
:disabled="scope.row.status ==='24'">发删除报
:disabled="scope.row.status ==='24'">发送删除报
</el-button>
</template>
... ... @@ -317,7 +317,10 @@
</el-table-column>
</el-table>
</el-dialog>
<el-dialog title="删除原因" :visible.sync="dialogDeleteVisible" width="30%">
<el-dialog title="删除原因" :visible.sync="dialogDeleteVisible" width="50%">
<div style="">
<el-button type="success" @click="historyList()">选择历史消息</el-button>
</div>
<el-form ref="loadingDeleteForm" :model="respModel" :rules="loadingDeleteRules"
label-width="120px" style="margin-right: 50px">
<el-form-item label="删除原因" prop="reason">
... ... @@ -338,6 +341,23 @@
<el-button type="primary" @click="sendLoadingDelete()">发送</el-button>
</div>
</el-dialog>
<el-dialog title="历史信息" :visible.sync="historyDialog" width="50%">
<el-table v-loading="listLoading" :data="historyData" stripe style="font-size: 12px"
border >
<el-table-column prop="operperson" label="删除原因" />
<el-table-column prop="operreason" label="删除操作人" />
<el-table-column prop="opertel" label="操作人Tel"/>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button type="success" @click="historyEcho(scope.row)">选择</el-button>
</template>
</el-table-column>
</el-table>
<pagination background layout="total, prev, pager, next" v-show="historyTotal>0" :total="historyTotal" :page.sync="historyQuery.pageSize" :limit.sync="historyQuery.limitSize"
@pagination="historyList()"/>
</el-dialog>
</div>
</div>
</template>
... ... @@ -348,6 +368,7 @@
getMt4201ListForParam, deleteByIsDelete, updateStatus,
updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201, test
} from '@/api/exitLoading'
import {getHistoryList} from '@/api/history/history';
import {Message} from "element-ui"
import {
validAwb,
... ... @@ -401,6 +422,7 @@
}
return {
total: 0,
historyTotal: 0,
isAdmin: false,
dialogMap: {
update: '编辑出港装载',
... ... @@ -408,10 +430,12 @@
},
customCodeList: [],
airportCode:[],
historyData: [],
dialogStatus: undefined,
dialogTableVisible: false,
dialogFormVisible: false,
dialogDeleteVisible: false,
historyDialog: false,
customLoading: false,
listLoading: false,
loadingQuery: {
... ... @@ -426,6 +450,10 @@
customcode: undefined,
messageType: undefined
},
historyQuery: {
pageSize: 1,
limitSize: 5,
},
loadingRoles: {
awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
... ... @@ -667,6 +695,27 @@
})
},
// 查询删除报历史消息
historyList(){
this.historyDialog = true;
this.listLoading = true;
getHistoryList(this.historyQuery).then(res => {
this.historyData = res.data.data.list
this.historyTotal = res.data.data.total
if (res.data.data.total > 0) {
}
setTimeout(() => {
this.listLoading = false
}, 1.5 * 1000)
})
},
// 回显删除报历史消息
historyEcho(val){
this.respModel.reason = val.operperson;
this.respModel.contactName = val.operreason;
this.respModel.contactTel = val.opertel;
this.historyDialog = false;
},
// 发送删除报
handleSendDelete(row) {
this.respModel = {
... ...