From 91789cbdf0cb583619f60b6ec48a494d70e5a5dc Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Sat, 30 Sep 2023 17:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B7=BB=E5=8A=A0=E3=80=91=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B2=97=E4=BD=8D=E5=AD=97=E6=AE=B5=E5=88=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E5=92=8C=E7=BC=96=E8=BE=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/en-us.js               |  1 +
 src/common/lang/zh-cn.js               |  1 +
 src/views/system/UserList.vue          | 20 +++++++++++++-------
 src/views/system/modules/UserModal.vue |  6 +++---
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index 74e8b109..21048677 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -185,6 +185,7 @@ module.exports = {
     heads: 'Heads',
     account: 'Account',
     userName: 'User Name',
+    post: 'post',
     selectedAccount: 'Selected account?',
     // 新增、编辑用户
     loginPassword: 'Login Password',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index a8bb3dc2..27d7ccd5 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -185,6 +185,7 @@ module.exports = {
     heads: '头像',
     account: '账号',
     userName: '用户姓名',
+    post: '岗位',
     selectedAccount: '选中账号?',
     // 新增、编辑用户
     loginPassword: '登录密码',
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index ee1cd132..f8b75966 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -246,13 +246,13 @@ export default {
             return parseInt(index) + 1
           }
         },
-        {
-          title: this.$t('user.heads'),
-          align: 'center',
-          width: 120,
-          dataIndex: 'avatar',
-          scopedSlots: { customRender: 'avatarslot' }
-        },
+        // {
+        //   title: this.$t('user.heads'),
+        //   align: 'center',
+        //   width: 120,
+        //   dataIndex: 'avatar',
+        //   scopedSlots: { customRender: 'avatarslot' }
+        // },
         {
           title: this.$t('user.account'),
           align: 'center',
@@ -266,6 +266,12 @@ export default {
           width: 100,
           dataIndex: 'realname'
         },
+        {
+          title: this.$t('user.post'),
+          align: 'center',
+          width: 100,
+          dataIndex: 'post'
+        },
         {
           title: this.$t('user.gender'),
           align: 'center',
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 6423d216..6309f243 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -48,9 +48,9 @@
           <a-input :placeholder="$t('pleaseEnter') + $t('user.userName')" v-model="model.realname" :maxLength="50" :disabled="disableSubmit" />
         </a-form-model-item>
 
-        <!--<a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-        <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
-        <!--</a-form-model-item>-->
+        <a-form-model-item :label="$t('user.post')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="post">
+          <a-input :placeholder="$t('pleaseEnter') + $t('user.post')" v-model="model.post" :maxLength="50" :disabled="disableSubmit" />
+        </a-form-model-item>
 
         <a-form-model-item :label="$t('user.roleAssignment')" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled">
           <j-multi-select-tag