From 778910ce85e301e63a43439b655cc457a96bbb44 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 02 十一月 2023 12:38:01 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/ztt-table.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index a64ec16..5b4be1e 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])
"
@@ -956,13 +961,19 @@
}
return this.doCallback(this.ajaxFun, arr, selectedId)
+ this.dataListLoading = false
},
doCallback(fn, args, selectedId) {
return fn
.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()
--
Gitblit v1.9.3