From 6c39483f61a39553ad5993147d58e2d17e3b6f89 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 06 十一月 2023 17:27:33 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/ztt-table.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 1cae22a..8f65553 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -819,6 +819,7 @@
this.isCleanInfo = true
}
}
+ this.$emit("queryParam",this.queryParam)
},
deep: true
},
@@ -936,7 +937,7 @@
}
},
getDataList(selectedId) {
- this.dataListLoading = true
+ // this.dataListLoading = true
var criteria = {}
criteria.dateTimeFilters = this.dateTimeFilters
criteria.multiSearchFilter = this.multiSearchFilter
@@ -959,7 +960,6 @@
arr.push(this.paramArr[i])
}
}
-
return this.doCallback(this.ajaxFun, arr, selectedId)
},
doCallback(fn, args, selectedId) {
@@ -967,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()
@@ -995,6 +1000,7 @@
this.clickTable(selectObj)
}
}
+ this.$emit('change',resultData);
})
.catch((error) => {
this.dataListLoading = false
@@ -1527,6 +1533,7 @@
}
}
}
+ console.log(this.columnList);
this.tableKey = Math.random()
// this.$forceUpdate();
const currPathColumnOrder = this.currPath + '_column'
--
Gitblit v1.9.3