root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 二次分配任务指令前端添加字段

Browse Source
This commit is contained in:
lishuai
2024-06-29 16:41:54 +08:00
parent 022eff8245
commit 43d7236761
7 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
acs2/nladmin-ui/src/i18n/langs/task/en.js
View File

@@ -8,6 +8,10 @@ export default {
'Origin_or_destination': 'Origin Or Destination',
'Task_type': 'Task Type',
'Action_type': 'Action Type',
'ORDINARY': 'Ordinary task',
'IN_STOCK': 'Pick up secondary distribution',
'OUT_STOCK': 'Release cargo secondary distribution',
'IN_OUT_STOCK': 'Pick and release cargo secondary distribution',
'Warehouse_task_type': 'Warehouse Task Type',
'AGV_system': 'AGV System',
'Routing_scheme': 'Routing Scheme',

4
acs2/nladmin-ui/src/i18n/langs/task/in.js
View File

@@ -8,6 +8,10 @@ export default {
'Origin_or_destination': 'Asal Atau Tujuan',
'Task_type': 'Jenis Tugas',
'Action_type': 'Tipe tugas sekunder',
'ORDINARY': 'Tugas biasa',
'IN_STOCK': 'Dapatkan pasokan kedua',
'OUT_STOCK': 'Memasukkan barang ke distribusi kedua',
'IN_OUT_STOCK': 'Ambil paket distribusi kedua',
'Warehouse_task_type': 'Jenis Tugas Gudang',
'AGV_system': 'Sistem AGV',
'Routing_scheme': 'Skema Routing',

4
acs2/nladmin-ui/src/i18n/langs/task/zh.js
View File

@@ -8,6 +8,10 @@ export default {
'Origin_or_destination': '输入起点或终点',
'Task_type': '任务类型',
'Action_type': '二次分配类型',
'ORDINARY': '普通任务',
'IN_STOCK': '取货二次分配',
'OUT_STOCK': '放货二次分配',
'IN_OUT_STOCK': '取放货二次分配',
'Warehouse_task_type': '立库任务类型',
'AGV_system': 'agv系统',
'Routing_scheme': '路由方案',

8
acs2/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -146,6 +146,14 @@
{{ dict.label.task_type[scope.row.instruction_type] }}
</template>
</el-table-column>
<el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')" :min-width="flexWidth('agv_action_type',crud.data,$t('task.txt_box.Action_type'))">
<template slot-scope="scope">
<span v-if="scope.row.agv_action_type===1 ">{{ $t('task.txt_box.ORDINARY') }}</span>
<span v-if="scope.row.agv_action_type===2 ">{{ $t('task.txt_box.IN_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===3 ">{{ $t('task.txt_box.OUT_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
</template>
</el-table-column>
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<!-- <el-table-column prop="link_num" label="关联编号" />-->

10
acs2/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -505,12 +505,20 @@
<el-table-column type="selection" width="25" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
<el-table-column prop="action_type" :label="$t('task.txt_box.Action_type')" :min-width="flexWidth('action_type',crud.data,$t('task.txt_box.Action_type'))">
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
</el-table-column>
<el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')" :min-width="flexWidth('agv_action_type',crud.data,$t('task.txt_box.Action_type'))">
<template slot-scope="scope">
<span v-if="scope.row.agv_action_type===1 ">{{ $t('task.txt_box.ORDINARY') }}</span>
<span v-if="scope.row.agv_action_type===2 ">{{ $t('task.txt_box.IN_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===3 ">{{ $t('task.txt_box.OUT_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
</template>
</el-table-column>
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="150px">
<template slot-scope="scope">