Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-18 26c4f7ae79ad5ad2300876b94f96f19e4f93d53a

 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"
@@ -249,6 +245,7 @@
            :show-overflow-tooltip="!item.noShowTip"
            :width="inMemoryColWidth[item.prop] || item.width"
            :prop="item.prop"
            align="center"
          >
            <template slot="header" slot-scope="scope">
              <template v-if="item.isSearch">
@@ -328,7 +325,7 @@
                <template v-if="!item.render">
                  <template v-if="item.formatter">
                    <span v-if="item.isTag" style="text-align: center;">
                      <el-tag style="width:50px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
                      <el-tag style="width:60px;margin: 3px;" :type="scope.row[item.prop] == 0 ? 'success' : 'info'">
                        <span v-html="item.formatter(scope.row, item, scope.row[item.prop])"></span>
                      </el-tag>
                    </span>
@@ -401,6 +398,7 @@
        @size-change="sizeChangeHandle"
        :page-sizes="[10, 20, 50, 100]"
        :page-size="pagination.pageSize"
        :page-count="pagination.size"
        :layout="
          size
            ? 'total, prev, pager, next'
@@ -511,7 +509,8 @@
                只能上传xlsx/xls文件，且不超过10M<el-button
                  type="text"
                  style="font-size:12px;"
                  @click="downDataTemplate"   v-if="uploadInfo.Download"
                  @click="downDataTemplate(uploadInfo.fileName)"   
                  v-if="uploadInfo.Download"
                  >下载模板</el-button
                >
              </div>
@@ -563,6 +562,12 @@
  name: 'TTable',
  components: { exSlot, advancedSearchDialog, zttdraggable },
  props: {
    rowKey: {
      type: String,
      default: ()=>{
        return 'id'
      }
    },
    // 表格型号：mini,medium,small
    tableSize: { type: String, default: 'small' },
    // 数据请求方法
@@ -716,6 +721,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,8 +943,7 @@
      }
    },
    getDataList(selectedId) {
      // this.dataListLoading = true
      this.dataListLoading = false
      this.dataListLoading = true
      var criteria = {}
      criteria.dateTimeFilters = this.dateTimeFilters
      criteria.multiSearchFilter = this.multiSearchFilter
@@ -964,6 +969,7 @@
      return this.doCallback(this.ajaxFun, arr, selectedId)
    },
    doCallback(fn, args, selectedId) {
      this.tableData=[]
      return fn
        .apply(this, args)
        .then((response) => {
@@ -1399,7 +1405,6 @@
            }
          }
        }
        console.log(this.multipleSelection)
        this.$emit('handleSelectionChange', this.multipleSelection)
      } else {
        this.multipleSelection = val
@@ -1534,7 +1539,6 @@
          }
        }
      }
      console.log(this.columnList);
      this.tableKey = Math.random()
      // this.$forceUpdate();
      const currPathColumnOrder = this.currPath + '_column'
@@ -1576,10 +1580,19 @@
      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',
          dangerouslyUseHTMLString: true,
        })
      }else{
        this.$message({
          message: '上传成功',
          type: 'success'
        })
      }
        this.importDialogVisible=false
        this.getDataList()
      }
      this.$refs.uploadScan.clearFiles()
@@ -1603,7 +1616,11 @@
        const blob = new Blob([response.data], {
          type: 'application/force-download'
        })
        const filename = decodeURI('模板文件.xlsx')
        let fileName="模板文件";
        if(this.uploadInfo.fileName!=undefined&&this.uploadInfo.fileName!=''&&this.uploadInfo.fileName!=null){
            fileName=this.uploadInfo.fileName
        }
        const filename = decodeURI(fileName+'.xlsx')
        // 创建一个超链接，将文件流赋进去，然后实现这个超链接的单击事件
        const elink = document.createElement('a')
        elink.download = filename