diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 681a4a461..6a2fecb21 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -587,7 +587,10 @@ this.content = [] let checkedList = [] jsonHead.forEach((res, index) => { - checkedList.push(res.dataIndex) + if(res.headFieldCn == '操作'){ + res.field = 'operation' + } + checkedList.push(res.field) // 配置列 if (res.type) { this.columns.push({ @@ -674,7 +677,10 @@ this.content = [] let checkedList = [] jsonHead.forEach((res, index) => { - checkedList.push(res.dataIndex) + if(res.headFieldCn == '操作'){ + res.field = 'operation' + } + checkedList.push(res.field) // 配置列 if (res.type) { this.columns.push({ diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 51cfa32a9..62b36481b 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -389,15 +389,14 @@ getcustomizeList(item){ let params = { paramsManifestId: this.$route.query.id, - projectName:this.$route.query.projectName, - flag: '7' + flag: '8' } - getAction('params/collectManifest/getHeader', params).then((res) => { + getAction('report/detail/getHeader', params).then((res) => { if (res.success) { let List = [] let sList = [] res.result.forEach((item,index) => { - if(!item.isLock){ + if(!item.type){ if(item.headFieldCn == '操作'){ item.field = 'operation' item.disabled = true @@ -406,7 +405,7 @@ } List.push(item) } - if(item.isLock) { + if(item.type) { sList.push(item) } }) @@ -929,4 +928,9 @@ popconfirmmize { ::v-deep .ant-popover-buttons { display: none !important; } + + \ No newline at end of file