diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index dde2c03e5..e9d9e0a6e 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -650,8 +650,10 @@ let num = 0 this.content = [] jsonHead.forEach((res, index) => { + console.log(res) // 配置列 if (res.type) { + console.log('配置') this.columns.push({ dataIndex: res.db_field_name, align: 'center', @@ -835,7 +837,12 @@ Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { Obj[item].list.forEach((itemLi) => { - itemLi.isLock = 1 + console.log(item) + if(this.currentPersonRole == 'homo' && item == 'referencesCol'){ + itemLi.isLock = 0 + }else{ + itemLi.isLock = 1 + } if (itemLi.type === 'pull_more') { itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') } diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 221d22482..9f7a144de 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -352,7 +352,8 @@ :title="$t('Referenceparametercolumn')" width="850px" :footer="null"> - @@ -1599,6 +1600,7 @@ } }, drawerhandleCancel(val) { + console.log(11131) this.parametercolumn = false }, // 强制撤回 diff --git a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue index 0aaf3f925..9b80fed54 100644 --- a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue +++ b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue @@ -312,7 +312,7 @@ this.newVisible = false this.$emit('drawerhandleCancel', false) this.$emit('GetgetTableList') - this.$message.success(this.$t('OperationSuccessful')) + this.$message.success(res.message) } else { this.$message.warning(res.message) }