Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

This commit is contained in:
wangzhijiang
2022-07-12 18:05:02 +08:00
@@ -509,12 +509,25 @@
getTableListReset() { getTableListReset() {
let params = { let params = {
paramsManifestId: this.$route.query.id, paramsManifestId: this.$route.query.id,
userTypes: this.currentPersonRole pageNo: this.pageNo,
pageSize: this.pageSize,
// userTypes: this.currentPersonRole
} }
let url
this.loading = true this.loading = true
this.$emit('listReset', '') this.$emit('listReset', '')
// todo // todo
getAction(this.url.tableList, params).then((res) => { if (this.$route.query.it === undefined) {
// 页面跳转
url = this.url.tableList
params.paramsManifestId = this.$route.query.id
params.userTypes = this.currentPersonRole
} else {
// 历史版本
url = 'params/collectManifestHistory/list'
params.paramsManifestId = this.$route.query.it
}
getAction(url, params).then((res) => {
if (res.success) { if (res.success) {
let tt = [] let tt = []
if (this.currentPersonRole !== 'dre') { if (this.currentPersonRole !== 'dre') {