解决新增页面 下拉框与lable 错位问题

预配主单查询框加宽
运单查询列表合并承运人与航班号

@@ -49,7 +49,7 @@
         height: 550px;
         height: 550px;
         overflow:auto;
         overflow:auto;
     }
     }
-    .filter-item{
-        margin-top: 20px;
-    }
+    /*.filter-item{*/
+    /*    margin-top: 20px;*/
+    /*}*/
 </style>
 </style>

@@ -2,9 +2,9 @@
     <!--<div class="app-container">-->
     <!--<div class="app-container">-->
     <div class="app-content">
     <div class="app-content">
         <div class="filter-container" style="margin-top: 50px;padding-bottom: 5px">
         <div class="filter-container" style="margin-top: 50px;padding-bottom: 5px">
-            <el-input v-model="listQuery.awba" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="运单号"/>
-            <el-input v-model="listQuery.carrier" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="承运人"/>
-            <el-input v-model="listQuery.flightno" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="航班号"/>
+            <el-input v-model="listQuery.awba" @blur="inputAwba" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="运单号"/>
+<!--            <el-input v-model="listQuery.carrier" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="承运人"/>-->
+            <el-input v-model="flightComNo" clearable style="width: 200px;margin-right: 10px" class="filter-item" placeholder="航班号"/>
             <el-date-picker v-model="listQuery.flightDate" type="date" placeholder="航班日期"
             <el-date-picker v-model="listQuery.flightDate" type="date" placeholder="航班日期"
                             value-format="yyyy-MM-dd" class="filter-item"></el-date-picker>
                             value-format="yyyy-MM-dd" class="filter-item"></el-date-picker>
         </div>
         </div>
@@ -153,6 +153,7 @@
     import {getMt520XListForParam} from "@/api/exitTidy";
     import {getMt520XListForParam} from "@/api/exitTidy";
     import {getMt3201ListForParam} from "@/api/exitArrive";
     import {getMt3201ListForParam} from "@/api/exitArrive";
     import {getMt4201ListForParam} from "@/api/exitLoading";
     import {getMt4201ListForParam} from "@/api/exitLoading";
+    import {Message} from "element-ui";
 
 
     export default {
     export default {
         name: "ExitManifest",
         name: "ExitManifest",
@@ -167,8 +168,8 @@
                     pageSize: 1,
                     pageSize: 1,
                     limitSize: 100,
                     limitSize: 100,
                     awba:undefined,
                     awba:undefined,
-                    carrier: undefined,
-                    flightno:undefined,
+                    carrier: '',
+                    flightno:'',
                     flightDate: new Date(),
                     flightDate: new Date(),
                     messageType: undefined,
                     messageType: undefined,
                     messageStatus: undefined,
                     messageStatus: undefined,
@@ -206,9 +207,37 @@
                 ]
                 ]
             }
             }
         },
         },
+        computed: {
+            flightComNo: {
+                get: function () {
+                    return this.listQuery.carrier+this.listQuery.flightno;
+                },
+                set: function (val) {
+                    this.listQuery.carrier='';
+                    this.listQuery.flightno = val.toUpperCase();
+                }
+            }
+        },
         methods: {
         methods: {
             getList() {
             getList() {
+                // 主单为空 航班号 航班日期 不能为空
+                if (this.listQuery.awba == undefined
+                    && this.listQuery.flightno != ''){
+                    this.listLoading = true
+                    if (this.listQuery.flightno != '' && this.listQuery.flightno.length > 0){
+                        this.listQuery.carrier = this.listQuery.flightno.substring(0,2);
+                        this.listQuery.flightno = this.listQuery.flightno.substring(2);
+                    }
+                    getManifests(this.listQuery).then(res =>{
+                        this.manifestData = res.data.data.list
+                        this.total = res.data.data.total
+                        setTimeout(() =>{
+                            this.listLoading = false
+                        },1500)
+                    })
+                }else if (this.listQuery.awba != undefined){
                     this.listLoading = true
                     this.listLoading = true
+                    this.listQuery.flightDate = undefined;
                     getManifests(this.listQuery).then(res =>{
                     getManifests(this.listQuery).then(res =>{
                         this.manifestData = res.data.data.list
                         this.manifestData = res.data.data.list
                         this.total = res.data.data.total
                         this.total = res.data.data.total
@@ -216,6 +245,13 @@
                             this.listLoading = false
                             this.listLoading = false
                         },1500)
                         },1500)
                     })
                     })
+                }else {
+                    Message.warning("请输入运单号或者航班号为查询条件");
+                }
+
+            },
+            inputAwba(){
+                this.listQuery.flightDate = '';
             },
             },
             handleSelectionChange() {
             handleSelectionChange() {
 
 

@@ -30,7 +30,7 @@
                         </el-col>
                         </el-col>
                         <el-col :span="24">
                         <el-col :span="24">
                             <div class="grid-content">
                             <div class="grid-content">
-                                <el-col :span="3">
+                                <el-col :span="4">
                                     <div class="grid-content">
                                     <div class="grid-content">
                                         <el-input  v-model="preQuery.awba"  placeholder="请输入主单号" clearable>
                                         <el-input  v-model="preQuery.awba"  placeholder="请输入主单号" clearable>
                                             <template slot="prepend">主单号</template>
                                             <template slot="prepend">主单号</template>
@@ -997,6 +997,7 @@
                     awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
                     awba: [{required: true, trigger: 'blur', validator: validatorAwb}],
                     awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
                     awbh: [{required: true, trigger: 'blur', validator: validatorAwbh}],
                     'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}],
                     'awbinfo.paymodel': [{required: true, message: '付款方式必选', trigger: 'change'}],
+                    'awbinfo.awbtype': [{required: true, message: '货物类型必须', trigger: 'change'}],
                     goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}],
                     goodsname: [{required: true, trigger: 'blur', validator: validAlphabetsSpanceKey}],
                     ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}],
                     ex5: [{required: true, message: '货物描述不能为空', trigger: 'blur'}],
                     'awbinfo.sairportid': [{required: true, message: '起始航站不能为空', trigger: 'change'}],
                     'awbinfo.sairportid': [{required: true, message: '起始航站不能为空', trigger: 'change'}],
@@ -1075,7 +1076,10 @@
                         eairportid: undefined,
                         eairportid: undefined,
                         csgcustomerid: undefined,
                         csgcustomerid: undefined,
                         paymodel: 'PP',
                         paymodel: 'PP',
-                        awbtype: undefined
+                        awbtype: undefined,
+                        dest4:undefined,
+                        dest4city:undefined
+
                     },
                     },
                     user: {
                     user: {
                         username: loginedUserInfo().username
                         username: loginedUserInfo().username