Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/BookingLedger/list/index.vue

@@ -34,12 +34,8 @@
                   >
                     <a-button type="primary" @click="tableRefresh">查询</a-button>
                     <a-button class="reset" @click="tableReset">重置</a-button>
-                    <a-button class="more-search" @click="tableMoreRefresh"
-                      >多提单号查询<a-icon type="search"
-                    /></a-button>
-                    <span class="tab-btn" @click="formSetting"
-                      ><a-icon type="setting" :style="{ marginLeft: '0px' }"
-                    /></span>
+                    <a-button class="more-search" @click="tableMoreRefresh">多提单号查询<a-icon type="search"/></a-button>
+                    <span class="tab-btn" @click="formSetting"><a-icon type="setting" :style="{ marginLeft: '0px' }"/></span>
                     <a class="senior-search" @click="toggleAdvanced">
                       {{ advanced ? '收起查询' : '更多查询' }}
                       <!-- <a-icon :type="advanced ? 'up' : 'down'" /> -->
@@ -260,7 +256,7 @@ export default {
       }
       this.gridOptions.data = []
       this.getList(queryParam)
-      if (queryParam == {}) {
+      if (Object.keys(queryParam).length === 0) {
         this.getFormData()
       }
       this.getTableList()
@@ -299,8 +295,9 @@ export default {
           this.formMoreData = moreData
         }
         this.formData.map((item, index) => {
-          this.$set(this.formRes, item.label, '')
+          this.$set(this.formRes, item.label, this.formRes[item.label] || '')
         })
+        this.getList(this.formRes)
         console.log('=== 当前数据 ===', this.formRes, this.formData, this.formMoreData)
         const len = this.formData.length % 4
         if (len > 2) {