修改

src/views/newQuery/components/table.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="newQueryTable">
+  <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="newQueryTable">
     <el-table v-el-table-infinite-scroll="load" :data="filteredTableData" :summary-method="getSummaries" :span-method="tableSpanMethod" stripe :show-summary="showSummary" border @cell-click="cellClick" :cell-class-name="cellClass" ref="table" height="100%" class="table infinite-list">
       <el-table-column v-for="(item, index) in tableColsCopy" :sortable="item.needSort ? true : false" :key="index" :prop="item.columnName" :label="item.columnLabel" :show-overflow-tooltip="showOverflowTooltip">
         <template #header>
@@ -115,6 +115,9 @@ export default {
     this.getColumnData()
     this.setCellClick()
   },
+  updated () {
+    this.$refs['table']?.doLayout()
+  },
   methods: {
     //获取表头数据
     async getColumnData () {

src/views/newQuery/index.vue

@@ -32,7 +32,7 @@
         <Search :dataQuery="dataQuery" @getColData="getColData" ref="searchTable" />
       </div>
       <div :style="{height:tableHeight}" class="newQuery-table">
-        <Table ref="queryTable" :tableTag="tableTag" />
+        <Table style="height:100%" ref="queryTable" :tableTag="tableTag" />
       </div>
     </div>
     <Dialog width="520px" :flag="diaFlag">
@@ -95,6 +95,8 @@ export default {
       tbObj: {},
       dataQuery: [],
       tableTag: {},
+      clkItem: {},
+      clkArrs: [],
       queryItems: JSON.parse(localStorage.getItem('localItems')) ?? []
     }
   },
@@ -118,10 +120,12 @@ export default {
     handleAdd () {
       this.$refs.searchTable.addParamsHandler()
     },
-    //
+    //历史查询条件点击
     handleClick (item) {
       this.flag = true
-      const { value } = item
+      const { name, value } = item
+      this.formObj.name = name
+      this.clkItem = item
       setTimeout(() => {
         this.dataQuery = value
         this.tableTag = {
@@ -152,7 +156,11 @@ export default {
     //查询数据
     getColData (arrs) {
       if (this.queryType == 'save') {
-        this.queryArrs.push(arrs)
+        if (Object.keys(this.clkItem).length) {
+          this.clkArrs = arrs
+        } else {
+          this.queryArrs.push(arrs)
+        }
       } else {
         this.tableTag = {
           filter: arrs
@@ -167,25 +175,46 @@ export default {
     //确定-保存条件
     handleOk () {
       const localDatas = this.getLocalData()
-      let datas = []
-      const name = this.formObj.name
-      this.nameArrs.push(name)
-      const nameIndex = this.nameArrs.slice(-5)
-      const arrs = _.cloneDeep(this.queryArrs).slice(-5)
-      arrs.forEach((item, index) => {
-        const obj = {
-          name: nameIndex[index],
-          value: item,
-          userid: getToken('userid')
+      if (Object.keys(this.clkItem).length) {
+        this.$refs.searchTable.advancedQueryHandler()
+        const { name } = this.clkItem
+        const forName = this.formObj.name
+        const newDatas = {}
+        localDatas.filter((item, index) => {
+          if (item.name === name) {
+            newDatas.index = index
+            newDatas.values = this.clkArrs.length ? this.clkArrs : item
+          }
+        })
+        if (Array.isArray(newDatas.values)) {
+          localDatas[newDatas.index].name = forName
+          localDatas[newDatas.index].value = newDatas.values
+        } else {
+          newDatas['values'].name = forName
+          localDatas[newDatas.index] = newDatas.values
         }
-        datas.push(obj)
-      })
-      if (localDatas && localDatas.length) {
-        datas = [...localDatas, ...datas]
+        this.queryItems = localDatas
+      } else {
+        let datas = []
+        const name = this.formObj.name
+        this.nameArrs.push(name)
+        const nameIndex = this.nameArrs.slice(-5)
+        const arrs = _.cloneDeep(this.queryArrs).slice(-5)
+        arrs.forEach((item, index) => {
+          const obj = {
+            name: nameIndex[index],
+            value: item,
+            userid: getToken('userid')
+          }
+          datas.push(obj)
+        })
+        if (localDatas && localDatas.length) {
+          datas = [...localDatas, ...datas]
+        }
+        const caps = _.uniqBy(datas, 'name')
+        this.queryItems = caps.slice(-5)
+        this.formObj.name = ''
       }
-      const caps = _.uniqBy(datas, 'name')
-      this.queryItems = caps.slice(-5)
-      this.formObj.name = ''
       localStorage.setItem('localItems', JSON.stringify(this.queryItems))
       this.diaFlag = false
     },
@@ -202,7 +231,9 @@ export default {
       }
       this.queryItems = datas
       localStorage.setItem('localItems', JSON.stringify(datas))
+      this.clkItem = {}
       this.dataQuery = []
+      this.formObj.name = ''
       this.rmFlag = false
     }
   }
@@ -249,7 +280,7 @@ export default {
       margin-right: 50px;
     }
     .btns {
-      max-width: 650px;
+      max-width: 750px;
       white-space: nowrap;
       .btnIcon {
         margin-left: 15px;