From 79b7fe0eec330013e7e8220f8bea74d1ffa2fa7d Mon Sep 17 00:00:00 2001
From: Fanzink <460995166@qq.com>
Date: Wed, 16 Mar 2022 09:41:00 +0800
Subject: [PATCH 1/4] =?UTF-8?q?'=E6=9B=B4=E6=96=B0'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/i18n/en/module/basicData.js              | 15 ++++++++-------
 src/lang/i18n/zh/module/basicData.js              | 11 ++++-------
 .../GroupModule/components/staff-add.vue          |  8 ++++----
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js
index 26e771a..e8a59dc 100644
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -1,13 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:38
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:58:20
->>>>>>> develop
+ * @LastEditTime: 2022-03-15 18:33:48
  * @Description: file content
  */
 export default {
@@ -174,7 +169,13 @@ export default {
     processEquipment: 'Process Equipment',
     sheCode: 'Shelf Code',
     sheName: 'Shelf Name',
-    locaNum: 'Location Number'
+    locaNum: 'Location Number',
+    addLocation: 'Add Location',
+    columnMark: 'Column Mark',
+    rowMark: 'Row Mark',
+    status: 'Status',
+    man: 'Man',
+    woman: 'Woman'
   },
   storageBox: {
     name: 'Name',
diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index 4af5db4..02b6560 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,14 +1,9 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:20
+ * @LastEditTime: 2022-03-15 18:33:24
  * @Description: file content
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:58:12
->>>>>>> develop
  */
 export default {
   visual: {
@@ -165,7 +160,9 @@ export default {
     processEquipment: '工艺设备',
     sheCode: '货架编码',
     sheName: '货架名',
-    locaNum: '库存数量'
+    locaNum: '库存数量',
+    man: '男',
+    woman: '女'
   },
   storageBox: {
     name: '存储箱名称',
diff --git a/src/views/basicData/GroupModule/components/staff-add.vue b/src/views/basicData/GroupModule/components/staff-add.vue
index 1d3287f..a48a8c4 100644
--- a/src/views/basicData/GroupModule/components/staff-add.vue
+++ b/src/views/basicData/GroupModule/components/staff-add.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-04 10:06:01
+ * @LastEditors: fzq
+ * @LastEditTime: 2022-03-15 18:33:01
  * @Description:
 -->
 <template>
@@ -169,10 +169,10 @@ export default {
         }]
       },
       sexOptions: [{
-        'label': '男',
+        'label': this.$t('module.basicData.cache.man'),
         'value': 1
       }, {
-        'label': '女',
+        'label': this.$t('module.basicData.cache.woman'),
         'value': 0
       }],
       onDutyOptions: [{

From 6b20524a5f3064a213077038caf3df00a932622c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BF=97=E9=92=A6?= <12345678@qq.com>
Date: Wed, 16 Mar 2022 09:52:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'src/lang/i18n/zh/modu?=
 =?UTF-8?q?le/basicData.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/i18n/zh/module/basicData.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index a0a9c68..341d5ab 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,15 +1,9 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
  * @LastEditTime: 2022-03-15 18:33:24
  * @Description: file content
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:16:52
->>>>>>> develop
- */
 export default {
   visual: {
     addNow: '请先完成当前点位添加！',

From 4a834c3dc18db365c809f9d833ced8cc36e9eecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BF=97=E9=92=A6?= <12345678@qq.com>
Date: Wed, 16 Mar 2022 09:53:04 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'src/lang/i18n/en/modu?=
 =?UTF-8?q?le/basicData.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/i18n/en/module/basicData.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/lang/i18n/en/module/basicData.js b/src/lang/i18n/en/module/basicData.js
index 85f9c74..e8a59dc 100644
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -1,13 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
  * @LastEditTime: 2022-03-15 18:33:48
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-15 10:17:01
->>>>>>> develop
  * @Description: file content
  */
 export default {

From 643277e1c732a8419e61b62e5d32e883ce1eae6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BF=97=E9=92=A6?= <12345678@qq.com>
Date: Wed, 16 Mar 2022 09:53:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'src/lang/i18n/zh/modu?=
 =?UTF-8?q?le/basicData.js'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/i18n/zh/module/basicData.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lang/i18n/zh/module/basicData.js b/src/lang/i18n/zh/module/basicData.js
index 341d5ab..146e589 100644
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -2,8 +2,9 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-15 18:33:24
+ * @LastEditTime: 2022-03-15 18:33:48
  * @Description: file content
+ */
 export default {
   visual: {
     addNow: '请先完成当前点位添加！',