Merge remote-tracking branch 'origin/master'

王震

2023-11-01 da2b21618e8cc71dc24f21d4d2c8b5661d72a08e

 src/views/common/ztt-table.vue

@@ -327,7 +327,12 @@
              <template v-else>
                <template v-if="!item.render">
                  <template v-if="item.formatter">
                    <span
                    <span v-if="item.isTag" style="text-align: center;">
                      <el-tag style="width:50px;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>
                    <span v-else
                      v-html="
                        item.formatter(scope.row, item, scope.row[item.prop])
                      "
@@ -962,7 +967,12 @@
        .apply(this, args)
        .then((response) => {
          var _this = this
          _this.tableData = response.data.data.records
          var resultData = response.data.data.records
          if(resultData == undefined){
            _this.tableData = response.data.data
          }else{
            _this.tableData = response.data.data.records
          }
          _this.pagination.total = response.data.data.total
          // 置空选中
          this.$refs.lmesTable.setCurrentRow()