diff --git a/acs2/nladmin-ui/src/i18n/langs/history/en.js b/acs2/nladmin-ui/src/i18n/langs/history/en.js index d57bafa2f..2f08fbfef 100644 --- a/acs2/nladmin-ui/src/i18n/langs/history/en.js +++ b/acs2/nladmin-ui/src/i18n/langs/history/en.js @@ -11,6 +11,7 @@ export default { 'Endpoint_two': 'Endpoint Two', 'Material': 'Material', 'Quantity': 'Quantity', + 'agv_action_type': 'The type of AGV secondary distribution', 'Numbering': 'Numbering', 'Value': 'Value', 'Input_task_instruction_number': 'Enter Task Number Or Instruction Number', diff --git a/acs2/nladmin-ui/src/i18n/langs/history/in.js b/acs2/nladmin-ui/src/i18n/langs/history/in.js index b0a5ab1d6..a9b7792c9 100644 --- a/acs2/nladmin-ui/src/i18n/langs/history/in.js +++ b/acs2/nladmin-ui/src/i18n/langs/history/in.js @@ -10,7 +10,8 @@ export default { 'Transit_point': 'Titik transit', 'Endpoint_two': 'Titik Akhir Dua', 'Material': 'Bahan', - 'Quantity': 'Jumlah', + 'Quantity': 'Jenis distribusi sekunder AGV', + 'agv_action_type': 'agv二次分配类型', 'Numbering': 'Nomor', 'Value': 'Nilai', 'Input_task_instruction_number': 'Masukkan Nomor Tugas Atau Nomor Instruksi', diff --git a/acs2/nladmin-ui/src/i18n/langs/history/zh.js b/acs2/nladmin-ui/src/i18n/langs/history/zh.js index e332c0678..77555fd2a 100644 --- a/acs2/nladmin-ui/src/i18n/langs/history/zh.js +++ b/acs2/nladmin-ui/src/i18n/langs/history/zh.js @@ -11,6 +11,7 @@ export default { 'Endpoint_two': '终点2', 'Material': '物料', 'Quantity': '数量', + 'agv_action_type': 'agv二次分配类型', 'Numbering': '编号', 'Value': '值', 'Input_task_instruction_number': '输入任务号或指令号', diff --git a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue index 7fd33e69e..a68b83bbd 100644 --- a/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue +++ b/acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue @@ -275,9 +275,9 @@ @selection-change="crud.selectionChangeHandler" > - + - + @@ -290,9 +290,9 @@ {{ $t('task.select.Cancel') }} - - - + + + @@ -301,6 +301,8 @@ + + @@ -330,7 +332,6 @@ const defaultForm = { start_point_code: null, start_device_code: null, next_point_code: null, - start_point_code: null, remark: null, material: null, route_plan_code: 'normal', diff --git a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index dd9a20f3f..d61fd7870 100644 --- a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -123,7 +123,7 @@ - + @@ -142,11 +142,22 @@ + + + + + + diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue index 28fe6037d..f83a01663 100644 --- a/acs2/nladmin-ui/src/views/acs/task/index.vue +++ b/acs2/nladmin-ui/src/views/acs/task/index.vue @@ -505,7 +505,7 @@ - + @@ -533,6 +533,11 @@ + + + @@ -771,6 +776,10 @@ export default { }) }, methods: { + getAgvSystemLabel(value) { + const item = this.dict.label.agv_system_type[2] + return item + }, addNewRow() { this.extension.push({ name: '',