'修改bug'

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

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-08 09:46:00
- * @LastEditors: gtz
- * @LastEditTime: 2021-04-15 19:35:00
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 15:07:02
  * @Description: file content
  */
 
@@ -47,6 +47,7 @@ export default {
   sameEqError: '不能选择相同的设备!',
   processList: {
     processName: '工序名称',
+    processCode: '工序编码',
     processEq: '工序设备',
     description: '描述',
     addProcess: '添加一道工序',

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

@@ -1,9 +1,14 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
+<<<<<<< HEAD
  * @LastEditors: fzq
  * @LastEditTime: 2022-03-10 14:05:01
  * @Description: file content
+=======
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-09 16:34:50
+>>>>>>> develop
  */
 export default {
   visual: {
@@ -30,6 +35,7 @@ export default {
     cancelButtonText: '取消',
     Tips: '提示',
     TipsBefore: '确定删除',
+    TipsStorageBefore: '确定添加库位:',
     Description: '描述',
     Remarks: '备注',
     Or: '或',
@@ -311,6 +317,7 @@ export default {
     BoxStatus: '箱状态',
     BoxNumber: '箱号',
     PreviousOperation: '上一个工序',
+    ExecutionOperation: '执行工序',
     NextOperation: '下一个工序',
     CompletionTime: '完成时间',
     StartLocation: '开始库位',
@@ -318,15 +325,20 @@ export default {
     TaskLocation: '任务库位',
     TargetLocation: '目标库位',
     OrderName: '工单名',
+    OrderType: '工单类型',
     OrderCode: '工单编码',
     IssueOrderTime: '下发工单时间',
+    startProduceTime: '开始生产时间',
     TotalProcessName: '总工艺名称',
     Priority: '优先级',
+    scrapQuantity: '废片数量',
     OrderStatus: '工单状态',
+    triggerOrigin: '工单发起方',
     ProcessOrNot: '是否关联工艺',
     Unit: '单位',
     RelateProcess: '关联工艺',
     PlanProcessQuantity: '计划加工数量',
+    actualProcessQuantity: '实际加工数量',
     SubProcessName: '分工艺',
     TaskBoxNumber: '任务箱号',
     FullBoxNumber: '空箱号',
@@ -339,7 +351,10 @@ export default {
     IsEmpty: '是否有基板',
     IsEmptyBox: '是否空箱',
     LocationName: '库位名',
-    LocationCode: '库位编码'
-
+    LocationCode: '库位编码',
+    PerformTaskManual: '手动执行任务',
+    processStorageLink: '工序关联库位',
+    SelectStorageType: '选择库位类型',
+    LocationStorageSetting: '库位存储箱设置'
   }
 }