From 2361b16c305a67581690f2464870af71b48145b5 Mon Sep 17 00:00:00 2001
From: jiangweidong <weidong.jiang@fit2cloud.com>
Date: Mon, 10 Apr 2023 16:43:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E5=8C=BA=E5=8F=B7=E6=9B=B4=E6=96=B0=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E5=8F=8A=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormFields/PhoneInput.vue     | 20 ++++++++++++--------
 src/i18n/langs/en.json                       |  1 +
 src/i18n/langs/ja.json                       |  1 +
 src/i18n/langs/zh.json                       |  1 +
 src/views/users/User/UserDetail/UserInfo.vue |  3 ++-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/components/FormFields/PhoneInput.vue b/src/components/FormFields/PhoneInput.vue
index 453710a8f..f82700de7 100644
--- a/src/components/FormFields/PhoneInput.vue
+++ b/src/components/FormFields/PhoneInput.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
-    <el-input v-model="rawValue.phone" placeholder="请输入手机号码" @change="OnInputChange">
+    <el-input v-model="rawValue.phone" :placeholder="$tc('users.inputPhone')" @input="OnInputChange">
       <el-select
         slot="prepend"
         :value="rawValue.code"
-        style="width: 80px;"
+        :placeholder="$tc('common.Select')"
+        style="width: 90px;"
         @change="OnChange"
       >
         <el-option
@@ -51,14 +52,18 @@ export default {
       ]
     }
   },
-  computed: {},
+  computed: {
+    fullPhone() {
+      return `${this.rawValue.code} ${this.rawValue.phone}`
+    }
+  },
   mounted() {
-    this.rawValue = this.value
+    this.rawValue = this.value || {}
     if (!this.rawValue?.code) {
       this.rawValue.code = '+86'
+      this.rawValue.phone = ''
     } else {
-      const value = `${this.rawValue.code}${this.rawValue.phone}`
-      this.$emit('input', value)
+      this.$emit('input', this.fullPhone)
     }
   },
   methods: {
@@ -67,8 +72,7 @@ export default {
       this.OnInputChange()
     },
     OnInputChange() {
-      const value = `${this.rawValue.code}${this.rawValue.phone}`
-      this.$emit('input', value)
+      this.$emit('input', this.fullPhone)
     }
   }
 }
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 3c4c181c3..eec8d1533 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1720,6 +1720,7 @@
     "Set": "Set",
     "Login": "Users login",
     "InviteSuccess": "Invite success",
+    "inputPhone": "Please enter your mobile phone number",
     "FileEncryptionPassword": "File encryption password",
     "OrgRoles": "Org roles",
     "RoleUsers": "Role users",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 8dba239ce..db0a5fe14 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -1712,6 +1712,7 @@
     "Set": "設定",
     "Login": "ユーザー登録",
     "InviteSuccess": "成功招待",
+    "inputPhone": "携帯電話の番号をお願いします",
     "FileEncryptionPassword": "ファイル暗号化パスワード",
     "RoleUsers": "承認されたユーザー",
     "RoleInfo": "ロール情報",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 7f4e5fb9f..3b8daf1b4 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1708,6 +1708,7 @@
     "Set": "已设置",
     "Login": "用户登录",
     "InviteSuccess": "邀请成功",
+    "inputPhone": "请输入手机号码",
     "FileEncryptionPassword": "文件加密密码",
     "RoleUsers": "授权用户",
     "RoleInfo": "角色信息",
diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index 9704539e7..f69a3aecf 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -180,7 +180,8 @@ export default {
         {
           key: this.$t('users.Phone'),
           formatter: () => {
-            return <div>{this.object.phone.phone}</div>
+            const phoneObj = this.object.phone
+            return <div>{phoneObj?.code} {phoneObj?.phone}</div>
           }
         },
         'wecom_id', 'dingtalk_id', 'feishu_id',