进港运单查询条件功能完善

@@ -234,7 +234,7 @@
 <style scoped>
 <style scoped>
     .ip{
     .ip{
         max-width: 100px;
         max-width: 100px;
-        margin-right: -4px;
+        margin-right: -5px;
         display: inline-block;
         display: inline-block;
         background-color: #6F8294;
         background-color: #6F8294;
         color: #ffffff;
         color: #ffffff;
@@ -269,6 +269,7 @@
     import { QueryData } from '../../api/wayDeclaration'
     import { QueryData } from '../../api/wayDeclaration'
     import {mapActions, mapGetters} from 'vuex'
     import {mapActions, mapGetters} from 'vuex'
     import {loginedUserInfo} from "../../api/user";
     import {loginedUserInfo} from "../../api/user";
+    import jsutil from "@/common/js/util";
     export default {
     export default {
         name:'Waybill',
         name:'Waybill',
         data() {
         data() {
@@ -336,15 +337,26 @@
             },
             },
             //条件查询方法
             //条件查询方法
             QueryData(){
             QueryData(){
-                let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
-                    flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType,departmentid:loginedUserInfo().companyInfo.departmentid};
-                this.tableloading=true;
-                QueryData(params).then(res =>{
-                    let response=res.data.data;
-                    this.tableData=response.list;
-                    this.total=response.total;
-                    this.tableloading = false;
-            });
+                if(jsutil.checkNull(this.defaultQuery.awba)||jsutil.checkNull(this.defaultQuery.flightdate)){
+                    let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
+                        flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType,departmentid:loginedUserInfo().companyInfo.departmentid};
+                    this.tableloading=true;
+                    QueryData(params).then(res =>{
+                        let response=res.data.data;
+                        this.tableData=response.list;
+                        this.total=response.total;
+                        this.tableloading = false;
+                    }).catch(err => {
+                        this.tableloading = false;
+                    });
+                }
+                else {
+                    this.$confirm('主单号和航班日期至少选填一项！', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+                    })
+                }
             },
             },
             //点击进入原始页面
             //点击进入原始页面
             handleClick(row){
             handleClick(row){

 {
 {
-  "nmmsVer": "1.05"
+  "nmmsVer": "1.06"
 }
 }