作者 小范

进港原始舱单界面优化

... ... @@ -32,10 +32,9 @@
<div class="grid-content">
<el-col :span="9" class="pub">
<div class="grid-content">
<span>
主单号:
</span>
<el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input>
<el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 200px">
<template slot="prepend">主单号</template>
</el-input>
</div>
</el-col>
<el-col :span="2" class="pub">
... ... @@ -75,7 +74,8 @@
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
@selection-change="handleSelectionChange"
row-key="uuid"
border
... ... @@ -153,7 +153,7 @@
<el-table-column
prop="operation"
label="操作"
width="450"
width="380"
show-overflow-tooltip>
<template slot-scope="scope">
<el-row>
... ... @@ -178,7 +178,7 @@
size="mini"
type="primary"
@click="handleSend(scope.$index, scope.row)"
:disabled="btSendStatusFormater(scope.row.status)">发舱单报
:disabled="btSendStatusFormater(scope.row.status)">发舱单报
</el-button>
<el-button
size="mini"
... ... @@ -191,26 +191,24 @@
<el-button
v-if="scope.row.awbh==''||scope.row.awbh==null"
size="mini"
type="success"
@click="Importallocation(scope.$index, scope.row)">分拨申请
</el-button>
<el-button
v-else
disabled=""
size="mini" type="success"
size="mini"
@click="Importallocation(scope.$index, scope.row)">分拨申请
</el-button>
<!-- style="background-color: #63cdda;color: white"-->
<el-button
v-if="scope.row.awbh==''||scope.row.awbh==null"
size="mini"
type="primary"
@click="Allocatearrive(scope.$index, scope.row)">分拨运抵
</el-button>
<el-button
v-else
disabled=""
size="mini" type="primary"
size="mini"
@click="Allocatearrive(scope.$index, scope.row)">分拨运抵
</el-button>
<!-- style="background-color:#778beb;color: white"-->
... ... @@ -218,13 +216,13 @@
size="mini"
style="background-color:#f19066;color: white"
@click="handleUpdate(scope.$index, scope.row)"
:disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报
:disabled="btEditStatusFormater(scope.row.status)">发修改报
</el-button>
<el-button
size="mini"
type="danger"
@click="handleDelete(scope.$index, scope.row)"
:disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报
:disabled="btDeleStatusFormater(scope.row.status)">发删除报
</el-button>
</el-row>
... ... @@ -244,59 +242,79 @@
<div class="grid-content content">航班信息</div>
</el-col>
<el-row class="flightInfo">
<el-col :span="4">
<el-form-item label="运单号" prop="awba">
<el-col :span="5" style="margin-left: -40px">
<el-form-item prop="awba">
<div v-if="dialogStatus === 'update'">
<el-input disabled="" v-model="ruleForm.awba"></el-input>
<el-input disabled="" v-model="ruleForm.awba" style="width: 200px">
<template slot="prepend">运单号</template>
</el-input>
</div>
<div v-else>
<el-input v-model="ruleForm.awba"></el-input>
<el-input v-model="ruleForm.awba" style="width: 200px"></el-input>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="航班号" prop="flightno">
<el-input disabled="" v-model="ruleForm.flightno"></el-input>
<el-col :span="5">
<el-form-item prop="flightno">
<el-input disabled="" v-model="ruleForm.flightno" style="width: 200px">
<template slot="prepend">航班号</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="originstation">
<el-input disabled="" v-model="ruleForm.originstation" style="width: 200px">
<template slot="prepend">航段</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="航班日期" required>
<el-col :span="24">
<el-col :span="7">
<el-form-item label="" required>
<el-form-item prop="flightdate">
<div class="ip">
航班日期
</div>
<el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false"
v-model="ruleForm.flightdate"
style="width: 100%;"></el-date-picker>
style="width: 125px">
</el-date-picker>
</el-form-item>
</el-col>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="航段" prop="originstation">
<el-input disabled="" v-model="ruleForm.originstation"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="是否分批" prop="splitcode">
<el-select v-model="ruleForm.splitcode" placeholder="">
</el-row>
<el-row class="flightInfo">
<el-col :span="18" style="margin-left: -40px">
<el-form-item prop="splitcode">
<div class="ip">
是否分批
</div>
<el-select v-model="ruleForm.splitcode" placeholder="" style="width: 110px">
<el-option v-for="item in splitcodes" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button>
<el-col :span="2">
<el-form-item prop="splitcode">
<el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row class="flightInfo">
<el-col :span="4">
<el-col :span="6" style="margin-left: -40px">
<div v-if="FenStatus === 'addAwbh'">
<el-form-item label="分单号" prop="awbh">
<el-input v-model="ruleForm.awbh"></el-input>
<el-form-item prop="awbh">
<el-input v-model="ruleForm.awbh" style="width: 200px">
<template slot="prepend">分单号</template>
</el-input>
</el-form-item>
</div>
<div v-else>
<el-form-item style="display: none" label="分单号" prop="awbh">
<el-input v-model="ruleForm.awbh"></el-input>
<el-form-item style="display: none" prop="awbh" >
<el-input v-model="ruleForm.awbh" style="width: 200px">
<template slot="prepend">分单号</template>
</el-input>
</el-form-item>
</div>
</el-col>
... ... @@ -315,44 +333,64 @@
</el-col>
</el-row>
<el-row style="margin-bottom: 0px;">
<el-col :span="3">
<el-form-item label="起始站" prop="awbinfo.sairportid" >
<el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-col :span="6" style="margin-left: -40px">
<el-form-item prop="awbinfo.sairportid" >
<el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
<template slot="prepend">起始站</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="承运人1" prop="awbinfo.by1">
<el-input v-model="ruleForm.awbinfo.by1" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-col :span="6">
<el-form-item prop="awbinfo.by1">
<el-input v-model="ruleForm.awbinfo.by1" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
<template slot="prepend">承运人1</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="到达站1" prop="awbinfo.dest1">
<el-input v-model="ruleForm.awbinfo.dest1"></el-input>
<el-col :span="6">
<el-form-item prop="awbinfo.dest1">
<el-input v-model="ruleForm.awbinfo.dest1" style="width: 200px">
<template slot="prepend">到达站1</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="承运人2" prop="awbinfo.by2">
<el-input v-model="ruleForm.awbinfo.by2" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-col :span="6">
<el-form-item prop="awbinfo.by2">
<el-input v-model="ruleForm.awbinfo.by2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
<template slot="prepend">承运人2</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="到达站2" prop="awbinfo.dest2">
<el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()"></el-input>
</el-row>
<el-row>
<el-col :span="6" style="margin-left: -40px">
<el-form-item prop="awbinfo.dest2">
<el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
<template slot="prepend">到达站2</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="承运人3" prop="awbinfo.by3">
<el-input v-model="ruleForm.awbinfo.by3" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-col :span="6">
<el-form-item prop="awbinfo.by3">
<el-input v-model="ruleForm.awbinfo.by3" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
<template slot="prepend">承运人3</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="到达站3" prop="awbinfo.dest3">
<el-input v-model="ruleForm.awbinfo.dest3" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-col :span="6">
<el-form-item prop="awbinfo.dest3">
<el-input v-model="ruleForm.awbinfo.dest3" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
<template slot="prepend">到达站3</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="目的站" prop="awbinfo.eairportid">
<el-input v-model="ruleForm.awbinfo.eairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input>
<el-col :span="6">
<el-form-item prop="awbinfo.eairportid">
<el-input v-model="ruleForm.awbinfo.eairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
<template slot="prepend">目的站</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -364,58 +402,55 @@
</el-row>
<el-row style="margin-bottom: 0px;">
<el-row class="product">
<el-col :span="6">
<el-form-item label="总件数" prop="awbinfo.pcs">
<el-input type="number" v-model="ruleForm.awbinfo.pcs" ></el-input>
<el-col :span="6" style="margin-left: -40px">
<el-form-item label="" prop="awbinfo.pcs">
<el-input type="number" v-model="ruleForm.awbinfo.pcs" style="width: 200px">
<template slot="prepend">总件数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="总重量" prop="awbinfo.weight">
<el-input type="number" v-model="ruleForm.awbinfo.weight"></el-input>
<el-form-item label="" prop="awbinfo.weight">
<el-input type="number" v-model="ruleForm.awbinfo.weight" style="width: 200px">
<template slot="prepend">总重量</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="舱单件数" prop="piece">
<el-input type="number" v-model="ruleForm.piece"></el-input>
<el-form-item label="" prop="piece">
<el-input type="number" v-model="ruleForm.piece" style="width: 200px">
<template slot="prepend">舱单件数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="舱单重量" prop="weight">
<el-input type="number" v-model="ruleForm.weight"></el-input>
<el-form-item label="" prop="weight">
<el-input type="number" v-model="ruleForm.weight" style="width: 200px">
<template slot="prepend">舱单重量</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row class="product">
<el-col :span="6">
<el-form-item label="特货代码" prop="specopeid">
<el-input v-model="ruleForm.awbinfo.specopeid"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="付费方式" prop="paymodel">
<el-select v-model="ruleForm.awbinfo.paymodel" placeholder="" style="display:inline">
<el-option v-for="item in paymodel" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
<el-col :span="6" style="margin-left: -40px">
<el-form-item label="" prop="specopeid">
<el-input v-model="ruleForm.awbinfo.specopeid" style="width: 200px">
<template slot="prepend">特货代码</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="海关状态" prop="awbinfo.awbtype">
<el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="display:inline">
<el-option v-for="(item,index) in customext5" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="海关关区" prop="customcode">
<el-col :span="9" style="margin-left: 55px">
<el-form-item label="" prop="customcode">
<div class="ip">
海关关区
</div>
<el-select v-model="ruleForm.customcode"
filterable
allow-create
default-first-option
remote
:remote-method="remoteMethod2"
:loading="loading" placeholder="请选择" style="display:inline">
:loading="loading" placeholder="请选择" style="width: 115px">
<el-option
v-for="item in customcodes"
:key="item.customcode"
... ... @@ -427,11 +462,35 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="9" style="margin-left: -35px">
<el-form-item label="" prop="paymodel">
<div class="ip">
付费方式
</div>
<el-select v-model="ruleForm.awbinfo.paymodel" placeholder="" style="width: 110px">
<el-option v-for="item in paymodel" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row class="product">
<el-col :span="12">
<el-form-item label="货物描述" prop="goodsname">
<el-input v-model="ruleForm.goodsname"></el-input>
<el-col :span="12" style="margin-left: -40px" >
<el-form-item label="" prop="awbinfo.awbtype">
<div class="ip">
海关状态
</div>
<el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="width: 110px">
<el-option v-for="(item,index) in customext5" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" style="margin-left: -10px">
<el-form-item label="" prop="goodsname">
<el-input v-model="ruleForm.goodsname" style="width: 250px">
<template slot="prepend">货物描述</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -443,19 +502,39 @@
</el-col>
</el-row>
<el-row style="margin-bottom: 0px;">
<el-col :span="6">
<el-form-item label="发货人称" prop="awbinfo.shprname">
<el-input v-model="ruleForm.awbinfo.shprname"></el-input>
<el-col :span="6" style="margin-left: -40px">
<el-form-item label="" prop="awbinfo.shprname">
<el-input v-model="ruleForm.awbinfo.shprname" style="width: 200px">
<template slot="prepend">发货人称</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国家代码" prop="awbinfo.shprcountyr">
<el-form-item label="" prop="awbinfo.shpraddress">
<el-input v-model="ruleForm.awbinfo.shpraddress" style="width: 200px">
<template slot="prepend">地址</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="" prop="awbinfo.shprtel">
<el-input v-model="ruleForm.awbinfo.shprtel" style="width: 200px">
<template slot="prepend">电话</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="" prop="awbinfo.shprcountyr">
<div class="ip">
国家代码
</div>
<el-select v-model="ruleForm.awbinfo.shprcountyr"
filterable
allow-create
default-first-option
remote
:remote-method="remoteMethod"
:remote-method="remoteMethod" style="width: 110px"
:loading="loading" placeholder="请选择">
<el-option
v-for="item in shprcountyrs"
... ... @@ -468,16 +547,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地址" prop="awbinfo.shpraddress">
<el-input v-model="ruleForm.awbinfo.shpraddress"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="电话" prop="awbinfo.shprtel">
<el-input v-model="ruleForm.awbinfo.shprtel"></el-input>
</el-form-item>
</el-col>
</el-row>
<!--收货人信息部分-->
<el-row class="flightInfo">
... ... @@ -486,20 +555,39 @@
</el-col>
</el-row>
<el-row style="margin-bottom: 5px">
<el-col :span="6">
<el-form-item label="收货人称" prop="awbinfo.cnsnname">
<el-input v-model="ruleForm.awbinfo.cnsnname"></el-input>
<el-col :span="6" style="margin-left: -40px">
<el-form-item label="" prop="awbinfo.cnsnname">
<el-input v-model="ruleForm.awbinfo.cnsnname" style="width: 200px">
<template slot="prepend">收货人称</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="国家代码" prop="awbinfo.cnscountyr">
<el-col :span="6">
<el-form-item label="" prop="awbinfo.cnsnaddress">
<el-input v-model="ruleForm.awbinfo.cnsnaddress" style="width: 200px">
<template slot="prepend">地址</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="" prop="awbinfo.cnsntel">
<el-input v-model="ruleForm.awbinfo.cnsntel" style="width: 200px">
<template slot="prepend">电话</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="" prop="awbinfo.cnscountyr">
<div class="ip">
国家代码
</div>
<el-select v-model="ruleForm.awbinfo.cnscountyr"
filterable
allow-create
default-first-option
remote
:remote-method="remoteMethod"
:remote-method="remoteMethod" style="width: 110px"
:loading="loading" placeholder="请选择">
<el-option
v-for="item in cnscountyrs"
... ... @@ -512,16 +600,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="地址" prop="awbinfo.cnsnaddress">
<el-input v-model="ruleForm.awbinfo.cnsnaddress"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="电话" prop="awbinfo.cnsntel">
<el-input v-model="ruleForm.awbinfo.cnsntel"></el-input>
</el-form-item>
</el-col>
</el-row>
<!--分单信息部分-->
<el-row class="flightInfo">
... ... @@ -542,7 +620,8 @@
<template>
<el-table
:data="tableData2"
style="width: 100%">
style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column
prop="awbh"
label="分单号"
... ... @@ -605,7 +684,7 @@
<el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button>
</div>
</el-col>
<el-col :span="2" class="pub">
<el-col :span="1.5" class="pub">
<div class="grid-content">
<el-button type="primary" @click="back" size="mini">返回</el-button>
</div>
... ... @@ -616,7 +695,7 @@
<el-col :span="3.5" class="pub">
<div class="grid-content"><span>舱单总件数:{{sumNmmsPrice}}</span></div>
</el-col>
<el-col :span="7" class="pub">
<el-col :span="7.5" class="pub">
<div class="grid-content"><span>舱单总重量:{{sumNmmsWeight}}</span></div>
</el-col>
</el-row>
... ... @@ -638,17 +717,35 @@
<el-row>
<el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
<el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
<el-form-item label="操作原因" prop="operreason">
<el-input type="textarea" v-model="Udform.operreason"></el-input>
</el-form-item>
<el-form-item label="操作人" prop="operperson">
<el-input v-model="Udform.operperson"></el-input>
</el-form-item>
<el-form-item label="联系电话" prop="opertel">
<el-input v-model="Udform.opertel"></el-input>
</el-form-item>
<el-row style="margin: 10px auto">
<el-col :span="22">
<el-form-item label="" prop="operreason">
<div class="ip">
操作原因
</div>
<el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="11" style="margin-right: 10px">
<el-form-item label="" prop="operperson">
<el-input v-model="Udform.operperson" style="width: 200px">
<template slot="prepend">操作人</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="" prop="opertel">
<el-input v-model="Udform.opertel" style="width: 250px">
<template slot="prepend">联系电话</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="udStatus==='delete'?deleteUdForm('Udform'):updateUdForm('Udform')">确 定</el-button>
</div>
... ... @@ -657,7 +754,8 @@
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData">
<el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="operusername" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
... ... @@ -671,6 +769,22 @@
</template>
<!--自定义CSS样式-->
<style scoped>
.ip{
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;
}
.grid-content {
height: 36px;
line-height: 36px;
... ...