From 161bf6e87a4629bc5b958ec890eff33747085a31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 14 Feb 2023 10:08:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=88=97=E8=A1=A8=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= 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 | 2 +- jero-web/src/views/system/modules/UserModal.vue | 12 ++++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index ceeddab0d..4c187d4d7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1376,7 +1376,7 @@ module.exports = { Updateparametercolumn:'Update The Parameter Column', columnfirst:'Reference the parameter column first', columnforced:'Confirm a forced retraction?', - customize:'Customize the header', + customize:'List setting', customColumn:'Custom column', } \ 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 bf6a67de7..5389c8ff0 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1477,6 +1477,6 @@ module.exports = { brand:'品牌', allsubitemsitem:'该项目下拥有子项目，是否全部删除', contactTheFounder:'联系作者', - customize:'自定义表头', + customize:'列表设置', customColumn:'自定义列', } \ No newline at end of file diff --git a/jero-web/src/views/system/modules/UserModal.vue b/jero-web/src/views/system/modules/UserModal.vue index c9168d230..885cf6ad5 100644 --- a/jero-web/src/views/system/modules/UserModal.vue +++ b/jero-web/src/views/system/modules/UserModal.vue @@ -483,17 +483,11 @@ handleSubmitOk() { this.confirmLoading = true let selectedRole = JSON.parse(JSON.stringify(this.selectedRole)) - 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: this.dutyTerritories ? dutyTerritorie.join(',') : '', - brands: this.brands ? brand.join(',') : '' + dutyTerritories: this.dutyTerritories ? this.dutyTerritories.join(',') : '', + brands: this.brands ? this.brands.join(',') : '' } postAction('/sys/user/setRole', param).then((res) => { if (res.success) { @@ -643,6 +637,8 @@ this.userDepartModel = { userId: '', departIdList: [] } this.checkedDepartNames = [] this.checkedDepartNameString = '' + this.dutyTerritories = [] + this.brands = [] this.checkedDepartKeys = [] this.selectedDepartKeys = [] this.resultDepartOptions = [] From 7fab5980a77f30c8407616ef104249aa9da7e053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 14 Feb 2023 10:45:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 9a567ace4..80dd20d1e 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -253,7 +253,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - + - - {{$t('view')}} - - + + + + + + {{text}} @@ -811,13 +811,13 @@ } ] }, - { - title: this.$t('operation'), - align: 'left', - fixed: 'right', - width: 200, - scopedSlots: { customRender: 'operation' } - }, + // { + // title: this.$t('operation'), + // align: 'left', + // fixed: 'right', + // width: 200, + // scopedSlots: { customRender: 'operation' } + // }, { title: this.$t('operation'), align: 'left', From eba8909eaa5d047185000bc1e9c4e12433e46b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 14 Feb 2023 13:38:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/listOfRegulations.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 80dd20d1e..04685c2cb 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -3145,9 +3145,9 @@ //font-weight: bold; //background: #f3f6f6; //} - .ant-table-row-cell-ellipsis{ - padding: 0!important; - } + //.ant-table-row-cell-ellipsis{ + // padding: 0!important; + //} .second{ padding: 0!important; } From a0529107ee163a1ae878b7426bae941c9bed6266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Tue, 14 Feb 2023 13:39:54 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85-=E8=A1=A8=E5=A4=B4=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/virtualListDetails.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 44fd59ff1..507e800ba 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1996,9 +1996,9 @@ popconfirmmize { //font-weight: bold; //background: #f3f6f6; //} -.ant-table-row-cell-ellipsis{ - padding: 0!important; -} +//.ant-table-row-cell-ellipsis{ +// padding: 0!important; +//} .second{ padding: 0!important; } From 733a7d0c2a9489a910099341684f83571dbbc471 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 14 Feb 2023 14:06:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/listOfRegulations.vue | 5435 +++++++++-------- 1 file changed, 2745 insertions(+), 2690 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 80dd20d1e..4bcd32658 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -32,183 +32,185 @@ + :triggerChange="false" :dictCode="'duty_territory'" /> + :fieldList="fieldList" /> {{ $t('query') }} {{ $t('reset') }} {{ !toggleSearchStatus ? $t('open') : $t('away') }} - + - +
- + -
- +
+ {{ $t('customize') }}
- + {{ $t('initiateListConfirmation') }}
- + {{ $t('initiateTaskConfirmation') }}
- +
...{{ $t('more') }}
- - - - + + + +
- + {{ $t('bringInRelevantPersonnel') }}
- + {{ $t('Transfer') }}
- + {{ $t('add') }}
- + {{ $t('roleSwitching') }}
@@ -216,25 +218,25 @@
- + {{ $t('export') }}
- + {{ $t('submit') }}
- + {{ $t('overrule') }}
- + {{ $t('batchSettingInformation') }}
- + {{ $t('roleSwitching') }}
@@ -253,7 +255,7 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > - + - {{$t('view')}} + {{ $t('view') }} - {{$t('resultReported')}} + {{ $t('resultReported') }} - - - - - - + + + {{ $t('view') }} + + - {{text}} + {{ text }} - {{text}} + {{ text }} {{ record.designDeliverableTypeName }}
- - - - - - - + + + + + + + -- {{ record.prehomoDeliverableTypeName }}
- - - - - - - + + + + + + + -- {{ record.verifyDeliverableTypeName }}
- - - - - - - + + + + + + + --
- {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}} + {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
- - - - - - - + + + + + + + + style="width: 100%" /> + style="width: 100%" /> @@ -400,7 +402,7 @@ > - {{$t('See')}} + {{ $t('See') }} {{ $t('download') }} @@ -439,14 +441,14 @@
* - {{$t('reasonsForRejection')}} + {{ $t('reasonsForRejection') }}
+ v-model="formInlineComment.commentContent" :rows="4" />
@@ -469,7 +471,7 @@
* - {{$t('roleSwitching')}} + {{ $t('roleSwitching') }}
{{$t('pleaseSelect')}}--> - {{item.roleName}} + {{ item.roleName }} @@ -487,1264 +489,1098 @@ - {{$t('dataLoading')}} - - - + {{ $t('dataLoading') }} + + + \ No newline at end of file From 3504521f662b9e3546757f0f7ca3518df1d384cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 14 Feb 2023 14:09:17 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HeadCustomEOServiceImpl.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index fe568987f..56c09a81f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -264,7 +264,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl