diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 68c0346af..2ba995ce3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -707,6 +707,7 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + operatethisbutton: 'You do not have permission to operate this button', ParameterLibrary: 'Parameter Library', referenceparameter: 'reference Parameter', Assignedby: 'Assignedby', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 495bd82b0..44034ddff 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -716,6 +716,7 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + operatethisbutton: '没有权限操作此按钮', ParameterLibrary: '参数库', referenceparameter: '引用参数', Assignedby: '分配填写人', diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 38ee9ab3a..8843e70f5 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -73,6 +73,7 @@ export default { indeterminate: false, columns: [], selectedRowKeys: [], + selectedRowrowValue: [], dataSource: [], pageNo: 1, pageSize: 10, @@ -81,6 +82,7 @@ export default { loading: false, orderBy: '1', orderByField: '', + LoginUserType: '', // 登陆人角色状态 homo: 0, // 认证工程师 sdt: 0, // 工程接口人 dre: 0, // 填写人 @@ -98,6 +100,8 @@ export default { } getAction(this.url.getLoginUserType, params).then((res) => { if (res.success) { + this.LoginUserType = res.result + this.$emit('LoginUserType', this.LoginUserType) res.result.split(',').forEach((item,index) => { if(item === 'homo') { this.homo = 1 @@ -190,8 +194,8 @@ export default { // this.getTableList() }, onSelectChange(value,rowValue) { - console.log(value,rowValue) this.selectedRowKeys = value + this.selectedRowrowValue = rowValue this.$emit('value',value) this.$emit('rowValue', rowValue) }, diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 63a8b687a..cbf1f4267 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -64,12 +64,12 @@