From e5f47ba0414bd5186dbba91b644586a6b07d5cd6 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 6 Jun 2022 10:47:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=87=E6=8F=9B=E8=A7=92?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 4 +- .../components/listOfRegulations.vue | 108 +++++++++++++++++- jero-web/src/views/system/RoleUserList.vue | 6 +- 4 files changed, 111 insertions(+), 9 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index cd16bc37d..10d69fa50 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -596,6 +596,7 @@ module.exports = { StandardImplementationDate: 'Standard implementation date', regulatoryEngineer: 'Regulation Engineer', certifiedEngineer: 'Homologation Engineer', + regulatoryEngineerOrcertifiedEngineer:'Regulation Engineer Or Homologation Engineer', engineeringInterfacePerson: 'Engineering Interface', typeOfDeliverables: 'Type of deliverables', deliverableTemplate: 'Deliverable template', @@ -918,4 +919,5 @@ module.exports = { and: 'and', judge:'Judge', pleaseWaitWhileRunning:'Please wait while running', + roleSwitching:'Role switching', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 679015a72..b7ca8780d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -604,6 +604,7 @@ module.exports = { StandardImplementationDate: '标准实施日期', regulatoryEngineer: '法规工程师', certifiedEngineer: '认证工程师', + regulatoryEngineerOrcertifiedEngineer:'法规工程师/认证工程师', judge: '判断', engineeringInterfacePerson: '工程接口人', typeOfDeliverables: '交付物类型', @@ -922,5 +923,6 @@ module.exports = { Statusis: '状态为', toHavePermission: '才有权限', and: '并且', - pleaseWaitWhileRunning: '运行中请稍等' + pleaseWaitWhileRunning: '运行中请稍等', + roleSwitching:'角色切换', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 1a547142e..ae8025722 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -92,6 +92,10 @@ {{ $t('ExportReport') }} +
+ + {{ $t('batSetting') }} +
...{{ $t('more') }} @@ -109,9 +113,9 @@ {{ $t('add') }}
-
+
- {{ $t('batSetting') }} + {{ $t('roleSwitching') }}
@@ -127,6 +131,11 @@ {{ $t('batSetting') }}
+
+ + {{ $t('roleSwitching') }} +
@@ -305,6 +314,45 @@ + + + + +
+
+ * + {{$t('roleSwitching')}} +
+ + + + + + {{$t('StudioEngineer')}} + + + + + {{$t('regulatoryEngineerOrcertifiedEngineer')}} + + + + +
+ + + + @@ -746,13 +794,26 @@ text: this.$t('zoneOfApplication'), dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 } - ] + ], + visibleRoleSwitching: false, + confirmLoadingRoleSwitching: false, + formInlineRoleSwitching: {}, + rulesRoleSwitching: { + roleSwitchingCode: [ + { + required: true, + message: this.$t('roleSwitching') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + } } }, mounted() { if (this.$route.query.studioEngineer == this.userInfo().id) { this.isDisplay = true + this.formInlineRoleSwitching.roleSwitchingCode = '0' } else { this.isDisplay = false } @@ -905,6 +966,34 @@ handleAdd() { this.$refs.addModelRef.addModel() }, + handleOkRoleSwitching() { + this.$refs.ruleFormRoleSwitching.validate(valid => { + if (valid) { + if (this.formInlineRoleSwitching.roleSwitchingCode == '0') { + this.isDisplay = true + } else { + this.isDisplay = false + } + this.visibleRoleSwitching = false + this.getList() + } + }) + }, + handleCancelRoleSwitching() { + this.visibleRoleSwitching = false + }, + roleSwitchingClick() { + this.visibleRoleSwitching = true + this.$nextTick(() => { + this.$refs.ruleFormRoleSwitching.clearValidate() + if (this.isDisplay) { + this.formInlineRoleSwitching.roleSwitchingCode = '0' + } else { + this.formInlineRoleSwitching.roleSwitchingCode = '4' + } + this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } + }) + }, handleDel() { if (this.selectedRowKeys.length > 0) { let _this = this @@ -995,10 +1084,17 @@ this.getList() }, getList() { + let roleCode + if (this.isDisplay) { + roleCode = 0 + } else { + roleCode = 4 + } let query = { ...this.queryParamQuery, ...this.queryParam, - projectLibraryId: this.$route.query.id + projectLibraryId: this.$route.query.id, + roleCode: roleCode } this.loading = true getAction(this.url.list, query).then((res) => { @@ -1589,7 +1685,9 @@ .box-input .ant-select-selection__rendered { line-height: 38px; } - + .popconfirm{ + z-index: 999; + } .popconfirm .ant-popover-buttons { display: none !important; } diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index d04e9d552..f314b0a17 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -136,19 +136,19 @@ title: this.$t('RoleCode'), align: 'center', dataIndex: 'roleCode', - width: 180 + width: 280 }, { title: this.$t('roleName'), align: 'center', dataIndex: 'roleName', - width: 180 + width: 280 }, { title: this.$t('createTime'), dataIndex: 'createTime', align: 'center', - width: 180, + width: 280, sorter: true, customRender: (text) => { return moment(text).format('YYYY-MM-DD')