Merge pull request '修改bug' (#79) from zwq into develop

Reviewed-on: #79

src/lang/i18n/en/module/basicData.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-19 10:24:03
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-22 10:35:16
  * @Description: file content
  */
 export default {
@@ -362,6 +362,11 @@ export default {
     publishTask: 'Publish The Task',
     startPosition: 'Start',
     endPosition: 'End',
-    taskType: 'Task Type'
+    taskType: 'Task Type',
+    ExWarehouse: 'Ex Warehouse',
+    InWarehouse: 'In Warehouse',
+    Circulation: 'Circulation',
+    Initialization: 'Initialization',
+    Damage: 'Damage'
   }
 }

src/lang/i18n/zh/module/basicData.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-20 09:45:01
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-22 10:34:57
  * * @Description: file content
  */
 export default {
@@ -366,6 +366,11 @@ export default {
     publishTask: '发布任务',
     startPosition: '起点',
     endPosition: '终点',
-    taskType: '任务类型'
+    taskType: '任务类型',
+    ExWarehouse: '出库',
+    InWarehouse: '入库',
+    Circulation: '流转',
+    Initialization: '初始化',
+    Damage: '损坏'
   }
 }

src/views/basicData/Warehouse/CurrentTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:45:43
+ * @LastEditTime: 2022-03-22 10:36:05
  * @Description:
 -->
 <template>
@@ -194,20 +194,20 @@ export default {
         size: 10
       },
       taskTypeList: [{
-        'label': '出库',
+        'label': i18n.t('module.basicData.Warehouse.ExWarehouse'),
         'value': 0
       }, {
-        'label': '入库',
+        'label': i18n.t('module.basicData.Warehouse.InWarehouse'),
         'value': 1
       }, {
-        'label': '流转',
+        'label': i18n.t('module.basicData.Warehouse.Circulation'),
         'value': 2
       }],
       TaskStatusList: [{
-        'label': '初始化',
+        'label': i18n.t('module.basicData.Warehouse.Initialization'),
         'value': 0
       }, {
-        'label': '损坏',
+        'label': i18n.t('module.basicData.Warehouse.Damage'),
         'value': 1
       }],
       VehicleNameList: [{