Merge remote-tracking branch 'origin/master'

zss

2023-12-14 1789ce3650a2665b5abca7a3028611190d1983df

 src/views/common/ztt-table.vue

@@ -149,11 +149,7 @@
        v-bind="$attrs"
        v-on="$listeners"
        :highlight-current-row="true"
        :row-key="
          (row) => {
            return row.id
          }
        "
        :row-key="rowKey"
        @row-dblclick="dbClickRow"
        @row-contextmenu="contextMenu"
        @header-click="headClick"
@@ -401,6 +397,7 @@
        @size-change="sizeChangeHandle"
        :page-sizes="[10, 20, 50, 100]"
        :page-size="pagination.pageSize"
        :page-count="pagination.size"
        :layout="
          size
            ? 'total, prev, pager, next'
@@ -563,6 +560,12 @@
  name: 'TTable',
  components: { exSlot, advancedSearchDialog, zttdraggable },
  props: {
    rowKey: {
      type: String,
      default: ()=>{
        return 'id'
      }
    },
    // 表格型号：mini,medium,small
    tableSize: { type: String, default: 'small' },
    // 数据请求方法
@@ -716,6 +719,7 @@
        currentPage:
          this.table.currentPage == null ? 1 : this.table.currentPage,
        pageSize: this.table.pageSize == null ? 20 : this.table.pageSize,
        size: this.table.size == null ? 7 : this.table.size,
        total: this.table.total == null ? 0 : this.table.total
      }, // 分页信息
      inMemoryColWidth: {}, // 记忆中列宽，默认列宽
@@ -937,7 +941,8 @@
      }
    },
    getDataList(selectedId) {
      this.dataListLoading = true
      // this.dataListLoading = true
      this.dataListLoading = false
      var criteria = {}
      criteria.dateTimeFilters = this.dateTimeFilters
      criteria.multiSearchFilter = this.multiSearchFilter
@@ -1398,7 +1403,6 @@
            }
          }
        }
        console.log(this.multipleSelection)
        this.$emit('handleSelectionChange', this.multipleSelection)
      } else {
        this.multipleSelection = val
@@ -1533,7 +1537,6 @@
          }
        }
      }
      console.log(this.columnList);
      this.tableKey = Math.random()
      // this.$forceUpdate();
      const currPathColumnOrder = this.currPath + '_column'
@@ -1575,10 +1578,18 @@
      if (response.code != '0') {
        this.$message.warning(response.msg)
      } else {
      if(response.data!=""&&response.data!=[]&&response.data!=null){
        this.$message({
          message: response.data,
          type: 'success'
        })
      }else{
        this.$message({
          message: '上传成功',
          type: 'success'
        })
      }
        this.importDialogVisible=false
        this.getDataList()
      }
      this.$refs.uploadScan.clearFiles()