Merge branch 'fix-issues' into uat

@@ -1641,7 +1641,6 @@ export default {
         text-align: center;
         text-align: center;
     }
     }
 }
 }
-
 .checkboxItem {
 .checkboxItem {
     display: inline-block;
     display: inline-block;
     width: 110px;
     width: 110px;

@@ -939,13 +939,13 @@ export default {
       this.$refs["form"].validate((valid) => {
       this.$refs["form"].validate((valid) => {
          if(this.form.route == undefined){
          if(this.form.route == undefined){
             this.routeError = true;
             this.routeError = true;
-            console.log(this.form.route)
+           return
          }
          }
          if(this.form.route.length || this.form.route !== undefined){
          if(this.form.route.length || this.form.route !== undefined){
             this.routeError = false;
             this.routeError = false;
          }
          }
 
 
-        if(this.form.route.length == 0 || this.form.route == undefined){
+        if(this.form.route.length == 0){
             this.routeError = true;
             this.routeError = true;
             return
             return
         }
         }

@@ -205,7 +205,7 @@
     </el-form>
     </el-form>
     <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :selection="true" :order="true"
     <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :selection="true" :order="true"
       :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page"
       :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page"
-      :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect"
+      :shiftKey="shiftKey" :pageSizes="[10, 15, 20, 25, 30, 35, 40]" :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect"
       @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange">
       @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange">
       <template v-slot:waybillNo="scope">
       <template v-slot:waybillNo="scope">
         <el-link type="primary" @click="logView(scope.row)">
         <el-link type="primary" @click="logView(scope.row)">
@@ -276,7 +276,7 @@ export default {
         cargoPlaneRoute: null,
         cargoPlaneRoute: null,
         preStatus: undefined,
         preStatus: undefined,
         limitStart: 1,
         limitStart: 1,
-        limitSize: 100,
+        limitSize: 10,
       }, //表单数据
       }, //表单数据
       tableHeader: [], //表头数据
       tableHeader: [], //表头数据
       releaseHeader: [
       releaseHeader: [
@@ -350,7 +350,7 @@ export default {
       cargoPlaneTime: [],
       cargoPlaneTime: [],
       createDate: [],
       createDate: [],
       limitStart: 1,
       limitStart: 1,
-      limitSize: 100, //无限制-1
+      limitSize: 10, //无限制-1
       page: 1,
       page: 1,
       progress: 0,
       progress: 0,
       tableHeight: null,
       tableHeight: null,
@@ -368,7 +368,7 @@ export default {
       this.tableHeader = this.tableHeaders['cargo']
       this.tableHeader = this.tableHeaders['cargo']
     }
     }
     if(this.$route.params.hasOwnProperty('hander') == false){
     if(this.$route.params.hasOwnProperty('hander') == false){
-        this.select(0,'create')
+        // this.select(0,'create')
     }
     }
 
 
     // this.$nextTick(()=>{
     // this.$nextTick(()=>{
@@ -415,7 +415,7 @@ export default {
         cargoPlaneStart: null,
         cargoPlaneStart: null,
         cargoPlaneEnd: null,
         cargoPlaneEnd: null,
         limitStart: 1,
         limitStart: 1,
-        limitSize: 100,
+        limitSize: 10,
       }
       }
       this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate]
       this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate]
       this.formData.cargoPlaneStart = this.$route.params.fltDate
       this.formData.cargoPlaneStart = this.$route.params.fltDate
@@ -429,7 +429,6 @@ export default {
       if (this.$store.state.tagsView.cachedViews.length > 0) {
       if (this.$store.state.tagsView.cachedViews.length > 0) {
         this.$store.state.tagsView.cachedViews.forEach(item => {
         this.$store.state.tagsView.cachedViews.forEach(item => {
           if (item === 'QueryCargo') {
           if (item === 'QueryCargo') {
-            this.findCondition()
             this.select()
             this.select()
           }
           }
         })
         })
@@ -669,7 +668,7 @@ export default {
       }
       }
 
 
       this.formData.limitStart = this.limitStart;
       this.formData.limitStart = this.limitStart;
-      this.formData.limitSize = 100;
+      this.formData.limitSize = 10;
     },
     },
     //总和
     //总和
     cargoTotal() {
     cargoTotal() {