2.0航站视图-loading修改

src/views/newArrival/index.vue

@@ -52,7 +52,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table :istableChild="true" :pageSize="9999" @tableLoad="tableLoad" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table :istableChild="true" :pageSize="9999" @tableLoad="tableLoad" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" :should-reset.sync="loading" />
     </div>
   </div>
 </template>
@@ -78,7 +78,7 @@ export default {
       tableDataSortRules: {
         flightCanceled: "ascending",
       },
-      loading: false,
+      loading: true,
       AirportList: [],
       tableTag: {},
       timer: null
@@ -146,7 +146,8 @@ export default {
             this.formData.currentAirport = this.TauthId && flag.length ? 'PEK' : res.returnData[0].IATACode;
           }
           this.tableTag = {
-            filter: this.formatParams()
+            filter: this.formatParams(),
+            shouldReset: type !== 1
           }
         } else {
           this.$message.error(res.message);

src/views/newDeparture/index.vue

@@ -57,7 +57,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table style="height:100%" :pageSize="9999" :btnStyle="{ 'top':'-43px','right':'8px' }" @tableLoad="tableLoad" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table style="height:100%" :pageSize="9999" :btnStyle="{ 'top':'-43px','right':'8px' }" @tableLoad="tableLoad" :istableCol="true" :tableTag="tableTag" ref="table" :should-reset.sync="loading" />
     </div>
   </div>
 </template>
@@ -83,7 +83,7 @@ export default {
       tableDataSortRules: {
         flightCanceled: "ascending",
       },
-      loading: false,
+      loading: true,
       AirportList: [],
       tableTag: {},
       timer: null
@@ -151,7 +151,8 @@ export default {
             this.formData.currentAirport = this.TauthId && flag.length ? 'PEK' : res.returnData[0].IATACode;
           }
           this.tableTag = {
-            filter: this.formatParams()
+            filter: this.formatParams(),
+            shouldReset: type !== 1
           }
         } else {
           this.$message.error(res.message);

src/views/newQuery/components/table.vue

@@ -74,7 +74,7 @@ export default {
     },
     tableTag: {
       type: Object,
-      default: () => { },
+      default: () => ({}),
     },
     tableName: {
       type: String,
@@ -108,6 +108,10 @@ export default {
       type: Number,
       default: 20,
     },
+    shouldReset: {
+      type: Boolean,
+      default: true
+    },
   },
   data () {
     return {
@@ -174,9 +178,13 @@ export default {
   },
   watch: {
     tableTag: {
-      handler (val) {
+      async handler (val) {
         this.dataContent = val
         this.restTable()
+        if (val.shouldReset) {
+          this.$emit('update:shouldReset', true)
+          await this.$nextTick()
+        }
         this.load()
       },
       deep: true,
@@ -293,7 +301,11 @@ export default {
     // 获取表格数据
     async getQuery (id, dataContent = this.dataContent, page, pageSize) {
       try {
-        this.loading = true
+        if (this.shouldReset) {
+          this.loading = true
+        }
+        this.$emit('update:shouldReset', false)
+        await this.$nextTick()
         const { code, returnData } = await this.getQueryListAuth(
           id,
           dataContent,
@@ -305,28 +317,34 @@ export default {
             this.page--
             this.noMore = true
             this.loading = false
+            return
+          }
+          if (this.shouldReset) {
+            this.tableData.push(...returnData)
+          } else {
+            this.tableData = [...returnData]
           }
-          this.tableData.push(...returnData)
           this.$emit('tableLoad', [...this.tableData])
           setTimeout(() => {
             this.initTableData()
             this.loading = false
           }, 100)
         } else {
-          this.page--
-          this.loading = false
-          this.$message.error('获取表格数据失败')
+          throw new Error('获取表格数据失败')
         }
       } catch (error) {
         this.page--
         this.loading = false
+        this.$message.error(error.message)
       }
     },
     restTable () {
       this.loading = false
-      this.noMore = false
       this.page = 0
-      this.tableData = []
+      if (this.shouldReset) {
+        this.noMore = false
+        this.tableData = []
+      }
     },
     load () {
       if (this.tableTag && Object.keys(this.tableTag).length) {
@@ -335,6 +353,7 @@ export default {
         }
         if (this.AqueryParams && this.AqueryParams.queryparams) {
           const newData = _.cloneDeep(this.tableTag)
+          delete newData.shouldReset
           const paramsType = typeof this.AqueryParams.queryparams
           if (paramsType == 'string') {
             const dataObj = {}
@@ -458,7 +477,6 @@ export default {
     async getSelectData (id) {
       // name ? [name] : name === null ? [null]: [],
       const { code, returnData } = await this.getQueryList(id, {})
-      console.log(returnData)
       if (code == 0) {
         return returnData
       } else {

src/views/newTransfer/index.vue

@@ -55,7 +55,7 @@
     </div>
     <!--表格-->
     <div class="terminal-table">
-      <Table :istableChild="true" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" />
+      <Table :istableChild="true" style="height:100%" :btnStyle="{ 'top':'-43px','right':'8px' }" :istableCol="true" :tableTag="tableTag" ref="table" :should-reset.sync="loading" />
     </div>
   </div>
 </template>
@@ -81,7 +81,7 @@ export default {
       tableDataSortRules: {
         flightCanceled: "ascending",
       },
-      loading: false,
+      loading: true,
       AirportList: [],
       tableTag: {},
       timer: null
@@ -154,7 +154,8 @@ export default {
             this.formData.currentAirport = this.TauthId && flag.length ? 'PEK' : res.returnData[0].IATACode;
           }
           this.tableTag = {
-            filter: this.formatParams()
+            filter: this.formatParams(),
+            shouldReset: type !== 1
           }
         } else {
           this.$message.error(res.message);