From 971def33fb28d012f3aae5ac99de3bc4a7a7d3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 14 Feb 2023 09:26:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8F=90=E4=BA=A4=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 3 +++ jero-web/src/views/system/modules/UserModal.vue | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 0d3a69dbb..9a567ace4 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -3119,6 +3119,9 @@ .popconfirmmize .anticon-exclamation-circle { display: none !important; } + .popconfirmmize .ant-popover-message{ + padding: 4px 0 36px!important; + } //.popconfirm .ant-popover-inner-content{ // padding: 0px 16px; //} diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index eb9a4c3e5..c9168d230 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -483,13 +483,17 @@ handleSubmitOk() { this.confirmLoading = true let selectedRole = JSON.parse(JSON.stringify(this.selectedRole)) - let dutyTerritorie = JSON.parse(JSON.stringify(this.dutyTerritories)) - let brand = JSON.parse(JSON.stringify(this.brands)) + if(this.dutyTerritories){ + let dutyTerritorie = JSON.parse(JSON.stringify(this.dutyTerritories)) + } + if(this.brands){ + let brand = JSON.parse(JSON.stringify(this.brands)) + } let param = { ids: this.userId, selectedroles: selectedRole.join(','), - dutyTerritories: dutyTerritorie.join(','), - brands: brand.join(',') + dutyTerritories: this.dutyTerritories ? dutyTerritorie.join(',') : '', + brands: this.brands ? brand.join(',') : '' } postAction('/sys/user/setRole', param).then((res) => { if (res.success) { From ffc89b63f11aff1a1b166f3d86809b6942a45048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 14 Feb 2023 09:34:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/virtualListDetails.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index ce055e3c0..44fd59ff1 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1987,6 +1987,9 @@ popconfirmmize { .popconfirmmize .anticon-exclamation-circle { display: none !important; } +.popconfirmmize .ant-popover-message{ + padding: 4px 0 36px!important; +} //.customizetable .ant-table-thead > tr > th { // height: 46px !important; //padding: 8px 8px !important;