diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 04fc59443..927db8970 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -658,7 +658,6 @@ }) }, clickButtonToUpload(item) { - console.log(item) if (item.isLock == '1') { this.$refs.uploadFile.disabled = true } else { diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 5ffe6740b..4f2b96002 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -443,7 +443,36 @@ // todo getAction(this.url.tableList, params).then((res) => { if (res.success) { - this.dataSource = res.result + let tt = [] + if (this.currentPersonRole !== 'dre') { + res.result.forEach((Obj) => { + Object.keys(Obj).forEach((item) => { + if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { + Obj[item].list.forEach((itemLi) => { + itemLi.isLock = 1 + if (itemLi.type === 'pull_more') { + itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + } + }) + } + }) + tt.push(Obj) + }) + } else { + res.result.forEach((Obj) => { + Object.keys(Obj).forEach((item) => { + if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { + Obj[item].list.forEach((itemLi) => { + if (itemLi.type === 'pull_more') { + itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + } + }) + } + }) + tt.push(Obj) + }) + } + this.dataSource = tt this.total = res.result.total this.selectedRowKeys = [] this.loading = false