From 4a1340045c64b5ba9ed9aa3b5fdac0abe7cb1afb Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 24 Jul 2024 10:02:17 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=A4=A7=E5=B0=8F=E4=B8=BA=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E4=B8=8D=E5=A4=A7=E4=BA=8E=EF=BC=8C=E9=80=89=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E5=88=97=EF=BC=8C=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E5=A7=93=E5=90=8D=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E5=89=8D=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/en-us.js                     |  2 +-
 src/common/lang/zh-cn.js                     |  2 +-
 src/components/selection/UserSelectModal.vue | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index 95acb52..49d69d2 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -214,7 +214,7 @@ module.exports = {
   supportingMaterial: 'Supporting material',
   support: 'You can upload files in ',
   formatUpload: ' formats. ',
-  theSizeIs: 'The size is ',
+  theSizeIs: 'Not more than ',
   loginExpired: 'Login has expired',
   loginExpiredMessage: 'Sorry, the login has expired. Please log in again',
   logInAgain: 'Log in again',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index a7de709..be50624 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -231,7 +231,7 @@ module.exports = {
   supportingMaterial: '佐证材料',
   support: '支持',
   formatUpload: '格式上传，',
-  theSizeIs: '大小为',
+  theSizeIs: '不大于',
   loginExpired: '登录已过期',
   loginExpiredMessage: '很抱歉，登录已过期，请重新登录',
   logInAgain: '重新登录',
diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue
index acce558..2b1af6b 100644
--- a/src/components/selection/UserSelectModal.vue
+++ b/src/components/selection/UserSelectModal.vue
@@ -35,18 +35,18 @@
               </j-search-select-tag>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item :label="$t('user.workNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-input :placeholder="$t('pleaseEnter')"
-                       v-model="queryParam.username"></j-input>
-            </a-form-item>
-          </a-col>
           <a-col :span="6">
             <a-form-item :label="$t('userSelect.name')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-input :placeholder="$t('pleaseEnter')"
                        v-model="queryParam.realname"></j-input>
             </a-form-item>
           </a-col>
+          <a-col :span="6">
+            <a-form-item :label="$t('user.workNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-input :placeholder="$t('pleaseEnter')"
+                       v-model="queryParam.username"></j-input>
+            </a-form-item>
+          </a-col>
           <a-col :span="6">
             <a-form-item :label="$t('system.groupMange.groupName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-search-select-tag
@@ -208,6 +208,12 @@ export default {
           align: 'center',
           scopedSlots: { customRender: 'text' }
         },
+        {
+          title: this.$t('department'),
+          dataIndex: 'orgCodeTxt',
+          align: 'center',
+          scopedSlots: { customRender: 'text' }
+        },
         {
           title: this.$t('userSelect.post'),
           dataIndex: 'post',