From c09eeede806fb7ebd47434464fa6acbe3d29c3e3 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 13:32:11 +0800
Subject: [PATCH] s
---
src/views/common/ztt-table.vue | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index a64ec16..8b8083c 100644
--- a/src/views/common/ztt-table.vue
+++ b/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])
"
@@ -931,7 +936,7 @@
}
},
getDataList(selectedId) {
- this.dataListLoading = true
+ // this.dataListLoading = true
var criteria = {}
criteria.dateTimeFilters = this.dateTimeFilters
criteria.multiSearchFilter = this.multiSearchFilter
@@ -954,7 +959,6 @@
arr.push(this.paramArr[i])
}
}
-
return this.doCallback(this.ajaxFun, arr, selectedId)
},
doCallback(fn, args, selectedId) {
@@ -962,7 +966,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()
@@ -990,6 +999,7 @@
this.clickTable(selectObj)
}
}
+ this.$emit('change',resultData);
})
.catch((error) => {
this.dataListLoading = false
@@ -1522,6 +1532,7 @@
}
}
}
+ console.log(this.columnList);
this.tableKey = Math.random()
// this.$forceUpdate();
const currPathColumnOrder = this.currPath + '_column'
--
Gitblit v1.9.3