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 + :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') }}
@@ -266,7 +268,7 @@ - {{$t('view')}} + {{ $t('view') }} - {{$t('resultReported')}} + {{ $t('resultReported') }} - {{$t('view')}} + {{ $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 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 = []