From 294cfe71e693b0ff938ab27750ad42f1484c14f8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 11 May 2022 20:02:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= 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 +++- .../src/components/PersonnelSelection/index.vue | 1 + .../src/components/Standardselection/index.vue | 1 + jero-web/src/components/frameAssembly/index.vue | 1 + jero-web/src/components/libraryPush/index.vue | 1 + jero-web/src/views/ceshiList/modules/addForm.vue | 1 + .../documentManage/library/modules/addForm.vue | 1 + .../virtualList/components/addModel.vue | 1 + .../virtualList/components/editModel.vue | 1 + .../virtualList/components/virtualListDetails.vue | 2 +- .../src/views/documentTools/virtualList/index.vue | 1 + .../ParameterTemplate/components/addModel.vue | 1 + .../views/parameter/ParameterTemplate/index.vue | 1 + .../parameterlist/components/addModel.vue | 1 + .../src/views/parameter/parameterlist/index.vue | 1 + .../src/views/processCenter/procedure/index.vue | 1 + .../projectManagement/components/addModel.vue | 1 + .../components/certificationDirectory.vue | 1 + .../projectManagement/components/commentList.vue | 9 ++++++++- .../components/historicalVersionList.vue | 2 +- .../projectManagement/components/listAddModel.vue | 1 + .../projectManagement/components/listEditModel.vue | 7 ++++--- .../components/listOfRegulations.vue | 14 ++++++++------ .../projectManagement/components/transferList.vue | 1 + .../views/projectManagement/dialog/configure.vue | 1 + .../projectManagement/projectLibrary/index.vue | 1 + jero-web/src/views/system/DepartList.vue | 1 + .../src/views/system/modules/DeptRoleAuthModal.vue | 1 + .../src/views/system/modules/DeptRoleUserModal.vue | 1 + .../src/views/system/modules/GateWayRouteModal.vue | 1 + jero-web/src/views/system/modules/UserModal.vue | 1 + .../src/views/system/modules/UserRoleModal.vue | 1 + 33 files changed, 53 insertions(+), 13 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 147a5913b..1f2e1fe4c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -806,4 +806,6 @@ module.exports = { pleaseDesignConformityConfirmation:'Please complete the data of design conformity confirmation', pleaseConfirmedByPrehomo:'Please complete the data confirmed by prehomo', pleaseConformityVerification:'Please complete the data of Conformity verification', + virtualListDetails:'Virtual list details', + maintainVirtualList:'Maintain virtual list', } \ 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 15cd0bd9f..46cfc6eae 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -810,5 +810,7 @@ module.exports = { verificationComplianceReview: '验证符合性审查', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据', - pleaseConformityVerification: '请补全验证符合性确认的数据' + pleaseConformityVerification: '请补全验证符合性确认的数据', + virtualListDetails:'虚拟清单详情', + maintainVirtualList:'维护虚拟清单', } \ No newline at end of file diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index b01b48980..122da76c0 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -220,6 +220,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index 5ddfe0d58..a6c0273bf 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -223,6 +223,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/components/frameAssembly/index.vue b/jero-web/src/components/frameAssembly/index.vue index 63f4c1e0d..b98fb558f 100644 --- a/jero-web/src/components/frameAssembly/index.vue +++ b/jero-web/src/components/frameAssembly/index.vue @@ -235,6 +235,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/components/libraryPush/index.vue b/jero-web/src/components/libraryPush/index.vue index bb327695c..f0d742aac 100644 --- a/jero-web/src/components/libraryPush/index.vue +++ b/jero-web/src/components/libraryPush/index.vue @@ -188,6 +188,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/ceshiList/modules/addForm.vue b/jero-web/src/views/ceshiList/modules/addForm.vue index 26b8c1878..0d5daeb79 100644 --- a/jero-web/src/views/ceshiList/modules/addForm.vue +++ b/jero-web/src/views/ceshiList/modules/addForm.vue @@ -62,6 +62,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/documentManage/library/modules/addForm.vue b/jero-web/src/views/documentManage/library/modules/addForm.vue index 03f39e655..712b31133 100644 --- a/jero-web/src/views/documentManage/library/modules/addForm.vue +++ b/jero-web/src/views/documentManage/library/modules/addForm.vue @@ -87,6 +87,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/documentTools/virtualList/components/addModel.vue b/jero-web/src/views/documentTools/virtualList/components/addModel.vue index 5d19ac984..4203bc568 100644 --- a/jero-web/src/views/documentTools/virtualList/components/addModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/addModel.vue @@ -248,6 +248,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 84e8b687c..39d0dd00b 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -793,6 +793,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 15c4addf6..b189b8c31 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -6,7 +6,7 @@ - {{this.title}} + {{isTrue ? $t('maintainVirtualList'):$t('virtualListDetails')}}
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index ee46bab76..d4200ae46 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -514,6 +514,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue index 764f49bc3..64616003d 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/components/addModel.vue @@ -290,6 +290,7 @@ export default { position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 8d694d9e0..ecf6e07ce 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -463,6 +463,7 @@ export default { .drawer-bootom-button { position: absolute; bottom: 0; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 17951f5b2..268e26f13 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -605,6 +605,7 @@ export default { position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 7c44a8e66..3b2bd00dc 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -474,6 +474,7 @@ export default { position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/processCenter/procedure/index.vue b/jero-web/src/views/processCenter/procedure/index.vue index 80ce61716..3a821f0a6 100644 --- a/jero-web/src/views/processCenter/procedure/index.vue +++ b/jero-web/src/views/processCenter/procedure/index.vue @@ -313,6 +313,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 40a74a7ed..8dc853232 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -458,6 +458,7 @@ padding: 10px 16px; text-align: right; left: 0; + z-index:100; background: #fff; border-radius: 0 0 2px 2px; } diff --git a/jero-web/src/views/projectManagement/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/components/certificationDirectory.vue index 92e8e9d17..8c3d84e17 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectory.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectory.vue @@ -172,6 +172,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue index 65b9546e9..3af582d80 100644 --- a/jero-web/src/views/projectManagement/components/commentList.vue +++ b/jero-web/src/views/projectManagement/components/commentList.vue @@ -12,7 +12,7 @@ {{$t('query')}} - {{$t('publishComment')}} + {{$t('publishComment')}}
@@ -315,6 +315,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; @@ -366,4 +367,10 @@ width: calc(100% - 168px); margin-right: 8px; } + .button-text{ + width: 80px; + overflow: hidden; + padding:0 10px; + box-sizing: border-box; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/historicalVersionList.vue b/jero-web/src/views/projectManagement/components/historicalVersionList.vue index a8ae0e96a..49a76744d 100644 --- a/jero-web/src/views/projectManagement/components/historicalVersionList.vue +++ b/jero-web/src/views/projectManagement/components/historicalVersionList.vue @@ -57,7 +57,7 @@ { title: this.$t('operation'), align: 'center', - width: 80, + width: 120, scopedSlots: { customRender: 'operation' } } ] diff --git a/jero-web/src/views/projectManagement/components/listAddModel.vue b/jero-web/src/views/projectManagement/components/listAddModel.vue index 2123d94ee..43fe69fbc 100644 --- a/jero-web/src/views/projectManagement/components/listAddModel.vue +++ b/jero-web/src/views/projectManagement/components/listAddModel.vue @@ -232,6 +232,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index af449af48..851ddc6f8 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -326,7 +326,7 @@
{{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' || formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -447,7 +447,7 @@
{{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === '' || @@ -568,7 +568,7 @@ {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' || formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles') @@ -1219,6 +1219,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e86246db4..0fc0f8603 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -878,17 +878,17 @@ (!this.dataSource[i].verifyDueDate && !this.dataSource[i].verifyDutyId && !this.dataSource[i].verifyInitiatorId && !this.dataSource[i].verifyDeliverableType)) { isTrue = true - }else{ + } else { isTrue = false this.$message.warning(this.$t('pleaseConformityVerification')) return } if ((this.dataSource[i].prehomoDueDate && this.dataSource[i].prehomoDutyId - && this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) || + && this.dataSource[i].prehomoInitiatorId && this.dataSource[i].prehomoDeliverableType) || (!this.dataSource[i].prehomoDueDate && !this.dataSource[i].prehomoDutyId - && !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)){ + && !this.dataSource[i].prehomoInitiatorId && !this.dataSource[i].prehomoDeliverableType)) { isTrue = true - }else{ + } else { isTrue = false this.$message.warning(this.$t('pleaseConfirmedByPrehomo')) return @@ -896,9 +896,9 @@ if ((this.dataSource[i].designDueDate && this.dataSource[i].designDutyId && this.dataSource[i].designInitiatorId && this.dataSource[i].designDeliverableType) || (!this.dataSource[i].designDueDate && !this.dataSource[i].designDutyId - && !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)){ + && !this.dataSource[i].designInitiatorId && !this.dataSource[i].designDeliverableType)) { isTrue = true - }else{ + } else { isTrue = false this.$message.warning(this.$t('pleaseDesignConformityConfirmation')) return @@ -956,6 +956,7 @@ } }) setTimeout(() => { + this.confirmLoading = true this.startProcess(this.dataSource[i]) }, 500) } @@ -994,6 +995,7 @@ this.visible = false this.selectedRowKeys = [] this.$message.success(this.$t('OperationSuccessful')) + this.confirmLoading = false this.getList() } else { this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue index 1eb5812c7..4c9ddb600 100644 --- a/jero-web/src/views/projectManagement/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/transferList.vue @@ -210,6 +210,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index 3f8fdbfac..aa2e079a9 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -340,6 +340,7 @@ export default { position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 5fe943684..8726d8987 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -435,6 +435,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue index 90953b979..ed56fdabc 100644 --- a/jero-web/src/views/system/DepartList.vue +++ b/jero-web/src/views/system/DepartList.vue @@ -660,6 +660,7 @@ /*position: absolute;*/ bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: left; diff --git a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue index d84845ded..0e5d53521 100644 --- a/jero-web/src/views/system/modules/DeptRoleAuthModal.vue +++ b/jero-web/src/views/system/modules/DeptRoleAuthModal.vue @@ -201,6 +201,7 @@ .drawer-bootom-button { position: absolute; bottom: 0; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/system/modules/DeptRoleUserModal.vue b/jero-web/src/views/system/modules/DeptRoleUserModal.vue index 6b9c7b82c..0a46915d6 100644 --- a/jero-web/src/views/system/modules/DeptRoleUserModal.vue +++ b/jero-web/src/views/system/modules/DeptRoleUserModal.vue @@ -190,6 +190,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/system/modules/GateWayRouteModal.vue b/jero-web/src/views/system/modules/GateWayRouteModal.vue index 2a9b9d48c..6e5fe8cc9 100644 --- a/jero-web/src/views/system/modules/GateWayRouteModal.vue +++ b/jero-web/src/views/system/modules/GateWayRouteModal.vue @@ -293,6 +293,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right; diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index 1949f3a6c..953820d4b 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -716,6 +716,7 @@ .drawer-bootom-button { position: absolute; bottom: -8px; + z-index:100; width: 100%; border-top: 1px solid #e8e8e8; padding: 10px 16px; diff --git a/jero-web/src/views/system/modules/UserRoleModal.vue b/jero-web/src/views/system/modules/UserRoleModal.vue index 48b8f970d..964fa73e5 100644 --- a/jero-web/src/views/system/modules/UserRoleModal.vue +++ b/jero-web/src/views/system/modules/UserRoleModal.vue @@ -189,6 +189,7 @@ position: absolute; bottom: 0; width: 100%; + z-index:100; border-top: 1px solid #e8e8e8; padding: 10px 16px; text-align: right;