From 76ece9f57c43743ceaed69898a87c24439dfe4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 17 Mar 2023 09:47:05 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B7=A5=E5=85=B7-?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ImportFile/index.vue | 7 +++++++ .../certificationListMaintenance.vue | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 44710eaad..138fe4892 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -57,6 +57,10 @@ projectLibraryId: { type: String, default: '' + }, + authDummyInventoryBaseId: { + type: String, + default: '' } }, data() { @@ -76,7 +80,10 @@ return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '¶msTemplateId=' + this.paramsTemplateId } else if (this.projectLibraryId) { return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId + } else if (this.authDummyInventoryBaseId) { + return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&authDummyInventoryBaseId=' + this.authDummyInventoryBaseId } + return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut } }, diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 164683de9..aa547a86c 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -86,7 +86,7 @@
-
From 44037432eed33c5f845e43d65ef43f11473fa012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Fri, 17 Mar 2023 09:57:53 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B8=85=E5=8D=95-=E5=AF=BC=E5=85=A5-=E5=AF=BC?= =?UTF-8?q?=E5=87=BA-=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index a2a496ece..7ad6c4dee 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -567,15 +567,16 @@ }, url: { list: '/project/projectCertificationInventoryEO/page', - exportTemplate: '', - exportData: '', + exportTemplate: '/project/projectCertificationInventoryEO/exportTemplate', + exportData: '/project/projectCertificationInventoryEO/exportData', deleteBatch: '/project/projectCertificationInventoryEO/deleteBatch', setBatch: '/project/projectCertificationInventoryEO/setBatch', deleteOne: '/project/projectCertificationInventoryEO/delete', AndUserId: '/project/projectLibraryRoleRelEO/queryByProjectLibraryIdAndUserId', AndUserIdEdit: '/project/projectLibraryRoleRelEO/edit', saveBatch: '/project/projectCertificationInventoryEO/saveBatch', - questionUrl: '/project/projectCertificationInventoryEO/expediting' + questionUrl: '/project/projectCertificationInventoryEO/expediting', + importZipUrl: '/project/projectCertificationInventoryEO/importData', }, dataSource: [], roleSwitchingCode: '', From 69bdc91008a224685ae9bc56b9971ba9982e72f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Fri, 17 Mar 2023 10:23:23 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 10 +- .../components/listOfRegulations.vue | 153 +++++++++--------- 2 files changed, 83 insertions(+), 80 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 7ad6c4dee..39ce27b8a 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -1297,13 +1297,13 @@ this.visibleRoleSwitching = true this.$nextTick(() => { this.$refs.ruleFormRoleSwitching.clearValidate() - if (!this.formInlineRoleSwitching.roleSwitchingCode) { - this.formInlineRoleSwitching.roleSwitchingCode = '0' + if (!this.roleSwitchingCode) { + this.roleSwitchingCode = '0' } - if (!(this.roleSwitchingList.some(val => val.roleCode == this.formInlineRoleSwitching.roleSwitchingCode))) { - this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : '' + if (!(this.roleSwitchingList.some(val => val.roleCode == this.roleSwitchingCode))) { + this.roleSwitchingCode = this.roleSwitchingList[0] ? this.roleSwitchingList[0].roleCode : '' } - this.roleSwitchingCode = this.formInlineRoleSwitching.roleSwitchingCode + this.formInlineRoleSwitching.roleSwitchingCode = this.roleSwitchingCode this.formInlineRoleSwitching = { ...this.formInlineRoleSwitching } }) }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index a71f49006..500838bc6 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -35,48 +35,48 @@ :triggerChange="false" :dictCode="'duty_territory'" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $t('query') }} {{ $t('reset') }} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + + + @@ -99,22 +99,22 @@ style="overflow:hidden;margin-bottom: 20px">
-
+
{{ $t('Transfer') }}
-
+
{{ $t('bringInRelevantPersonnel') }}
-
+
{{ $t('BatchSetting') }}
- +