From 161bf6e87a4629bc5b958ec890eff33747085a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Tue, 14 Feb 2023 10:08:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=88=97=E8=A1=A8=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E4=BF=AE=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 = []