From dcd810a08931c9f43393a9b76d93ed144ad7cfe9 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 21 Nov 2023 15:44:50 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/UserList.vue             | 14 ++++++------
 src/views/system/modules/DeptUserInfo.vue | 26 +++++++++++------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index fa549593..54626222 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -8,7 +8,7 @@
 
           <a-col :md="6" :sm="12">
             <a-form-item :label="$t('user.userAccount')">
-              <j-input :placeholder="$t('user.enterAccountFuzzyQuery')" v-model="queryParam.username"></j-input>
+              <j-input :placeholder="$t('pleaseEnter') + $t('user.userAccount')" v-model="queryParam.username"></j-input>
             </a-form-item>
           </a-col>
 
@@ -23,20 +23,20 @@
           </a-col>
 
           <a-col :md="6" :sm="12">
-            <a-form-item :label="$t('user.realName')">
-              <j-input :placeholder="$t('pleaseEnter') + $t('user.realName')" v-model="queryParam.realname"></j-input>
+            <a-form-item :label="$t('user.userName')">
+              <j-input :placeholder="$t('pleaseEnter') + $t('user.userName')" v-model="queryParam.realname"></j-input>
             </a-form-item>
           </a-col>
 
           <template v-if="toggleSearchStatus">
             <a-col :md="6" :sm="12">
               <a-form-item :label="$t('phoneNumber')">
-                <a-input :placeholder="$t('user.pleaseEnterFullPhone')" v-model="queryParam.phone"></a-input>
+                <a-input :placeholder="$t('pleaseEnter') + $t('phoneNumber')" v-model="queryParam.phone"></a-input>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="12">
-              <a-form-item :label="$t('user.userStatues')">
-                <a-select v-model="queryParam.status" :placeholder="$t('pleaseSelect')">
+              <a-form-item :label="$t('status')">
+                <a-select v-model="queryParam.status" :placeholder="$t('pleaseSelect') + $t('status')">
                   <a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
                   <a-select-option value="1">{{ $t('normal') }}</a-select-option>
                   <a-select-option value="2">{{ $t('user.frozen') }}</a-select-option>
@@ -246,7 +246,7 @@ export default {
         //   scopedSlots: { customRender: 'avatarslot' }
         // },
         {
-          title: this.$t('user.account'),
+          title: this.$t('user.userAccount'),
           align: 'center',
           dataIndex: 'username',
           width: 150,
diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue
index 0961a78d..165d3d7d 100644
--- a/src/views/system/modules/DeptUserInfo.vue
+++ b/src/views/system/modules/DeptUserInfo.vue
@@ -21,7 +21,7 @@
     <div class="table-operator" style="margin-top: -15px">
       <!--<a-button @click="handleEdit" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
       <a-button @click="handleAddUserDepart" type="primary" icon="plus">添加已有用户</a-button>
-      <a-button @click="handleAdd" type="primary" icon="plus" style="margin-top: 16px">新建用户</a-button>
+      <!--<a-button @click="handleAdd" type="primary" icon="plus" style="margin-top: 16px">新建用户</a-button>-->
 
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
@@ -111,7 +111,7 @@ export default {
         dataIndex: 'username'
       },
       {
-        title: '用户名称',
+        title: '用户姓名',
         align: 'center',
         dataIndex: 'realname'
       },
@@ -265,17 +265,17 @@ export default {
       this.$refs.modalForm.disableSubmit = false
       this.$refs.modalForm.edit(record)
     },
-    handleAdd: function () {
-      if (!this.currentDeptId) {
-        this.$message.warning('请选择一个部门!')
-      } else {
-        this.$refs.modalForm.departDisabled = true
-        // 初始化负责部门
-        this.$refs.modalForm.nextDepartOptions = [{ value: this.currentDept.key, label: this.currentDept.title }]
-        this.$refs.modalForm.title = '新增'
-        this.$refs.modalForm.edit({ activitiSync: '1', userIdentity: 1, selecteddeparts: this.currentDeptId })
-      }
-    },
+    // handleAdd: function () {
+    //   if (!this.currentDeptId) {
+    //     this.$message.warning('请选择一个部门!')
+    //   } else {
+    //     this.$refs.modalForm.departDisabled = true
+    //     // 初始化负责部门
+    //     this.$refs.modalForm.nextDepartOptions = [{ value: this.currentDept.key, label: this.currentDept.title }]
+    //     this.$refs.modalForm.title = '新增'
+    //     this.$refs.modalForm.edit({ activitiSync: '1', userIdentity: 1, selecteddeparts: this.currentDeptId })
+    //   }
+    // },
     selectOK (data) {
       const params = {}
       params.depId = this.currentDeptId