朱兆平 / vue_cli · 提交

转到一个项目

作者 王勇
提交 093d5acab8d7ef68b4e8a4a37373e9b7d612fc6d 1 个父辈 eabb0427

出港理貨 搜索修改 

預配艙單搜索修改
出港裝載 搜索修改
出港航班查詢搜索修改
出港運抵查詢修搜修改
内嵌 并排对比
正在显示 6 个修改的文件 包含 55 行增加 和 44 行删除
... ... @@ -32,7 +32,7 @@
<div class="grid-content">
<el-col :span="4">
<div class="grid-content">
<el-input v-model="awba" placeholder="请输入主单号"></el-input>
<el-input v-model="awba" clearable placeholder="请输入主单号"></el-input>
</div>
</el-col>
<div class="grid-content el-btn">
... ... @@ -123,7 +123,7 @@
<span>{{scope.row.ext5}}</span>
</template>
</el-table-column>
<el-table-column prop="operation" label="操作" align="center" width="400">
<el-table-column prop="operation" fixed="right" label="操作" align="center" width="400">
<template slot-scope="scope">
<el-button size="mini" @click="handleSendDesc(scope.row)">收发明细</el-button>
<el-button size="mini" type="success" @click="handleEdit(scope.row)">编辑</el-button>
... ... @@ -588,11 +588,11 @@
},
handleSerach() {
this.arriveQuery.carrier = undefined
this.arriveQuery.flightno = undefined
this.arriveQuery.originstation = undefined
this.arriveQuery.flightdate = undefined
this.arriveQuery.destinationstation = undefined
// this.arriveQuery.carrier = undefined
// this.arriveQuery.flightno = undefined
// this.arriveQuery.originstation = undefined
// this.arriveQuery.flightdate = undefined
// this.arriveQuery.destinationstation = undefined
this.getList()
},
handleSelectionChange(val) {
... ...
... ... @@ -10,28 +10,28 @@
<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-column label="航班号" width="280px" align="center">
<el-table-column label="航班号" width="180px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.carrier }}{{ scope.row.flightNo }}</span>
</template>
</el-table-column>
<el-table-column label="航班日期" width="280px" align="center">
<el-table-column label="航班日期" width="190px" align="center">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.flightDate }}</span>
</template>
</el-table-column>
<el-table-column label="始发站" width="235px" align="center">
<el-table-column label="始发站" width="160px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.originstation }}</span>
</template>
</el-table-column>
<el-table-column label="目的站" width="235px" align="center">
<el-table-column label="目的站" width="160px" align="center">
<template slot-scope="scope">
<span>{{ scope.row.destinationstation }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="400px" align="center">
<el-table-column label="操作" width="400px" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handlePre(scope.row)">预配舱单</el-button>
<el-button type="primary" size="mini" @click="handleArrive(scope.row)">出港运抵</el-button>
... ... @@ -48,6 +48,7 @@
<script>
import Pagination from '@/components/Pagination'
import {getFlightListForParam} from '@/api/exitFlight'
export default {
name: "ExitFlight",
components: {Pagination},
... ... @@ -58,18 +59,22 @@
listQuery: {
pageSize: 1,
limitSize: 10,
flightNo: undefined,
flightNo: '',
flightDate: undefined
},
flightData: [],
}
},
created(){
created() {
this.getList()
},
methods: {
/*设置默认航班时间*/
getdatatime() {
this.listQuery.flightDate = new Date();
},
getList() {
getFlightListForParam(this.listQuery).then(res =>{
getFlightListForParam(this.listQuery).then(res => {
this.flightData = res.data.dataList
this.total = res.data.count
})
... ... @@ -101,12 +106,17 @@
row.flightno = row.flightNo
this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
}
},
// 页面加载完毕后触发的事件
mounted() {
var vm = this;
vm.getdatatime();
}
}
</script>
<style scoped>
.app-content{
.app-content {
margin-top: 20px;
}
</style>
... ...
... ... @@ -12,12 +12,12 @@
</el-col>
</el-row>
<el-row type="flex" class="row-bg" justify="center">
<el-col :span="4">
<el-col :span="4" >
<el-input placeholder="必填" v-model="flightno">
<template slot="prepend">航班号</template>
</el-input>
</el-col>
<el-col :span="4">
<el-col :span="4" style="margin-left: 20px">
<el-date-picker
v-model="flight.flightdate"
type="date"
... ... @@ -25,7 +25,7 @@
placeholder="选择日期">
</el-date-picker>
</el-col>
<el-col :span="4">
<el-col :span="4" style="margin-left: 55px">
<el-select
:remote-method="remoteMethodAirport"
:loading="listLoading"
... ... @@ -38,7 +38,7 @@
<el-option
v-for="item in airportCode"
:key="item.airportid"
:label="item.airportdescchn"
:label="item.airportid"
:value="item.airportid">
<span style="float: left">{{ item.airportdescchn }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>
... ... @@ -58,7 +58,7 @@
<el-option
v-for="item in airportCode"
:key="item.airportid"
:label="item.airportdescchn"
:label="item.airportid"
:value="item.airportid">
<span style="float: left">{{ item.airportdescchn }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.airportid }}</span>
... ...
... ... @@ -32,7 +32,7 @@
<div class="grid-content">
<el-col :span="4">
<div class="grid-content">
<el-input v-model="loadingQuery.awba" placeholder="请输入主单号"></el-input>
<el-input clearable v-model="loadingQuery.awba" placeholder="请输入主单号"></el-input>
</div>
</el-col>
<div class="el-btn">
... ... @@ -106,7 +106,7 @@
<span>{{scope.row.ext5}}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<el-table-column label="操作" align="center" fixed="right" width="245">
<template slot-scope="scope">
<el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
... ... @@ -581,11 +581,11 @@
},
// 查询
handleSearch() {
this.loadingQuery.carrier = undefined
this.loadingQuery.flightno = undefined
this.loadingQuery.originstation = undefined
this.loadingQuery.flightdate = undefined
this.loadingQuery.destinationstation = undefined
// this.loadingQuery.carrier = undefined
// this.loadingQuery.flightno = undefined
// this.loadingQuery.originstation = undefined
// this.loadingQuery.flightdate = undefined
// this.loadingQuery.destinationstation = undefined
this.getList()
},
// 收发明细
... ...
... ... @@ -127,7 +127,7 @@
{{scope.row.ext5}}
</template>
</el-table-column>
<el-table-column label="操作" width="450">
<el-table-column label="操作" width="450" fixed="right">
<template slot-scope="scope">
<el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>
<el-button size="mini" type="success" @click="handleEdit(scope.row)" >编辑</el-button>
... ... @@ -161,7 +161,7 @@
</div>
<pagination v-show="total>0" :total="total" :page.sync="preQuery.pageSize" :limit.sync="preQuery.limitSize"
@pagination="getList"/>
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="60%">
<el-dialog :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="85%">
<el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"
label-width="120px" class="el-dialog-div">
<div class="grid-content content">
... ... @@ -306,7 +306,7 @@
</el-form-item>
</el-col>
<el-col :span="8" v-if="fenStatus ==='addAwbh'">
<el-col :span="13">
<el-col :span="14">
<el-form-item label="预配件数" prop="piece">
<el-input v-model="preModel.piece" clearable/>
</el-form-item>
... ... @@ -315,13 +315,14 @@
<span>剩余件数:{{awbPiece}}</span>
</el-col>
</el-col>
<el-col :span="7.5" v-if="fenStatus !=='addAwbh'">
<el-form-item label="预配重量" prop="weight">
<el-input v-model="preModel.weight" clearable/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="fenStatus ==='addAwbh'">
<el-col :span="13">
<el-col :span="14">
<el-form-item label="预配重量" prop="weight">
<el-input v-model="preModel.weight" clearable/>
</el-form-item>
... ... @@ -1121,7 +1122,8 @@
getMt2201ListForParam(this.preQuery).then(res => {
this.preData = res.data.dataList
this.total = res.data.count
console.log("主单号不为空时打印")
console.log(res.data)
if (res.data.dataList.length > 0) {
this.preQuery.carrier = this.preData[0].carrier
this.preQuery.flightno = this.preData[0].flightno
... ... @@ -1143,7 +1145,6 @@
}, 1500)
})
}
},
// >>>>>>>>>>>>>>>>重置实体<<<<<<<<<<<<<<<<<<
restModel() {
... ... @@ -1242,11 +1243,11 @@
},
// >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
handleSerach() {
this.preQuery.flightno = undefined
this.preQuery.carrier = undefined
this.preQuery.originstation = undefined
this.preQuery.flightdate = undefined
this.preQuery.destinationstation = undefined
// this.preQuery.flightno = undefined
// this.preQuery.carrier = undefined
// this.preQuery.originstation = undefined
// this.preQuery.flightdate = undefined
// this.preQuery.destinationstation = undefined
this.getList()
},
// >>>>>>>>>>>>>>>>收发明细<<<<<<<<<<<<<<<<<<
... ...
... ... @@ -612,11 +612,11 @@
},
// 搜索
handleSerach() {
this.tidyQuery.carrier = undefined
this.tidyQuery.flightno = undefined
this.tidyQuery.originstation = undefined
this.tidyQuery.flightdate = undefined
this.tidyQuery.destinationstation = undefined
// this.tidyQuery.carrier = undefined
// this.tidyQuery.flightno = undefined
// this.tidyQuery.originstation = undefined
// this.tidyQuery.flightdate = undefined
// this.tidyQuery.destinationstation = undefined
this.getList()
},
// 收发明细
... ...