朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 cd352b67bdedade6d833f8dda1a96ac5aaecd13d 1 个父辈 dc39814b

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

内嵌 并排对比
正在显示 6 个修改的文件 包含 117 行增加 和 31 行删除
@@ -31,6 +31,7 @@ module.exports = { @@ -31,6 +31,7 @@ module.exports = {
31 proxyTable: { 31 proxyTable: {
32 '/api':{ 32 '/api':{
33 target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http 33 target: 'http://192.168.1.53:12343',//设置你调用的接口域名和端口号 别忘了加http
  34 + // target: 'http://192.168.1.189:12343',//设置你调用的接口域名和端口号 别忘了加http
34 // target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http 35 // target: 'http://localhost:12343',//设置你调用的接口域名和端口号 别忘了加http
35 changeOrigin: true, 36 changeOrigin: true,
36 pathRewrite: { 37 pathRewrite: {
  1 +import axios from 'axios'
  2 +
  3 +let baseUrl = 'nmms-server-export/history'
  4 +
  5 +
  6 +
  7 +export const getHistoryList = params => { return axios.get(`${baseUrl}/list`, { params: params }); };
  8 +
  1 +import axios from 'axios'
  2 +
  3 +let base = '/wlpt-flight-scheduling-interface/inquiry';
  4 +
  5 +
  6 +
  7 +export const getList = params => { return axios.get(`${base}/list`, { params: params }); };
  8 +
@@ -8,9 +8,15 @@ @@ -8,9 +8,15 @@
8 <p style="font-size: 28px">航班号查询</p> 8 <p style="font-size: 28px">航班号查询</p>
9 </el-row> 9 </el-row>
10 <el-row> 10 <el-row>
11 - <el-input placeholder="请输入内容" v-model="input3" class="input-with-select">  
12 - <el-button slot="append" icon="el-icon-search"></el-button>  
13 - </el-input> 11 + <!--工具条-->
  12 + <el-form :inline="true" :model="filters">
  13 + <el-form-item>
  14 + <el-input v-model="filters.flightNo" ></el-input>
  15 + </el-form-item>
  16 + <el-form-item>
  17 + <el-button type="primary" v-on:click="getDomesticClearance()">查询</el-button>
  18 + </el-form-item>
  19 + </el-form>
14 </el-row> 20 </el-row>
15 </el-col> 21 </el-col>
16 </el-row> 22 </el-row>
@@ -21,19 +27,16 @@ @@ -21,19 +27,16 @@
21 <p style="font-size: 28px">条件查询</p> 27 <p style="font-size: 28px">条件查询</p>
22 </el-row> 28 </el-row>
23 <el-row> 29 <el-row>
24 - <el-tabs v-model="activeName" @tab-click="handleClick" style="width: 100%"> 30 + <el-tabs v-model="activeName" @tab-click="getDomesticClearance()" style="width: 100%">
25 <el-tab-pane label="国内出港" name="first"> 31 <el-tab-pane label="国内出港" name="first">
26 <div style=";margin-top: 15px"> 32 <div style=";margin-top: 15px">
27 <el-time-picker 33 <el-time-picker
28 v-model="value1" 34 v-model="value1"
29 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }"  
30 placeholder="任意时间点" 35 placeholder="任意时间点"
31 style="width: 140px"> 36 style="width: 140px">
32 </el-time-picker> 37 </el-time-picker>
33 <el-time-picker 38 <el-time-picker
34 - arrow-control  
35 v-model="value2" 39 v-model="value2"
36 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }"  
37 placeholder="任意时间点" 40 placeholder="任意时间点"
38 style="width: 140px"> 41 style="width: 140px">
39 </el-time-picker> 42 </el-time-picker>
@@ -96,14 +99,13 @@ @@ -96,14 +99,13 @@
96 <div style=";margin-top: 15px"> 99 <div style=";margin-top: 15px">
97 <el-time-picker 100 <el-time-picker
98 v-model="value1" 101 v-model="value1"
99 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }" 102 +
100 placeholder="任意时间点" 103 placeholder="任意时间点"
101 style="width: 140px"> 104 style="width: 140px">
102 </el-time-picker> 105 </el-time-picker>
103 <el-time-picker 106 <el-time-picker
104 arrow-control 107 arrow-control
105 v-model="value2" 108 v-model="value2"
106 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }"  
107 placeholder="任意时间点" 109 placeholder="任意时间点"
108 style="width: 140px"> 110 style="width: 140px">
109 </el-time-picker> 111 </el-time-picker>
@@ -166,14 +168,12 @@ @@ -166,14 +168,12 @@
166 <div style=";margin-top: 15px"> 168 <div style=";margin-top: 15px">
167 <el-time-picker 169 <el-time-picker
168 v-model="value1" 170 v-model="value1"
169 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }"  
170 placeholder="任意时间点" 171 placeholder="任意时间点"
171 style="width: 140px"> 172 style="width: 140px">
172 </el-time-picker> 173 </el-time-picker>
173 <el-time-picker 174 <el-time-picker
174 arrow-control 175 arrow-control
175 v-model="value2" 176 v-model="value2"
176 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }"  
177 placeholder="任意时间点" 177 placeholder="任意时间点"
178 style="width: 140px"> 178 style="width: 140px">
179 </el-time-picker> 179 </el-time-picker>
@@ -236,14 +236,12 @@ @@ -236,14 +236,12 @@
236 <div style=";margin-top: 15px"> 236 <div style=";margin-top: 15px">
237 <el-time-picker 237 <el-time-picker
238 v-model="value1" 238 v-model="value1"
239 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }"  
240 placeholder="任意时间点" 239 placeholder="任意时间点"
241 style="width: 140px"> 240 style="width: 140px">
242 </el-time-picker> 241 </el-time-picker>
243 <el-time-picker 242 <el-time-picker
244 arrow-control 243 arrow-control
245 v-model="value2" 244 v-model="value2"
246 - :picker-options="{selectableRange: '18:30:00 - 20:30:00' }"  
247 placeholder="任意时间点" 245 placeholder="任意时间点"
248 style="width: 140px"> 246 style="width: 140px">
249 </el-time-picker> 247 </el-time-picker>
@@ -306,15 +304,8 @@ @@ -306,15 +304,8 @@
306 </el-row> 304 </el-row>
307 <el-row> 305 <el-row>
308 <div> 306 <div>
309 - <el-pagination  
310 - @size-change="handleSizeChange"  
311 - @current-change="handleCurrentChange"  
312 - :current-page="currentPage4"  
313 - :page-sizes="[100, 200, 300, 400]"  
314 - :page-size="100"  
315 - layout="total, sizes, prev, pager, next, jumper"  
316 - :total="400">  
317 - </el-pagination> 307 + <pagination background layout="total, prev, pager, next" v-show="total>0" :total="total" :page.sync="pageSize" :limit.sync="pageNum"
  308 + @pagination="getDomesticClearance"/>
318 </div> 309 </div>
319 310
320 </el-row> 311 </el-row>
@@ -325,19 +316,45 @@ @@ -325,19 +316,45 @@
325 </template> 316 </template>
326 317
327 <script> 318 <script>
  319 + import {getList} from '../../api/inquiry/inquiry'
328 export default { 320 export default {
329 data() { 321 data() {
330 return { 322 return {
331 currentPage4: 4, 323 currentPage4: 4,
332 - activeName: 'first' 324 + activeName: 'first',
  325 + filters: {
  326 + flightNo: ''
  327 + },
  328 + total: 1,
  329 + pageSize: 1,
  330 + pageNum: 30,
  331 + domesticClearanceList: [],
333 }; 332 };
334 }, 333 },
335 methods: { 334 methods: {
336 - handleSizeChange(val) {  
337 - console.log(`每页 ${val} 条`);  
338 - },  
339 - handleCurrentChange(val) {  
340 - console.log(`当前页: ${val}`); 335 +
  336 + //获取列表集合
  337 + getDomesticClearance() {
  338 +
  339 + // this.listLoading = true;
  340 + // //NProgress.start();
  341 + // getList().then((res) => {
  342 + // this.total = res.data.total;
  343 + // this.domesticClearanceList = res.data.list;
  344 + // this.listLoading = false;
  345 + // //NProgress.done();
  346 + // }).catch((error) => {
  347 + //
  348 + // this.listLoading = false;
  349 + // if(null!= error.response && error.response!==undefined){
  350 + // let status= error.response.status;
  351 + // let msg = error.response.statusText;
  352 + // alert(status+msg);
  353 + // }else {
  354 + // alert(error);
  355 + // }
  356 + //
  357 + // });
341 } 358 }
342 }, 359 },
343 360
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 class="filter-item" value-format="yyyy-MM-dd"></el-date-picker> 9 class="filter-item" value-format="yyyy-MM-dd"></el-date-picker>
10 <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button> 10 <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleSearch">查询</el-button>
11 </div> 11 </div>
12 - <el-table :data="flightData" stripe style="font-size: 14px" border> 12 + <el-table :data="flightData" v-loading="listLoading" stripe style="font-size: 14px" border>
13 <el-table-column label="航班号" width="180px" align="center"> 13 <el-table-column label="航班号" width="180px" align="center">
14 <template slot-scope="scope"> 14 <template slot-scope="scope">
15 <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span> 15 <span>{{ scope.row.carrier }}{{ scope.row.flightno }}</span>
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
55 inject: ['reload'], 55 inject: ['reload'],
56 data() { 56 data() {
57 return { 57 return {
  58 + listLoading: false,
58 total: 1, 59 total: 1,
59 listQuery: { 60 listQuery: {
60 pageSize: 1, 61 pageSize: 1,
@@ -74,9 +75,11 @@ @@ -74,9 +75,11 @@
74 this.listQuery.flightDate = new Date(); 75 this.listQuery.flightDate = new Date();
75 }, 76 },
76 getList() { 77 getList() {
  78 + this.listLoading = true;
77 getFlightListForParam(this.listQuery).then(res => { 79 getFlightListForParam(this.listQuery).then(res => {
78 this.flightData = res.data.data.list 80 this.flightData = res.data.data.list
79 this.total = res.data.data.total 81 this.total = res.data.data.total
  82 + this.listLoading = false;
80 }) 83 })
81 }, 84 },
82 handleSearch() { 85 handleSearch() {
@@ -126,7 +126,7 @@ @@ -126,7 +126,7 @@
126 </el-button> 126 </el-button>
127 127
128 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)" 128 <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"
129 - :disabled="scope.row.status ==='24'">发删除报 129 + :disabled="scope.row.status ==='24'">发送删除报
130 </el-button> 130 </el-button>
131 131
132 </template> 132 </template>
@@ -317,7 +317,10 @@ @@ -317,7 +317,10 @@
317 </el-table-column> 317 </el-table-column>
318 </el-table> 318 </el-table>
319 </el-dialog> 319 </el-dialog>
320 - <el-dialog title="删除原因" :visible.sync="dialogDeleteVisible" width="30%"> 320 + <el-dialog title="删除原因" :visible.sync="dialogDeleteVisible" width="50%">
  321 + <div style="">
  322 + <el-button type="success" @click="historyList()">选择历史消息</el-button>
  323 + </div>
321 <el-form ref="loadingDeleteForm" :model="respModel" :rules="loadingDeleteRules" 324 <el-form ref="loadingDeleteForm" :model="respModel" :rules="loadingDeleteRules"
322 label-width="120px" style="margin-right: 50px"> 325 label-width="120px" style="margin-right: 50px">
323 <el-form-item label="删除原因" prop="reason"> 326 <el-form-item label="删除原因" prop="reason">
@@ -338,6 +341,23 @@ @@ -338,6 +341,23 @@
338 <el-button type="primary" @click="sendLoadingDelete()">发送</el-button> 341 <el-button type="primary" @click="sendLoadingDelete()">发送</el-button>
339 </div> 342 </div>
340 </el-dialog> 343 </el-dialog>
  344 + <el-dialog title="历史信息" :visible.sync="historyDialog" width="50%">
  345 + <el-table v-loading="listLoading" :data="historyData" stripe style="font-size: 12px"
  346 + border >
  347 +
  348 + <el-table-column prop="operperson" label="删除原因" />
  349 + <el-table-column prop="operreason" label="删除操作人" />
  350 + <el-table-column prop="opertel" label="操作人Tel"/>
  351 + <el-table-column label="操作">
  352 + <template slot-scope="scope">
  353 + <el-button type="success" @click="historyEcho(scope.row)">选择</el-button>
  354 + </template>
  355 + </el-table-column>
  356 + </el-table>
  357 + <pagination background layout="total, prev, pager, next" v-show="historyTotal>0" :total="historyTotal" :page.sync="historyQuery.pageSize" :limit.sync="historyQuery.limitSize"
  358 + @pagination="historyList()"/>
  359 + </el-dialog>
  360 +
341 </div> 361 </div>
342 </div> 362 </div>
343 </template> 363 </template>
@@ -348,6 +368,7 @@ @@ -348,6 +368,7 @@
348 getMt4201ListForParam, deleteByIsDelete, updateStatus, 368 getMt4201ListForParam, deleteByIsDelete, updateStatus,
349 updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201, test 369 updateMT4201, addMt4201, sendCreateMt4201, sendDeleteMt4201, test
350 } from '@/api/exitLoading' 370 } from '@/api/exitLoading'
  371 + import {getHistoryList} from '@/api/history/history';
351 import {Message} from "element-ui" 372 import {Message} from "element-ui"
352 import { 373 import {
353 validAwb, 374 validAwb,
@@ -401,6 +422,7 @@ @@ -401,6 +422,7 @@
401 } 422 }
402 return { 423 return {
403 total: 0, 424 total: 0,
  425 + historyTotal: 0,
404 isAdmin: false, 426 isAdmin: false,
405 dialogMap: { 427 dialogMap: {
406 update: '编辑出港装载', 428 update: '编辑出港装载',
@@ -408,10 +430,12 @@ @@ -408,10 +430,12 @@
408 }, 430 },
409 customCodeList: [], 431 customCodeList: [],
410 airportCode:[], 432 airportCode:[],
  433 + historyData: [],
411 dialogStatus: undefined, 434 dialogStatus: undefined,
412 dialogTableVisible: false, 435 dialogTableVisible: false,
413 dialogFormVisible: false, 436 dialogFormVisible: false,
414 dialogDeleteVisible: false, 437 dialogDeleteVisible: false,
  438 + historyDialog: false,
415 customLoading: false, 439 customLoading: false,
416 listLoading: false, 440 listLoading: false,
417 loadingQuery: { 441 loadingQuery: {
@@ -426,6 +450,10 @@ @@ -426,6 +450,10 @@
426 customcode: undefined, 450 customcode: undefined,
427 messageType: undefined 451 messageType: undefined
428 }, 452 },
  453 + historyQuery: {
  454 + pageSize: 1,
  455 + limitSize: 5,
  456 + },
429 loadingRoles: { 457 loadingRoles: {
430 awba: [{required: true, trigger: 'blur', validator: validatorAwb}], 458 awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
431 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}], 459 awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
@@ -667,6 +695,27 @@ @@ -667,6 +695,27 @@
667 }) 695 })
668 }, 696 },
669 697
  698 + // 查询删除报历史消息
  699 + historyList(){
  700 + this.historyDialog = true;
  701 + this.listLoading = true;
  702 + getHistoryList(this.historyQuery).then(res => {
  703 + this.historyData = res.data.data.list
  704 + this.historyTotal = res.data.data.total
  705 + if (res.data.data.total > 0) {
  706 + }
  707 + setTimeout(() => {
  708 + this.listLoading = false
  709 + }, 1.5 * 1000)
  710 + })
  711 + },
  712 + // 回显删除报历史消息
  713 + historyEcho(val){
  714 + this.respModel.reason = val.operperson;
  715 + this.respModel.contactName = val.operreason;
  716 + this.respModel.contactTel = val.opertel;
  717 + this.historyDialog = false;
  718 + },
670 // 发送删除报 719 // 发送删除报
671 handleSendDelete(row) { 720 handleSendDelete(row) {
672 this.respModel = { 721 this.respModel = {