From cf9ca7dca694c59da96d7795119e007d4486377d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 22 Jul 2025 00:55:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E6=AE=B5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/index/index-dev.vue |  2 +-
 src/views/staff/aStaffList.vue     | 12 ++++++------
 src/views/staff/staffLang.js       |  4 ++++
 src/views/user/login/Login.vue     |  6 +++++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/index/index-dev.vue b/src/components/index/index-dev.vue
index 4705e7306..81f23ee8e 100644
--- a/src/components/index/index-dev.vue
+++ b/src/components/index/index-dev.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="padding">
         <div class="vc-index-nav">
             <span><i class="fa fa-home margin-right-sm"></i>首页</span><span
                 class="margin-left-sm margin-right-sm">/</span><span>开发中心</span>
diff --git a/src/views/staff/aStaffList.vue b/src/views/staff/aStaffList.vue
index c6b2ea130..a2bad48bc 100644
--- a/src/views/staff/aStaffList.vue
+++ b/src/views/staff/aStaffList.vue
@@ -1,18 +1,18 @@
 <template>
-  <div>
+  <div class="padding">
     <el-card class="box-card margin-bottom">
       <div slot="header" class="clearfix flex justify-between">
         <span>{{ $t('staff.searchConditions') }}</span>
       </div>
       <el-row :gutter="20">
         <el-col :span="6">
-          <el-input :placeholder="$t('staff.staffIdPlaceholder')" v-model="searchConditions.staffId" clearable />
+          <el-input :placeholder="$t('staff.staffId')" v-model="searchConditions.staffId" clearable />
         </el-col>
         <el-col :span="6">
-          <el-input :placeholder="$t('staff.staffNamePlaceholder')" v-model="searchConditions.name" clearable />
+          <el-input :placeholder="$t('staff.staffName')" v-model="searchConditions.name" clearable />
         </el-col>
         <el-col :span="6">
-          <el-input :placeholder="$t('staff.phonePlaceholder')" v-model="searchConditions.tel" clearable />
+          <el-input :placeholder="$t('staff.phoneNumber')" v-model="searchConditions.tel" clearable />
         </el-col>
         <el-col :span="6">
           <el-button type="primary" @click="queryStaff">
@@ -24,7 +24,7 @@
 
     <el-card class="box-card">
       <div slot="header" class="clearfix  flex justify-between">
-        <span>{{ $t('staff.staffInfo') }}</span>
+        <span>{{ $t('staff.staffManagement') }}</span>
         <el-button v-if="hasPrivilege(['502022082992310001', '502022101889270183'])" type="primary" size="small"
           class="float-right" @click="openAddStaffPage">
           {{ $t('staff.add') }}
@@ -51,7 +51,7 @@
               {{ $t('staff.edit') }}
             </el-button>
             <el-button size="mini" @click="openResetPwd(scope.row)">
-              {{ $t('staff.resetPwd') }}
+              {{ $t('staff.resetPassword') }}
             </el-button>
             <el-button
               v-if="scope.row.relCd !== '600311000001' && hasPrivilege(['502022082920350003', '502022101887680185'])"
diff --git a/src/views/staff/staffLang.js b/src/views/staff/staffLang.js
index ea1b96a21..f7f02c139 100644
--- a/src/views/staff/staffLang.js
+++ b/src/views/staff/staffLang.js
@@ -13,6 +13,8 @@ export const messages = {
       staffNumber: 'Staff Number',
       name: 'Name',
       phone: 'Phone',
+      position: 'Position',
+      idCard: 'ID Card',
       relatedOrg: 'Related Organization',
       email: 'Email',
       address: 'Address',
@@ -62,6 +64,8 @@ export const messages = {
       staffNumber: '员工编号',
       name: '名称',
       phone: '手机号',
+      position: '职位',
+      idCard: '身份证',
       relatedOrg: '关联组织',
       email: '邮箱',
       address: '地址',
diff --git a/src/views/user/login/Login.vue b/src/views/user/login/Login.vue
index 174730054..1cc6ee1b2 100644
--- a/src/views/user/login/Login.vue
+++ b/src/views/user/login/Login.vue
@@ -83,7 +83,11 @@ export default {
         if (valid) {
           this.loading = true;
           try {
-            const { data } = await login(this.loginForm);
+            const { data } = await login(this.loginForm).catch(error => {
+              this.$message.error(error.response.data);
+              this.refreshCaptcha();
+              return { data: [] };  
+            });
 
             if (data && data.length > 1) {
               this.$refs.selectLoginUserRef.openDialog(data);