作者 小范

进出港航班申报功能完善

... ... @@ -13,6 +13,10 @@ let baseUrlBillperson = 'air-server-transport/transport/billperson'
let baseUrlResultMsg = 'air-server-transport/transport/returnmsg'
let baseUrlDynamics = 'air-server-transport/transport/aircraftStaying'
let baseUrlCancel = 'air-server-transport/transport/prediction'
let baseUrlBillcountry = 'air-server-transport/transport/country'
let baseUrlBillcreden = 'air-server-transport/transport/creden'
//进港预报 取消申报原因
export const cancelPrediction = params => { return http.post(`${baseUrlCancel}/cancelPrediction`, params); };
... ... @@ -146,6 +150,22 @@ export const addBillPerson = params => { return http.post(`${baseUrlBillperson}/
export const editBillPerson=params=>{return http.put(`${baseUrlBillperson}/editBillPerson`, params);};
//查询列表
export const selectBillPerson=params=>{return http.get(`${baseUrlBillperson}/selectBillPerson`, params);};
//国家代码
export const selectCountry=params=>{return http.get(`${baseUrlBillcountry}/selectCountry`, params);};
//证件查询
export const selectCreden=params=>{return http.get(`${baseUrlBillcreden}/selectCreden`, params);};
//保存并发送
export const sendBill=params=>{return http.post(`${baseUrlBill}/sendBill`, params);};
//查询回执列表
export const selectReturnMsg=params=>{return http.get(`${baseUrlResultMsg}/selectReturnMsg`, params);};
... ...
... ... @@ -80,7 +80,7 @@
</li>
</ul>
</aside>
<div class="tabM">
<div class="tabM" >
<TabMenu></TabMenu>
</div>
... ... @@ -509,6 +509,7 @@
min-width: 758px;
max-width: 1190px;
padding-right: 15px;
overflow-y: scroll;
}
.go{
transform:rotate(-180deg);
... ...
... ... @@ -9,7 +9,7 @@
<el-row>
<el-form :model="arrival" :rules="rules" ref="arrival" label-width="100%" class="demo-ruleForm">
<el-col :span="8">
<el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
<el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
<el-input v-model.trim="arrival.aircraftNo" @input="e => arrival.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
... ... @@ -23,10 +23,11 @@
<el-date-picker
v-model="arrival.flightDate"
type="date"
placeholder="选择日期时间"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:275px"
placeholder="选择日期">
>
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -50,29 +51,29 @@
<el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
<el-date-picker
v-model="arrival.departuredatetime"
type="date"
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:110%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="停靠机坪" prop="stayid" label-width="120px">
<el-input v-model="arrival.stayid" oninput="value=value.replace(/[^\d]/g,'')"
maxLength='7'></el-input>
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="完成装卸时间" prop="dischargecompleteddatetime" label-width="120px">
<el-date-picker
v-model="arrival.dischargecompleteddatetime"
type="date"
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:100%">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -80,11 +81,11 @@
<el-form-item label="预计抵港时间" prop="arrivaldatetime" label-width="140px">
<el-date-picker
v-model="arrival.arrivaldatetime"
type="date"
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:115%">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -136,10 +137,32 @@
</style>
<script>
import {addPrediction, sendPredictionIn} from "../../api/transport";
import loginUserInfo from '../../api/base'
export default {
data(){
return{
// pickerOptions: {
// shortcuts: [{
// text: '今天',
// onClick(picker) {
// picker.$emit('pick', new Date());
// }
// }, {
// text: '昨天',
// onClick(picker) {
// const date = new Date();
// date.setTime(date.getTime() - 3600 * 1000 * 24);
// picker.$emit('pick', date);
// }
// }, {
// text: '一周前',
// onClick(picker) {
// const date = new Date();
// date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
// picker.$emit('pick', date);
// }
// }]
// },
arrival:{
aircraftNo:undefined,
flightNo:undefined,
... ... @@ -152,7 +175,9 @@
dischargecompleteddatetime:undefined,
arrivaldatetime:undefined,
meno:undefined,
accessFlag:'0'
accessFlag:'0',
createBy:loginUserInfo.username,
updateBy:loginUserInfo.username,
},
rules: {
aircraftNo: [
... ... @@ -182,7 +207,6 @@
],
stayid: [
{required: true, message: '请输入', trigger: 'blur'},
{ pattern: /^[0-9]{6}$/, message: '请输入正确机坪号码', trigger: 'blur' }
],
dischargecompleteddatetime: [
{required: true, message: '请选择', trigger: 'blur'}
... ... @@ -201,6 +225,7 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.arrival)
addPrediction(this.arrival).then(res=>{
let response=res.data;
if(response.code=='200'){
... ... @@ -210,7 +235,8 @@
}else{
this.msg=response.msg;
}
});
}
);
} else {
console.log('error submit!!');
return false;
... ... @@ -221,6 +247,7 @@
sendForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.arrival.createBy=loginUserInfo.username
sendPredictionIn(this.arrival).then(res=>{
let response=res.data;
if(response.code=='200'){
... ...
... ... @@ -6,130 +6,123 @@
<div class="grid-content content">总申报单</div>
</el-col>
</el-row>
<el-row style="margin-left: 20px">
<el-col :span="24">
<el-button type="primary" @click="submitForm('bill')">暂存</el-button>
<el-button type="success" @click="sendForm('bill')" :disabled="statusFormater(this.type)">保存并发送</el-button>
<el-button type="warning" @click="resetForm('bill')">重置</el-button>
</el-col>
</el-row>
<el-row>
<el-form :model="bill" :rules="rules" ref="bill" label-width="100%" class="demo-ruleForm">
<el-col :span="8">
<el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px">
<el-form autocomplete="off" :model="bill" :rules="rules" ref="bill" label-width="100%" class="demo-ruleForm">
<el-col :span="6">
<el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
<el-input v-model.trim="bill.aircraftNo" placeholder="请输入" @input="e => bill.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6" id="a1">
<el-form-item label="进出港标识" prop="accessFlag" label-width="120px">
<el-select v-model="bill.accessFlag" placeholder="请选择">
<el-option label="进港" value="A"></el-option>
<el-option label="出港" value="D"></el-option>
</el-select>
<!-- <el-input v-model="bill.accessFlag" placeholder="A/D" @input="e => bill.accessFlag=inputMe(e)"></el-input>-->
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="航班号" prop="flightNo" label-width="120px">
<el-input v-model="bill.flightNo" placeholder="请输入" @input="e => bill.flightNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<el-form-item label="航班日期" prop="flightDate" label-width="120px">
<el-date-picker
v-model="bill.flightDate"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
style="width: 100%"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="进出港标识" prop="accessFlag" label-width="120px">
<el-input v-model="bill.accessFlag" placeholder="A/D" @input="e => bill.accessFlag=inputMe(e)"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机组人数" prop="aircrewSum" label-width="120px">
<el-input v-model="bill.aircrewSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国际旅客人数" prop="interPassengerSum" label-width="120px">
<el-input v-model="bill.interPassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国内旅客人数" prop="localePassengerSum" label-width="120px">
<el-input v-model="bill.localePassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国际行李件数" prop="interBaggageNum" label-width="120px">
<el-input v-model="bill.interBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国内行李件数" prop="localeBaggageNum" label-width="120px">
<el-input v-model="bill.localeBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="货邮件数" prop="goodsNum" label-width="120px">
<el-input v-model="bill.goodsNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="货邮重量(KG)" prop="goodsQuantity" label-width="120px">
<el-input v-model="bill.goodsQuantity" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6" id="a2" v-if="bill.accessFlag=='A'">
<el-form-item label="抵达港口" prop="arrivalAirport" label-width="120px" >
<el-input v-model="bill.arrivalAirport" placeholder="请输入" maxLength='3' @input="e => bill.arrivalAirport=inputMe(e)"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关区代码" prop="arrivalno" label-width="120px">
<el-input v-model="bill.arrivalno" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4' placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6" id="a3" v-if="bill.accessFlag=='A'">
<el-form-item label="抵达时间" prop="arrivaldatetime" label-width="120px">
<el-date-picker
v-model="bill.arrivaldatetime"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="请选择">
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6" id="a4" v-if="bill.accessFlag=='D'">
<el-form-item label="驶离港口" prop="departureAirport" label-width="120px">
<el-input v-model="bill.departureAirport" placeholder="请输入" maxLength='3' @input="e => bill.departureAirport=inputMe(e)"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关区代码" prop="departureno" label-width="120px">
<el-input v-model="bill.departureno" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4' placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6" id="a5" v-if="bill.accessFlag=='D'">
<el-form-item label="驶离时间" prop="departuredatetime" label-width="120px">
<el-date-picker
v-model="bill.departuredatetime"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="请选择">
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="货物申报单份数" prop="cargoBillNum" label-width="120px">
<el-input v-model="bill.cargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<el-form-item label="海关关区" prop="arrivalno" label-width="120px">
<!-- <el-input v-model="bill.arrivalno"-->
<!-- maxLength='4' placeholder="请输入"></el-input>-->
<!-- oninput="value=value.replace(/[^\d]/g,'')"-->
<el-select v-model="bill.arrivalno" placeholder="请选择" maxLength='4'>
<el-option label="4604" value="4604"></el-option>
<el-option label="4620" value="4620"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="不占座人数" prop="interPassengerSum" label-width="120px">
<el-input v-model="bill.interPassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机组人数" prop="aircrewSum" label-width="120px">
<el-input v-model="bill.aircrewSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="旅客名单份数" prop="passengerPage" label-width="120px">
<el-input v-model="bill.passengerPage" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<el-form-item label="国际旅客人数" prop="localePassengerSum" label-width="120px">
<el-input v-model="bill.localePassengerSum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机组名单份数" prop="aircrewBillNum" label-width="120px">
<el-input v-model="bill.aircrewBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<el-form-item label="国际行李件数" prop="interBaggageNum" label-width="120px">
<el-input v-model="bill.interBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机组物品申报单份数" prop="aircrewCargoBillNum" label-width="150px">
<el-input v-model="bill.aircrewCargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
<el-form-item label="货邮件数" prop="goodsNum" label-width="120px">
<el-input v-model="bill.goodsNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="货邮重量(KG)" prop="goodsQuantity" label-width="120px">
<el-input v-model="bill.goodsQuantity" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
... ... @@ -146,17 +139,226 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="meno" label-width="120px">
<el-input v-model="bill.meno" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="备注" prop="meno" label-width="120px">
<el-input v-model="bill.meno" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="国内行李件数" prop="localeBaggageNum" label-width="120px">-->
<!-- <el-input v-model="bill.localeBaggageNum" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="关区代码" prop="departureno" label-width="120px">-->
<!-- <el-input v-model="bill.departureno" oninput="value=value.replace(/[^\d]/g,'')" maxLength='4' placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="货物申报单份数" prop="cargoBillNum" label-width="120px">-->
<!-- <el-input v-model="bill.cargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="旅客名单份数" prop="passengerPage" label-width="120px">-->
<!-- <el-input v-model="bill.passengerPage" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="机组名单份数" prop="aircrewBillNum" label-width="120px">-->
<!-- <el-input v-model="bill.aircrewBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="机组物品申报单份数" prop="aircrewCargoBillNum" label-width="150px">-->
<!-- <el-input v-model="bill.aircrewCargoBillNum" oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-form>
</el-row>
<el-row style="margin-left: 120px">
<el-col :span="24">
<el-button type="primary" @click="submitForm('bill')">保 存</el-button>
</el-col>
<!--添加机组人员-->
<el-col :span="24">
<div class="grid-content content">添加机组人员</div>
</el-col>
<el-row>
<el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">
<el-row>
<el-col :span="6">
<el-form-item label="姓名" prop="name">
<el-input v-model="billperson.name" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="性别" prop="gender">
<!-- <el-input v-model="billperson.gender" placeholder="M/F"></el-input>-->
<el-select v-model="billperson.gender" placeholder="请选择">
<el-option label="M-男" value="M"></el-option>
<el-option label="F-女" value="F"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="职务" prop="gareer">
<!-- <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>-->
<el-select v-model="billperson.gareer" placeholder="请选择">
<el-option label="1-航线机长" value="1"></el-option>
<el-option label="2-副驾驶" value="2"></el-option>
<el-option label="3-乘务长" value="3"></el-option>
<el-option label="4-安全员" value="4"></el-option>
<el-option label="5-乘务员" value="5"></el-option>
<el-option label="6-机械师" value="6"></el-option>
<el-option label="7-随行人员" value="7"></el-option>
<el-option label="8-工程师" value="8"></el-option>
<el-option label="9-装载员" value="9"></el-option>
<el-option label="10-押运员" value="10"></el-option>
<el-option label="11-其它随机人员" value="11"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件号码" prop="ceterNo">
<el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国籍" prop="nationality">
<!-- <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>-->
<el-select v-model="billperson.nationality"
filterable
@click.native="getCountry"
:loading="loading" placeholder="请选择"
style="text-transform:uppercase">
<el-option
v-for="item in countryOptions"
:key="item.countryid"
:label="item.countryid+'-'+item.countrydescchn"
:value="item.countryid">
<span style="float: left">{{ item.countryid }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.countrydescchn }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="证件类型" prop="certType">
<!-- <el-input v-model="billperson.certType" placeholder="请输入"></el-input>-->
<!-- <el-select v-model="billperson.certType" placeholder="请输入">-->
<!-- <el-option-->
<!-- v-for="item in certOptions"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-select v-model="billperson.certType"
filterable
@click.native="getCreden"
:loading="loading" placeholder="请选择">
<el-option
v-for="item in certOptions"
:key="item.serialno"
:label="item.serialno+'-'+item.credenname"
:value="item.serialno">
<span style="float: left">{{ item.serialno }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.credenname }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="meno">
<el-input v-model="billperson.meno" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-row style="margin-left: 20px">
<el-col :span="24">
<el-button :disabled="btDeleStatusFormater(this.status)" type="primary" @click="submitPerson('billperson')">添加机组人员</el-button>
</el-col>
</el-row>
<el-row>
<el-table
:data="tableData2"
border
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
prop="name"
label="姓名"
width="120">
</el-table-column>
<el-table-column
prop="gender"
label="性别"
:formatter="formatGender"
width="100">
</el-table-column>
<el-table-column
prop="nationality"
label="国籍"
width="100">
</el-table-column>
<el-table-column
prop="certType"
label="证件类型"
:formatter="formatType"
width="240">
</el-table-column>
<el-table-column
prop="ceterNo"
label="证件号码"
width="160">
</el-table-column>
<el-table-column
prop="gareer"
label="职务"
:formatter="formatGareer"
width="140">
</el-table-column>
<el-table-column
fixed="right"
prop="meno"
label="备注">
</el-table-column>
<el-table-column
fixed="right"
prop=""
label="操作"
width="100">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="del(scope.$index,scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<!--分页区域-->
<div class="block">
<el-pagination
:current-page="billperson.pageNum"
:page-sizes="[10, 50, 100, 500]"
:page-size="billperson.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
</div>
</el-row>
</el-row>
<!--对话提示框-->
<el-row>
<el-dialog
... ... @@ -193,35 +395,37 @@ background-color: white;
.el-col{margin-right: 0px;}
</style>
<script>
import {addBill} from '../../api/transport'
import {addBill, addBillPerson,editBillPerson,selectBillPerson,selectCountry,selectCreden,sendBill} from '../../api/transport'
const fecha = require('fecha');
import loginUserInfo from '../../api/base'
import {getCountryCode} from "../../api/mt1201";
export default {
data(){
return{
hidden:['a2','a3','a4','a5'],
bill:{
uuid:undefined,
aircraftNo:undefined,
flightNo:undefined,
flightDate:undefined,
accessFlag:undefined,
departureAirport:undefined,
departureAirport:'CGO',
departuredatetime:undefined,
departureno:undefined,
arrivalAirport:undefined,
arrivalAirport:'CGO',
arrivaldatetime:undefined,
arrivalno:undefined,
aircrewSum:undefined,
aircrewSum:'0',
interPassengerSum:undefined,
localePassengerSum:undefined,
interBaggageNum:undefined,
localePassengerSum:'0',
interBaggageNum:'0',
localeBaggageNum:undefined,
goodsNum:undefined,
goodsNum:'0',
goodsQuantity:undefined,
cargoBillNum:3,
passengerPage:3,
aircrewBillNum:3,
aircrewCargoBillNum:3,
cargoBillNum:undefined,
passengerPage:undefined,
aircrewBillNum:undefined,
aircrewCargoBillNum:undefined,
arrivalPosition:undefined,
bussinessType:undefined,
messageid:undefined,
... ... @@ -230,8 +434,8 @@ background-color: white;
meno:undefined,
createTime:undefined,
createBy:loginUserInfo.username,
updateTime:undefined,
updateBy:loginUserInfo.username,
updateTime:undefined,
isDelete:undefined,
remark:undefined,
remark1:undefined,
... ... @@ -254,9 +458,9 @@ background-color: white;
aircrewSum: [
{required: true, message: '请输入', trigger: 'blur'}
],
interPassengerSum: [
{required: true, message: '请选择', trigger: 'blur'}
],
// interPassengerSum: [
// {required: true, message: '请选择', trigger: 'blur'}
// ],
localePassengerSum: [
{required: true, message: '请输入', trigger: 'blur'}
],
... ... @@ -266,12 +470,12 @@ background-color: white;
localeBaggageNum: [
{required: true, message: '请输入', trigger: 'blur'}
],
goodsNum: [
{required: true, message: '请输入', trigger: 'blur'}
],
goodsQuantity: [
{required: true, message: '请输入', trigger: 'blur'}
],
// goodsNum: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
// goodsQuantity: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
arrivalAirport: [
{required: true, message: '请选择', trigger: 'blur'}
],
... ... @@ -302,9 +506,9 @@ background-color: white;
aircrewCargoBillNum: [
{required: true, message: '请输入', trigger: 'blur'}
],
arrivalPosition: [
{required: true, message: '请输入', trigger: 'blur'}
],
// arrivalPosition: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
},
tableData:[{
arrivaldatetime: '161146',
... ... @@ -313,31 +517,273 @@ background-color: white;
}],
centerDialogVisible:false,
labelPosition:'left',
currentPage: 1,
pageSize:10,
total:0,
msg:undefined
msg:undefined,
billperson:{
pageNum: 1,
pageSize:10,
autoId:undefined,
name:undefined,
gender:undefined,
gareer:undefined,
nationality:undefined,
certType:undefined,
ceterNo:undefined,
createTime:undefined,
createBy:loginUserInfo.username,
updateTime:undefined,
updateBy:loginUserInfo.username,
meno:undefined,
isDelete:undefined,
billsId:undefined
},
tableData2:[],
certOptions:[],
serialno:'',
countryOptions:[],
countryid:'',
loading:false,
status:"1",
type:"1",
brules:{
name: [
{required: true, message: '请输入', trigger: 'blur'}
],
gender: [
{required: true, message: '请输入', trigger: 'blur'}
],
certType: [
{required: true, message: '请输入', trigger: 'blur'}
],
ceterNo: [
{required: true, message: '请输入', trigger: 'blur'}
],
nationality: [
{required: true, message: '请输入', trigger: 'blur'}
],
gareer: [
{required: true, message: '请输入', trigger: 'blur'}
],
},
}
},
methods:{
//新增单据方法(保存按钮)
//性别识别
formatGender: function(row,column){
return row.gender=='M'?'男':'女';
},
//职务识别
formatGareer: function(row,column){
return row.gareer=='1'?'航线机长':row.gareer=='2'?'副驾驶':row.gareer=='3'?'乘务长'
:row.gareer=='4'?'安全员':row.gareer=='5'?'乘务员':row.gareer=='6'?'机械师'
:row.gareer=='7'?'随行人员':row.gareer=='8'?'工程师':row.gareer=='9'?'装载员'
:row.gareer=='10'?'押运员':row.gareer=='11'?'其他随机人员':'';
},
//证件类型识别
formatType: function(row,column){
return row.certType=='06'?'一次有效台湾居民来往大陆通行证':row.certType=='11'?'外交护照':row.certType=='12'?'公务护照'
:row.certType=='13'?'因公普通护照':row.certType=='14'?'普通护照':row.certType=='15'?'中华人民共和国旅行证'
:row.certType=='16'?'五年有效台湾居民往来大陆通行证':row.certType=='17'?'海员证':row.certType=='20'?'中华人民共和国出入境通行证'
:row.certType=='21'?'前往港澳通行证(16页,多次有效)':row.certType=='22'?'前往港澳通行证(8页,一次有效)'
:row.certType=='23'?'前往港澳通行证':row.certType=='24'?'港澳同胞回乡证或港澳居民来往内地通行证'
:row.certType=='25'?'大陆居民来往台湾通行证':row.certType=='30'?'外国人出入境通行证':row.certType=='38'?'中华人民共和国回国证明'
:row.certType=='70'?'香港特别行政区护照':row.certType=='71'?'澳门特别行政区护照'
:row.certType=='72'?'因公往来香港澳门特别行政区通行证(官员)'
:row.certType=='73'?'因公往来香港澳门特别行政区通行证(普通)':row.certType=='74'?'中华人民共和国居民身份证':row.certType=='75'?'其他证件'
:row.certType=='98'?'其他因私证件(包括联合国通行证等)'
:row.certType=='99'?'其他因私证件(包括难民证等)':'';
},
resetForm(formName) {
this.bill.uuid = '';
this.bill.remark = false;
this.bill.remark1 = false;
this.bill.remark2 = false;
this.bill.remark3 = false;
this.$refs[formName].resetFields();
this.transList();
},
//提交机组人员按钮
submitPerson(formName){
//console.log(this.billperson.billsId)
this.$refs[formName].validate((valid) => {
if (valid) {
this.billperson.billsId=this.bill.uuid;
// let parms={billsId:this.bill.uuid}
addBillPerson(this.billperson).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.transList()
//document.getElementById("send").disabled=true;
let sy=this.type="2";
this.statusFormater(sy);
this.$refs['billperson'].resetFields();
}else{
this.msg=response.msg;
}
});
} else {
console.log('error submit!!');
return false;
}
});
},
btDeleStatusFormater:(status) => {
if(status=='1'){
return true;
}else{
return false;
}
},
statusFormater:(type) => {
if(type=='1'){
return true;
}else{
return false;
}
},
//删除机组人员按钮
del(index, row) {
// 弹框询问是否删除?
this.$confirm('此操作永久删除该消息收发记录, 是否继续?', '警告', {
confirmButtonText: '确定删除',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
editBillPerson(row).then((response) => {
console.log(row)
const res = response.data
this.$message.success(res.msg)
this.transList()
}).catch(error => {
this.$message.error(res.msg)
})
}).catch(() => {
})
},
//获取机组人员信息
transList() {
const _this = this
let params={billsId:this.bill.uuid};
console.log(params)
selectBillPerson(params).then((response) => {
const res = response.data
console.log(res)
if (res.code != '200') {
return _this.$message.error('获取消息收发记录,失败!')
}
// 获取列表数据
_this.tableData2 = res.data.list
// 获取列表的总记录数
_this.total = res.data.total
_this.$message.success('获取消息收发记录,成功!')
}).catch(error => {
// 关闭加载
_this.$message.error(error.toString())
})
},
/*获取证件*/
getCreden:function(query){
this.certOptions=[];
let params={serialno:query};
this.loading = true;
selectCreden(params).then(res =>{
if (res!=null) {
console.log(res.data.data)
setTimeout(() => {
this.loading = false;
this.certOptions=res.data.data;
}, 200);
} else {
this.certOptions = [];
}
});
},
/*获取国籍*/
getCountry:function(query){
this.countryOptions=[];
let params={countryid:query};
this.loading = true;
selectCountry(params).then(res =>{
if (res!=null) {
console.log(res.data.data)
setTimeout(() => {
this.loading = false;
this.countryOptions=res.data.data;
}, 200);
} else {
this.countryOptions = [];
}
});
},
// 隐藏进出港
update(){
this.hidden.forEach(id=>{
if (!document.getElementById(id)){
this.bill[id] = '';
}
})
},
//新增单据方法(暂存按钮)
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if(this.bill.uuid==null || this.bill.uuid=="" || this.bill.uuid==undefined){
this.bill.uuid=this.uuid();
console.log("dayinguuid"+this.bill.uuid)
}
addBill(this.bill).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
// this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
// flightDate:this.bill.flightDate}});
//document.getElementById("add").disabled=true;
let st=this.status="2";
this.btDeleStatusFormater(st);
}else{
this.msg=response.msg;
}
});
} else {
console.log('error submit!!');
return false;
}
});
},
//新增单据方法(保存并发送按钮)
sendForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
// this.bill.uuid=this.uuid();
this.bill.createBy=loginUserInfo.username
sendBill(this.bill).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
this.$router.push({path:'/queryBill',query:{aircraftNo:this.bill.aircraftNo,flightNo:this.bill.flightNo,
flightDate:this.bill.flightDate}});
//document.getElementById("add").disabled=true;
// let st=this.status="2";
// this.btDeleStatusFormater(st);
}else{
this.msg=response.msg;
}
});
} else {
console.log('error submit!!');
return false;
// return false;
}
});
},
... ... @@ -345,24 +791,59 @@ background-color: white;
defaultData(){
if(this.$route.query.uuid!=null){
let ob=Object.assign(this.bill, this.$route.query);
this.bill.arrivaldatetime=fecha.parse(ob.arrivaldatetime,'HHmmss');
if (this.$route.query.remark =='true'){
this.bill.remark = true;
};
if (this.$route.query.remark1 =='true'){
this.bill.remark1 = true;
};
if (this.$route.query.remark2 =='true'){
this.bill.remark2 = true;
};
if (this.$route.query.remark3 =='true'){
this.bill.remark3 = true;
};
this.transList();
let st=this.status="2";
this.btDeleStatusFormater(st);
let sy=this.type="2";
this.statusFormater(sy);
//this.bill.arrivaldatetime=fecha.parse(ob.arrivaldatetime,'HHmmss');
}
},
// 分页
handleSizeChange(val) {
this.pageSize=val;
this.billperson.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.submitForm();
this.billperson.pageNum=val;
this.transList();
},
// 过滤中英文
inputMe(e){
return e.replace(/[^a-zA-Z0-9.-]/g,'').toUpperCase();
}
},
uuid(){
var s = [];
var hexDigits = "0123456789abcdef";
for (var i = 0; i < 36; i++) {
s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
}
s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
s[8] = s[13] = s[18] = s[23] = "-";
var uuid = s.join("");
console.log('----'+uuid)
return uuid;
},
},
mounted(){
this.defaultData();
//this.transList();
// this.getCreden();
//this.uuid();
// this.btDeleStatusFormater("3");
}
}
</script>
... ...
... ... @@ -69,16 +69,20 @@
</style>
<script>
import { addSchedule} from "../../api/transport";
import loginUserInfo from '@/api/base.js'
import loginUserInfo from '../../api/base'
export default {
data(){
return{
configure:{
username:loginUserInfo.username,
flightNo:undefined,
ietype:undefined,
reamrk:undefined,
accessFlag:'1',
username:''
createBy:loginUserInfo.username,
updateBy:loginUserInfo.username,
},
LoginUserInfo: loginUserInfo,
rules: {
... ... @@ -105,7 +109,8 @@
let _this = this;
this.$refs[formName].validate((valid) => {
if (valid) {
this.configure.username=_this.LoginUserInfo.username
this.configure.createBy=loginUserInfo.username
this.configure.username=loginUserInfo.username
console.log(this.configure.flightNo)
addSchedule(this.configure).then(res=>{
let response=res.data;
... ...
... ... @@ -9,7 +9,7 @@
<el-row>
<el-form :model="confirmatory" :rules="rules" ref="confirmatory" label-width="100%" class="demo-ruleForm">
<el-col :span="8">
<el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px">
<el-form-item label="航空器注册" prop="aircraftNo" label-width="120px">
<el-input v-model.trim="confirmatory.aircraftNo" @input="e => confirmatory.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
... ... @@ -34,11 +34,11 @@
<el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
<el-date-picker
v-model="confirmatory.departuredatetime"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:100%">
</el-date-picker>
</el-form-item>
</el-col>
... ... @@ -58,18 +58,18 @@
<el-form-item label="抵港时间" prop="arrivaldatetime" label-width="120px">
<el-date-picker
v-model="confirmatory.arrivaldatetime"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="停靠机坪" prop="stayid" label-width="120px">
<el-input v-model="confirmatory.stayid" oninput="value=value.replace(/[^\d]/g,'')"
maxLength='7'></el-input>
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
... ... @@ -120,6 +120,7 @@
</style>
<script>
import {addConfirm, sendConfirmIn} from "../../api/transport";
import loginUserInfo from '../../api/base'
export default {
data(){
... ... @@ -134,7 +135,9 @@
arrivaldatetime:undefined,
stayid:undefined,
meno:undefined,
accessFlag:'0'
accessFlag:'0',
createBy:loginUserInfo.username,
updateBy:loginUserInfo.username,
},
rules: {
aircraftNo: [
... ... @@ -195,6 +198,9 @@
sendForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
console.log(this.confirmatory)
this.confirmatory.createBy=loginUserInfo.username
sendConfirmIn(this.confirmatory).then(res=>{
let response=res.data;
if(response.code=='200'){
... ...
... ... @@ -9,7 +9,7 @@
<el-row>
<el-form :model="declare" :rules="rules" ref="declare" label-width="100%" class="demo-ruleForm">
<el-col :span="8">
<el-form-item label="航空器注册编号" prop="aircraftNo" label-width="120px">
<el-form-item label="航空器注册" prop="aircraftNo" label-width="120px">
<el-input v-model.trim="declare.aircraftNo" @input="e => declare.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
... ... @@ -32,12 +32,20 @@
</el-col>
<el-col :span="8">
<el-form-item label="离港时间" prop="departuredatetime" label-width="120px">
<el-input v-model="declare.departuredatetime"
type="date"
value-format="yyyyMMdd"
format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">></el-input>
<!-- <el-input v-model="declare.departuredatetime"-->
<!-- type="date"-->
<!-- value-format="yyyyMMdd"-->
<!-- format="yyyyMMdd"-->
<!-- style="width:100%"-->
<!-- placeholder="任意时间点">></el-input>-->
<el-date-picker
v-model="declare.departuredatetime"
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -100,6 +108,7 @@
</style>
<script>
import {addConfirm, sendConfirmOut} from "../../api/transport";
import loginUserInfo from '../../api/base'
export default {
data(){
... ... @@ -112,7 +121,9 @@
departuredatetime:undefined,
customDistrictNo:undefined,
meno:undefined,
accessFlag:'1'
accessFlag:'1',
createBy:loginUserInfo.username,
updateBy:loginUserInfo.username,
},
rules: {
aircraftNo: [
... ... @@ -166,6 +177,7 @@
sendForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.declare.createBy=loginUserInfo.username
sendConfirmOut(this.declare).then(res=>{
let response=res.data;
if(response.code=='200'){
... ...
... ... @@ -9,7 +9,7 @@
<el-row>
<el-form :model="departure" :rules="rules" ref="departure" label-width="100%" class="demo-ruleForm">
<el-col :span="8">
<el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
<el-form-item label="航空器注册码" prop="aircraftNo" label-width="120px">
<el-input v-model.trim="departure.aircraftNo" @input="e => departure.aircraftNo=inputMe(e)"></el-input>
</el-form-item>
</el-col>
... ... @@ -48,12 +48,21 @@
</el-col>
<el-col :span="8">
<el-form-item label="预计离港时间" prop="departuredatetime" label-width="120px">
<el-input v-model="departure.departuredatetime"
type="date"
format="yyyyMMdd"
value-format="yyyyMMdd"
style="width:100%"
placeholder="任意时间点">></el-input>
<!-- <el-input v-model="departure.departuredatetime"-->
<!-- type="datetime"-->
<!-- placeholder="选择日期时间"-->
<!-- value-format="yyyyMMddHHmmss"-->
<!-- format="yyyyMMddHHmmss"-->
<!-- style="width:100%"-->
<!-- placeholder="任意时间点">></el-input>-->
<el-date-picker
v-model="departure.departuredatetime"
type="datetime"
placeholder="选择日期时间"
value-format="yyyyMMddHHmmss"
format="yyyyMMddHHmmss"
style="width:100%">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -109,6 +118,8 @@
</style>
<script>
import {addPrediction, sendPredictionOut} from "../../api/transport";
import loginUserInfo from '../../api/base'
export default {
data(){
... ... @@ -123,7 +134,9 @@
stayid:undefined,
departuredatetime:undefined,
meno:undefined,
accessFlag:'1'
accessFlag:'1',
createBy:loginUserInfo.username,
updateBy:loginUserInfo.username,
},
rules: {
aircraftNo: [
... ... @@ -152,7 +165,6 @@
],
stayid: [
{required: true, message: '请输入', trigger: 'blur'},
{ pattern: /^[0-9]{6}$/, message: '请输入正确机坪号码', trigger: 'blur' }
],
},
tableData:[],
... ... @@ -185,6 +197,8 @@
sendForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.departure.createBy=loginUserInfo.username
sendPredictionOut(this.departure).then(res=>{
let response=res.data;
if(response.code=='200'){
... ...
... ... @@ -65,39 +65,44 @@
<el-table-column
prop="flightno"
label="航班号"
width="140"
width="100"
>
</el-table-column>
<el-table-column
prop="flightdate"
label="航班日期"
width="120"
width="100"
/>
<el-table-column
prop="flightno"
prop="customcode"
label="海关关区"
width="120"
width="100"
/>
<el-table-column
prop="customcode"
label="注册海关关区"
prop="statusmsg"
label="回执内容"
width="120"
/>
<el-table-column
prop="registeredcustom"
label="注册海关关区"
width="100"
/>
<el-table-column
prop="aircrafttype"
label="航空器备案类型"
width="120"
width="110"
/>
<el-table-column
prop="callport"
label="停靠港"
width="120"
width="100"
>
</el-table-column>
<el-table-column
prop="callarea"
label="停机位"
width="120"
width="100"
>
</el-table-column>
<el-table-column
... ... @@ -109,7 +114,6 @@
<el-table-column
prop="remark"
label="海关备注"
width="120"
>
</el-table-column>
<el-table-column
... ... @@ -287,6 +291,7 @@
callarea: '',
reasons: '',
remark: '',
userid:''
},
rules: {
}
... ...
... ... @@ -144,6 +144,8 @@
<script>
const fecha = require('fecha');
import {addFlightPlan, sendFlightPlan} from "../../api/transport";
import loginUserInfo from '@/api/base.js'
export default {
data(){
return{
... ... @@ -157,7 +159,9 @@
currentTakeoffTime:undefined,
currentLandingTime:undefined,
linesType:'2',
meno:undefined
meno:undefined,
createBy:loginUserInfo.username,
updateBy:''
},
rules:{
flightNo: [
... ...
... ... @@ -69,15 +69,20 @@
</style>
<script>
import {addSchedule} from "../../api/transport";
import loginUserInfo from '../../api/base'
export default {
data(){
return{
outConfigure:{
username:loginUserInfo.username,
flightNo:undefined,
ietype:undefined,
reamrk:undefined,
accessFlag:'2'
accessFlag:'2',
createBy:loginUserInfo.username,
updateBy:loginUserInfo.username,
},
rules: {
flightNo: [
... ... @@ -102,6 +107,9 @@
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.outConfigure.createBy=loginUserInfo.username
this.outConfigure.username=loginUserInfo.username
addSchedule(this.outConfigure).then(res=>{
let response=res.data;
if(response.code=='200'){
... ...
... ... @@ -61,7 +61,7 @@
</el-table-column>
<el-table-column
prop="aircraftNo"
label="航空器注册码">
label="航空器注册码">
</el-table-column>
<el-table-column
prop="departurePort"
... ... @@ -75,18 +75,20 @@
prop="customDistrictNo"
label="关区代码">
</el-table-column>
<el-table-column
prop="transportflag"
label="运输计划">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="transportflag"-->
<!-- label="运输计划">-->
<!-- </el-table-column>-->
<el-table-column
prop="departuredatetime"
label="离港时间"
width="120">
width="150">
</el-table-column>
<el-table-column
prop="statusMsg"
label="海关回执">
label="海关回执"
width="120"
show-overflow-tooltip>
</el-table-column>
<el-table-column
fixed="right"
... ... @@ -115,7 +117,7 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:current-page="pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
... ... @@ -173,6 +175,7 @@
</style>
<script>
import {addAircraftStaying, editPrediction, selectPrediction, selectReturnMsg, cancelPrediction} from "../../api/transport";
import loginUserInfo from "../../api/base";
export default {
data(){
... ... @@ -183,7 +186,7 @@
},
rules: {},
labelPosition:'left',
currentPage: 1,
pageNum: 1,
pageSize:10,
total:0,
tableData:[],
... ... @@ -204,15 +207,17 @@
selectDetail(index,row){
this.gridData=[];
this.dialogTableVisible=true;
console.log(row.messageid)
let params={messageid:row.messageid};
selectReturnMsg(params).then(res=>{
let response=res.data.data;
console.log(response)
//console.log(response)
this.gridData=response;
});
},
//取消申报
trans_cancle(row){
console.log(row)
this.dialogFormVisible=true;
this.row2=row;
},
... ... @@ -248,13 +253,13 @@
this.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.pageNum=val;
this.submitForm();
},
//获取进港预报查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo,
pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryArrival.flightNo,
flightDate: this.queryArrival.flightDate
};
this.tableloading = true;
... ...
... ... @@ -53,16 +53,16 @@
<el-table-column
fixed="left"
label="操作"
width="200">
width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="handleEdit(scope.$index, scope.row)">编辑</el-button>
<el-button
size="mini"
type="primary"
@click="showPerson(scope.$index,scope.row)">添加机组人员</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="showPerson(scope.$index,scope.row)">添加机组人员</el-button>-->
</template>
</el-table-column>
<el-table-column
... ... @@ -103,7 +103,10 @@
</el-table-column>
<el-table-column
prop="statusMsg"
label="海关回执">
label="海关回执"
width="140"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
fixed="right"
... ... @@ -115,7 +118,7 @@
size="mini"
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<el-button size="mini" type="success">保存并发送</el-button>
<!-- <el-button size="mini" type="success">发送</el-button>-->
<el-button
size="mini"
type="danger"
... ... @@ -129,8 +132,8 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 20, 30, 40]"
:current-page="pageNum"
:page-sizes="[10, 50, 100, 500]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
... ... @@ -149,87 +152,87 @@
</el-dialog>
</el-main>
<!--添加机组人员dialog-->
<el-row>
<el-dialog title="机组人员添加" :visible.sync="dialogTableVisibles" >
<el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">
<el-row>
<el-col :span="10">
<el-form-item label="姓名" prop="name">
<el-input v-model="billperson.name" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="性别" prop="gender">
<el-input v-model="billperson.gender" placeholder="M/F"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="证件类型" prop="certType">
<el-input v-model="billperson.certType" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="证件号码" prop="ceterNo">
<el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="国籍" prop="nationality">
<el-input v-model="billperson.nationality" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="职务" prop="gareer">
<el-input v-model="billperson.gareer" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="meno">
<el-input v-model="billperson.meno" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>
</el-row>
</el-form>
<el-row>
<el-table
:data="tableData2"
border
style="width: 100%;margin-bottom: 10px">
<el-table-column
fixed="left"
prop="name"
label="姓名">
</el-table-column>
<el-table-column
prop="gender"
label="性别">
</el-table-column>
<el-table-column
prop="nationality"
label="国籍">
</el-table-column>
<el-table-column
prop="certType"
label="证件类型">
</el-table-column>
<el-table-column
prop="ceterNo"
label="证件编辑">
</el-table-column>
<el-table-column
prop="gareer"
label="职务">
</el-table-column>
<el-table-column
fixed="right"
prop="meno"
label="备注">
</el-table-column>
</el-table>
</el-row>
</el-dialog>
</el-row>
<!-- <el-row>-->
<!-- <el-dialog title="机组人员添加" :visible.sync="dialogTableVisibles" >-->
<!-- <el-form :model="billperson" :rules="brules" ref="billperson" label-width="130px" class="demo-ruleForm">-->
<!-- <el-row>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="姓名" prop="name">-->
<!-- <el-input v-model="billperson.name" placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="性别" prop="gender">-->
<!-- <el-input v-model="billperson.gender" placeholder="M/F"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="证件类型" prop="certType">-->
<!-- <el-input v-model="billperson.certType" placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="证件号码" prop="ceterNo">-->
<!-- <el-input v-model="billperson.ceterNo" placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="国籍" prop="nationality">-->
<!-- <el-input v-model="billperson.nationality" placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item label="职务" prop="gareer">-->
<!-- <el-input v-model="billperson.gareer" placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24">-->
<!-- <el-form-item label="备注" prop="meno">-->
<!-- <el-input v-model="billperson.meno" placeholder="请输入"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="24"> <el-button type="primary" @click="submitPerson('billperson')" style="float: right">提 交</el-button></el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- <el-row>-->
<!-- <el-table-->
<!-- :data="tableData2"-->
<!-- border-->
<!-- style="width: 100%;margin-bottom: 10px">-->
<!-- <el-table-column-->
<!-- fixed="left"-->
<!-- prop="name"-->
<!-- label="姓名">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="gender"-->
<!-- label="性别">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="nationality"-->
<!-- label="国籍">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="certType"-->
<!-- label="证件类型">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="ceterNo"-->
<!-- label="证件编辑">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="gareer"-->
<!-- label="职务">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- prop="meno"-->
<!-- label="备注">-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-row>-->
<!-- </el-dialog>-->
<!-- </el-row>-->
<!--对话提示框-->
<el-row>
<el-dialog
... ... @@ -267,6 +270,7 @@
</style>
<script>
import { addBillPerson, editBill, selectBill, selectReturnMsg} from "../../api/transport";
import loginUserInfo from "../../api/base";
export default {
data(){
... ... @@ -277,47 +281,47 @@
flightDate:undefined,
accessFlag:undefined,
},
billperson:{
autoId:undefined,
name:undefined,
gender:undefined,
gareer:undefined,
nationality:undefined,
certType:undefined,
ceterNo:undefined,
createTime:undefined,
createBy:loginUserInfo.username,
updateTime:undefined,
updateBy:loginUserInfo.username,
meno:undefined,
isDelete:undefined,
billsId:undefined
},
brules:{
name: [
{required: true, message: '请输入', trigger: 'blur'}
],
gender: [
{required: true, message: '请输入', trigger: 'blur'}
],
certType: [
{required: true, message: '请输入', trigger: 'blur'}
],
ceterNo: [
{required: true, message: '请输入', trigger: 'blur'}
],
nationality: [
{required: true, message: '请输入', trigger: 'blur'}
],
gareer: [
{required: true, message: '请输入', trigger: 'blur'}
],
},
dialogTableVisibles:false,
// billperson:{
// autoId:undefined,
// name:undefined,
// gender:undefined,
// gareer:undefined,
// nationality:undefined,
// certType:undefined,
// ceterNo:undefined,
// createTime:undefined,
// createBy:loginUserInfo.username,
// updateTime:undefined,
// updateBy:loginUserInfo.username,
// meno:undefined,
// isDelete:undefined,
// billsId:undefined
// },
// brules:{
// name: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
// gender: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
// certType: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
// ceterNo: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
// nationality: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
// gareer: [
// {required: true, message: '请输入', trigger: 'blur'}
// ],
// },
// dialogTableVisibles:false,
tableloading:false,
rules:{},
labelPosition:'left',
currentPage: 1,
pageNum: 1,
pageSize:10,
total:0,
tableData:[],
... ... @@ -330,30 +334,30 @@
},
methods: {
//添加机组人员按钮
showPerson(index,row){
this.dialogTableVisibles=true;
this.billperson.billsId=row.uuid;
},
// showPerson(index,row){
// this.dialogTableVisibles=true;
// this.billperson.billsId=row.uuid;
// },
//提交按钮
submitPerson(formName){
//console.log(this.billperson.billsId)
this.$refs[formName].validate((valid) => {
if (valid) {
addBillPerson(this.billperson).then(res=>{
let response=res.data;
if(response.code=='200'){
this.centerDialogVisible=true;
this.msg=response.msg;
}else{
this.msg=response.msg;
}
});
} else {
console.log('error submit!!');
return false;
}
});
},
// submitPerson(formName){
// //console.log(this.billperson.billsId)
// this.$refs[formName].validate((valid) => {
// if (valid) {
// addBillPerson(this.billperson).then(res=>{
// let response=res.data;
// if(response.code=='200'){
// this.centerDialogVisible=true;
// this.msg=response.msg;
// }else{
// this.msg=response.msg;
// }
// });
// } else {
// console.log('error submit!!');
// return false;
// }
// });
// },
//查询回执列表
selectDetail(index,row){
this.gridData=[];
... ... @@ -366,12 +370,13 @@
},
//获取单据列表
submitForm(){
let params={currentPage:this.currentPage,pageSize:this.pageSize,flightNo:this.queryBill.flightNo,
let params={pageNum:this.pageNum,pageSize:this.pageSize,flightNo:this.queryBill.flightNo,
aircraftNo:this.queryBill.aircraftNo,flightDate:this.queryBill.flightDate,accessFlag:this.queryBill.accessFlag};
this.tableloading=true;
selectBill(params).then(res=>{
let response=res.data.data;
this.tableData=response.list;
console.log(this.tableData)
this.tableloading=false;
this.total=response.total;
});
... ... @@ -410,14 +415,16 @@
},
//编辑单据查询
handleEdit(index,row){
this.$router.push({path:'/bill',query:row})
this.$router.push({path:'/bill',query:row});
},
//分页
handleSizeChange(val) {
this.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.pageNum=val;
this.submitForm();
}
},
... ...
... ... @@ -76,10 +76,10 @@
label="报文操作"
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>-->
<el-button
size="mini"
type="danger"
... ... @@ -93,7 +93,7 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:current-page="pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
... ... @@ -142,7 +142,7 @@
flightNo:undefined,
},
labelPosition:'left',
currentPage: 1,
pageNum: 1,
pageSize:10,
total:0,
tableloading:false,
... ... @@ -168,13 +168,13 @@
this.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.pageNum=val;
this.submitForm();
},
//获取进港航班配置查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,
pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfigure.flightNo,
};
this.tableloading = true;
selectSchedule(params).then(res => {
... ...
... ... @@ -61,7 +61,7 @@
</el-table-column>
<el-table-column
prop="aircraftNo"
label="航空器注册码">
label="航空器注册码">
</el-table-column>
<el-table-column
prop="arrivalPort"
... ... @@ -78,12 +78,12 @@
<el-table-column
prop="departuredatetime"
label="离港时间"
width="120">
width="150">
</el-table-column>
<el-table-column
prop="arrivaldatetime"
label="抵港时间"
width="120">
width="150">
</el-table-column>
<el-table-column
prop="statusMsg"
... ... @@ -112,7 +112,7 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:current-page="pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
... ... @@ -162,7 +162,7 @@
flightDate:undefined,
},
labelPosition:'left',
currentPage: 1,
pageNum: 1,
pageSize:10,
total:0,
tableloading:false,
... ... @@ -188,13 +188,13 @@
this.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.pageNum=val;
this.submitForm();
},
//获取进港确报查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo,
pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryConfirmatory.flightNo,
flightDate: this.queryConfirmatory.flightDate
};
this.tableloading = true;
... ...
... ... @@ -68,7 +68,7 @@
</el-table-column>
<el-table-column
prop="aircraftNo"
label="航空器注册码"
label="航空器注册码"
width="120">
</el-table-column>
<el-table-column
... ... @@ -89,7 +89,8 @@
</el-table-column>
<el-table-column
prop="departuredatetime"
label="离港时间">
label="离港时间"
width="150">
</el-table-column>
<el-table-column
prop="statusMsg"
... ... @@ -118,7 +119,7 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:current-page="pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
... ... @@ -169,7 +170,7 @@
flightDate:undefined,
},
labelPosition:'left',
currentPage: 1,
pageNum: 1,
pageSize:10,
total:0,
tableloading:false,
... ... @@ -195,13 +196,13 @@
this.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.pageNum=val;
this.submitForm();
},
//获取进港确报查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryDeclare.flightNo,
pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeclare.flightNo,
flightDate: this.queryDeclare.flightDate
};
this.tableloading = true;
... ...
... ... @@ -66,7 +66,7 @@
</el-table-column>
<el-table-column
prop="aircraftNo"
label="航空器注册码"
label="航空器注册码"
width="120">
</el-table-column>
<el-table-column
... ... @@ -87,7 +87,8 @@
</el-table-column>
<el-table-column
prop="departuredatetime"
label="离港时间">
label="离港时间"
width="150">
</el-table-column>
<el-table-column
prop="statusMsg"
... ... @@ -119,7 +120,7 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:current-page="pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
... ... @@ -187,7 +188,7 @@
flightDate:undefined,
},
labelPosition:'left',
currentPage: 1,
pageNum: 1,
pageSize:10,
total:0,
tableData:[],
... ... @@ -219,13 +220,13 @@
this.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.pageNum=val;
this.submitForm();
},
//获取出港预报查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryDeparture.flightNo,
pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryDeparture.flightNo,
flightDate: this.queryDeparture.flightDate
};
this.tableloading = true;
... ...
... ... @@ -76,10 +76,10 @@
label="报文操作"
width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
@click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>-->
<el-button
size="mini"
type="danger"
... ... @@ -93,7 +93,7 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:current-page="pageNum"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
... ... @@ -142,7 +142,7 @@
flightNo:undefined,
},
labelPosition:'left',
currentPage: 1,
pageNum: 1,
pageSize:10,
total:0,
tableloading:false,
... ... @@ -168,13 +168,13 @@
this.pageSize=val;
},
handleCurrentChange(val) {
this.currentPage=val;
this.pageNum=val;
this.submitForm();
},
//获取出港航班配置查询列表
submitForm() {
let params = {
currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightConfigure.flightNo,
pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryFlightConfigure.flightNo,
};
this.tableloading = true;
selectSchedule(params).then(res => {
... ...
... ... @@ -103,7 +103,8 @@
</el-table-column>
<el-table-column
prop="statusMsg"
label="海关回执">
label="海关回执"
show-overflow-tooltip>
</el-table-column>
<el-table-column
fixed="right"
... ... @@ -139,11 +140,11 @@
<!-- 查看回执弹框-->
<el-dialog title="回执明细" :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column prop="" label="操作时间" fixed="left" width="150"></el-table-column>
<el-table-column property="createTime" label="操作时间" fixed="left" width="150"></el-table-column>
<el-table-column property="createBy" label="操作人" ></el-table-column>
<el-table-column property="flightNo" label="航班号" ></el-table-column>
<el-table-column property="flightDate" label="航班日期" ></el-table-column>
<el-table-column property="receiptContent" label="回执内容" fixed="right" width="300"></el-table-column>
<el-table-column property="receiptContent" label="回执内容" show-overflow-tooltip fixed="right" width="300"></el-table-column>
</el-table>
</el-dialog>
</el-main>
... ... @@ -169,6 +170,8 @@
</style>
<script>
import {selectFlightPlan, editFlightPlan, selectReturnMsg} from "../../api/transport";
import loginUserInfo from '@/api/base.js'
export default {
data(){
return{
... ...