diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 2a48eadea..cdedc21ef 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -708,6 +708,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + from: 'from', + ReferenceTo: 'Reference To', checkTheDeadline: 'Select the collection deadline of the parameter item', accountNumber: 'account Number', fullName: 'full Name', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 2045b71d1..6b0b043db 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -718,6 +718,8 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + from: '从', + ReferenceTo: '引用到', checkTheDeadline: '选中参数项收集截止时间', accountNumber: '账号', fullName: '姓名', diff --git a/jero-web/src/components/ReferenceParameter/index.vue b/jero-web/src/components/ReferenceParameter/index.vue index 9e2bceb9f..e29c23cfa 100644 --- a/jero-web/src/components/ReferenceParameter/index.vue +++ b/jero-web/src/components/ReferenceParameter/index.vue @@ -10,49 +10,27 @@ :wrapper-col='wrapperCol' > - - - + + +
+ +
    配置
+
- - - + + +
+ +
    配置
+
- - {{ $t('query') }} - {{ $t('reset') }} -
- - -
- -
{{ $t('cancel') }} {{ $t('submit') }} @@ -76,21 +54,6 @@ export default { selectedRowKeysDate: {}, loading: false, editId: '', - columns: [ - { - title: this.$t('fullName'), - dataIndex: 'realname', - key: 'showArea', - align: 'center', - ellipsis: true - }, - { - title: this.$t('accountNumber'), - align: 'center', - dataIndex: 'username', - ellipsis: true - } - ], newVisible: false, labelCol: { xs: { span: 24 }, @@ -108,7 +71,7 @@ export default { confirmLoading: false, selectedRowKeys: [], pageNo: 1, - pageSize: 10 + pageSize: 10, } }, props: { @@ -122,15 +85,6 @@ export default { this.loadData() }, methods: { - pageOnChange(page, pageSize) { - this.pageNo = page - this.loadData() - }, - SizeChange(page, pageSize) { - this.pageNo = 1 - this.pageSize = pageSize - this.loadData() - }, loadData() { this.loading = true let params = { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index d18ec4816..fc1e1df27 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -114,7 +114,7 @@ {{$t('sendBack')}}
-
+
{{$t('referenceparameter')}}
@@ -172,6 +172,10 @@ + + + + @@ -180,6 +184,7 @@ import TableCollection from '@/components/tableCollection/index' import { getAction,postAction } from '../../../api/manage' import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index' import TaskCutOffTime from '@/components/TaskCutOffTime/index' +import ReferenceParameter from '@/components/ReferenceParameter/index' import AssignedBy from '@/components/AssignedBy/index' import axios from 'axios' import { ACCESS_TOKEN } from '@/store/mutation-types' @@ -191,7 +196,8 @@ export default { TableCollection, ParameterLibraryAdd, AssignedBy, - TaskCutOffTime + TaskCutOffTime, + ReferenceParameter }, data(){ return{ @@ -276,6 +282,7 @@ export default { areaVisibleFreeze: false, // 冻结配置 areaVisibleAssignedby: false, // 分配填写人弹框 areaVisibleTaskCutOffTime: false, // 截至时间弹框 + areaVisiblereferenceparameter: false, // 引用参数弹框 wrapperCol: { xs: { span: 24 }, sm: { span: 14 } @@ -592,6 +599,10 @@ export default { this.areaVisibleTaskCutOffTime = val this.$refs.CollectionTabel.getTableList() }, + //引用参数 + referenceparameter() { + this.areaVisiblereferenceparameter = true + }, handleModule() { },