add: 任务列表实现国际化
This commit is contained in:
@@ -34,6 +34,7 @@ import org.nl.config.SpringContextHolder;
|
|||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单工位堆垛机驱动
|
* 单工位堆垛机驱动
|
||||||
@@ -439,8 +440,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name())) {
|
if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name())) {
|
||||||
|
String pattern = "\\d+";
|
||||||
|
Pattern compile = Pattern.compile(pattern);
|
||||||
map.put("to_y", inst.getTo_z());
|
map.put("to_y", inst.getTo_z());
|
||||||
if (inst.getTo_x().length() > 1) {
|
if (inst.getTo_x().length() > 1 && !compile.matcher(inst.getTo_x()).matches()) {
|
||||||
String substring = inst.getTo_x().substring(1);
|
String substring = inst.getTo_x().substring(1);
|
||||||
map.put("to_z", substring);
|
map.put("to_z", substring);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -658,7 +658,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
|
|||||||
.getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), plan_code)
|
.getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), plan_code)
|
||||||
.size()
|
.size()
|
||||||
== 0) {
|
== 0) {
|
||||||
throw new Exception(dto.getStart_point_code() + "->" + dto.getNext_point_code() + "路由不通!");
|
throw new BadRequestException( dto.getStart_point_code() + "->" + dto.getNext_point_code() + " " +LangProcess.msg("route_isNull"));
|
||||||
}
|
}
|
||||||
String createTaskCheck = paramService.findByCode(AcsConfig.CREATETASKCHECK).getValue();
|
String createTaskCheck = paramService.findByCode(AcsConfig.CREATETASKCHECK).getValue();
|
||||||
DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);
|
DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ spring:
|
|||||||
db-type: com.alibaba.druid.pool.DruidDataSource
|
db-type: com.alibaba.druid.pool.DruidDataSource
|
||||||
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
||||||
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
|
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
|
||||||
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
|
url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
|
||||||
username: ${DB_USER:root}
|
username: ${DB_USER:root}
|
||||||
# password: ${DB_PWD:Root.123456}
|
# password: ${DB_PWD:Root.123456}
|
||||||
password: ${DB_PWD:root}
|
password: ${DB_PWD:p@ssw0rd}
|
||||||
# 初始连接数
|
# 初始连接数
|
||||||
initial-size: 5
|
initial-size: 5
|
||||||
# 最小连接数
|
# 最小连接数
|
||||||
|
|||||||
@@ -3,11 +3,13 @@ import zh from './zh-CN'
|
|||||||
import menu from './menu/zh'
|
import menu from './menu/zh'
|
||||||
import param from './param/zh'
|
import param from './param/zh'
|
||||||
import instruction from './instruction/zh'
|
import instruction from './instruction/zh'
|
||||||
|
import task from './task/zh'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
...zhLocale,
|
...zhLocale,
|
||||||
...zh,
|
...zh,
|
||||||
...menu,
|
...menu,
|
||||||
...param,
|
...param,
|
||||||
...instruction
|
...instruction,
|
||||||
|
...task
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ export default {
|
|||||||
'Create': 'Create',
|
'Create': 'Create',
|
||||||
'Update': 'Update',
|
'Update': 'Update',
|
||||||
'Delete': 'Delete',
|
'Delete': 'Delete',
|
||||||
|
'Synchronize': 'Synchronize',
|
||||||
'Export': 'Export',
|
'Export': 'Export',
|
||||||
'Editors': 'Editor',
|
'Editors': 'Editor',
|
||||||
'SelectAll': 'SelectAll',
|
'SelectAll': 'SelectAll',
|
||||||
|
|||||||
@@ -3,11 +3,13 @@ import en from './en'
|
|||||||
import menu from './menu/en'
|
import menu from './menu/en'
|
||||||
import param from './param/en'
|
import param from './param/en'
|
||||||
import instruction from './instruction/en'
|
import instruction from './instruction/en'
|
||||||
|
import task from './task/en'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
...enLocale,
|
...enLocale,
|
||||||
...en,
|
...en,
|
||||||
...menu,
|
...menu,
|
||||||
...param,
|
...param,
|
||||||
...instruction
|
...instruction,
|
||||||
|
...task
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ export default {
|
|||||||
'Create': 'Buat',
|
'Create': 'Buat',
|
||||||
'Update': 'Kemaskini',
|
'Update': 'Kemaskini',
|
||||||
'Delete': 'Hapus',
|
'Delete': 'Hapus',
|
||||||
|
'Synchronize': 'Sinkronisasi',
|
||||||
'Export': 'Ekspor',
|
'Export': 'Ekspor',
|
||||||
'Editors': 'Editor',
|
'Editors': 'Editor',
|
||||||
'SelectAll': 'Pilih Semua',
|
'SelectAll': 'Pilih Semua',
|
||||||
|
|||||||
@@ -3,11 +3,13 @@ import id from './in'
|
|||||||
import menu from './menu/in'
|
import menu from './menu/in'
|
||||||
import param from './param/in'
|
import param from './param/in'
|
||||||
import instruction from './instruction/in'
|
import instruction from './instruction/in'
|
||||||
|
import task from './task/in'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
...idLocale,
|
...idLocale,
|
||||||
...id,
|
...id,
|
||||||
...menu,
|
...menu,
|
||||||
...param,
|
...param,
|
||||||
...instruction
|
...instruction,
|
||||||
|
...task
|
||||||
}
|
}
|
||||||
|
|||||||
41
acs/nladmin-ui/src/i18n/langs/task/en.js
Normal file
41
acs/nladmin-ui/src/i18n/langs/task/en.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
export default {
|
||||||
|
'task': {
|
||||||
|
'txt_box': {
|
||||||
|
'Enter_task_number': 'Enter task number',
|
||||||
|
'Vehicle_registration_number': 'Vehicle registration number',
|
||||||
|
'Material_type': 'Material type',
|
||||||
|
'Task_status': 'Task status',
|
||||||
|
'Origin_or_destination': 'Origin or destination',
|
||||||
|
'Task_type': 'Task type',
|
||||||
|
'Warehouse_task_type': 'Warehouse task type',
|
||||||
|
'AGV_system': 'AGV system',
|
||||||
|
'Routing_scheme': 'Routing scheme',
|
||||||
|
'Priority': 'Priority',
|
||||||
|
'Vehicle_number': 'Vehicle number',
|
||||||
|
'Task_code': 'Task_code',
|
||||||
|
'Task': 'Task'
|
||||||
|
},
|
||||||
|
'select': {
|
||||||
|
'Placeholder': 'Select',
|
||||||
|
'Start_point': 'Start point',
|
||||||
|
'Starting_column': 'Starting column',
|
||||||
|
'Starting_layer': 'Starting layer',
|
||||||
|
'Destination': 'Destination',
|
||||||
|
'Ending_column': 'Ending column',
|
||||||
|
'Ending_layer': 'Ending layer',
|
||||||
|
'Description': 'Description',
|
||||||
|
'Cancel': 'Cancel',
|
||||||
|
'Confirm': 'Confirm',
|
||||||
|
'Ready': 'Ready',
|
||||||
|
'In_progress': 'In progress',
|
||||||
|
'Completed': 'Completed',
|
||||||
|
'Pickup_point': 'Pickup point',
|
||||||
|
'Delivery_point': 'Delivery point',
|
||||||
|
'Remark': 'Remark',
|
||||||
|
'Creator': 'Creator',
|
||||||
|
'Create_time': 'Creation time',
|
||||||
|
'Operation': 'Operation',
|
||||||
|
'Create_command': 'Create command'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
41
acs/nladmin-ui/src/i18n/langs/task/in.js
Normal file
41
acs/nladmin-ui/src/i18n/langs/task/in.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
export default {
|
||||||
|
'task': {
|
||||||
|
'txt_box': {
|
||||||
|
'Enter_task_number': 'Masukkan nomor tugas',
|
||||||
|
'Vehicle_registration_number': 'Nomor Registrasi Kendaraan',
|
||||||
|
'Material_type': 'Tipe material',
|
||||||
|
'Task_status': 'Status tugas',
|
||||||
|
'Origin_or_destination': 'Asal atau tujuan',
|
||||||
|
'Task_type': 'Jenis tugas',
|
||||||
|
'Warehouse_task_type': 'Jenis tugas gudang',
|
||||||
|
'AGV_system': 'Sistem AGV',
|
||||||
|
'Routing_scheme': 'Skema routing',
|
||||||
|
'Priority': 'Prioritas',
|
||||||
|
'Vehicle_number': 'Nomor kendaraan',
|
||||||
|
'Task_code': 'Nomor tugas',
|
||||||
|
'Task': 'Tugas'
|
||||||
|
},
|
||||||
|
'select': {
|
||||||
|
'Placeholder': 'Pilih',
|
||||||
|
'Start_point': 'Titik awal',
|
||||||
|
'Starting_column': 'Kolom awal',
|
||||||
|
'Starting_layer': 'Lapisan awal',
|
||||||
|
'Destination': 'Tujuan',
|
||||||
|
'Ending_column': 'Kolom akhir',
|
||||||
|
'Ending_layer': 'Lapisan akhir',
|
||||||
|
'Description': 'Deskripsi',
|
||||||
|
'Cancel': 'Batalkan',
|
||||||
|
'Confirm': 'Konfirmasi',
|
||||||
|
'Ready': 'Siap',
|
||||||
|
'In_progress': 'Sedang berlangsung',
|
||||||
|
'Completed': 'Selesai',
|
||||||
|
'Pickup_point': 'Titik pengambilan',
|
||||||
|
'Delivery_point': 'Titik pengiriman',
|
||||||
|
'Remark': 'Catatan',
|
||||||
|
'Creator': 'Pencipta',
|
||||||
|
'Create_time': 'Waktu penciptaan',
|
||||||
|
'Operation': 'Operasi',
|
||||||
|
'Create_command': 'Perintah membuat'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
41
acs/nladmin-ui/src/i18n/langs/task/zh.js
Normal file
41
acs/nladmin-ui/src/i18n/langs/task/zh.js
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
export default {
|
||||||
|
'task': {
|
||||||
|
'txt_box': {
|
||||||
|
'Enter_task_number': '输入任务号',
|
||||||
|
'Vehicle_registration_number': '输入载具号',
|
||||||
|
'Material_type': '物料类型',
|
||||||
|
'Task_status': '任务状态',
|
||||||
|
'Origin_or_destination': '输入起点或终点',
|
||||||
|
'Task_type': '任务类型',
|
||||||
|
'Warehouse_task_type': '立库任务类型',
|
||||||
|
'AGV_system': 'agv系统',
|
||||||
|
'Routing_scheme': '路由方案',
|
||||||
|
'Priority': '优先级',
|
||||||
|
'Vehicle_number': '载具号',
|
||||||
|
'Task_code': '任务号',
|
||||||
|
'Task': '任务'
|
||||||
|
},
|
||||||
|
'select': {
|
||||||
|
'Placeholder': '请选择',
|
||||||
|
'Start_point': '起点',
|
||||||
|
'Starting_column': '起点-列',
|
||||||
|
'Starting_layer': '起点-层',
|
||||||
|
'Destination': '终点',
|
||||||
|
'Ending_column': '终点-列',
|
||||||
|
'Ending_layer': '终点-层',
|
||||||
|
'Description': '描述信息',
|
||||||
|
'Cancel': '取消',
|
||||||
|
'Confirm': '确认',
|
||||||
|
'Ready': '就绪',
|
||||||
|
'In_progress': '执行中',
|
||||||
|
'Completed': '完成',
|
||||||
|
'Pickup_point': '取货点',
|
||||||
|
'Delivery_point': '放货点',
|
||||||
|
'Remark': '备注',
|
||||||
|
'Creator': '创建者',
|
||||||
|
'Create_time': '创建时间',
|
||||||
|
'Operation': '操作',
|
||||||
|
'Create_command': '创建指令'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,6 +37,7 @@ export default {
|
|||||||
'Create': '新增',
|
'Create': '新增',
|
||||||
'Update': '修改',
|
'Update': '修改',
|
||||||
'Delete': '删除',
|
'Delete': '删除',
|
||||||
|
'Synchronize': '同步',
|
||||||
'Export': '导出',
|
'Export': '导出',
|
||||||
'Editors': '编辑',
|
'Editors': '编辑',
|
||||||
'SelectAll': '全选',
|
'SelectAll': '全选',
|
||||||
|
|||||||
@@ -88,12 +88,19 @@ import standard_stacker from '@/views/acs/device/driver/standard_stacker'
|
|||||||
import siemens_conveyor_labeling from '@/views/acs/device/driver/siemens_conveyor_labeling'
|
import siemens_conveyor_labeling from '@/views/acs/device/driver/siemens_conveyor_labeling'
|
||||||
import siemens_conveyor from '@/views/acs/device/driver/siemens_conveyor'
|
import siemens_conveyor from '@/views/acs/device/driver/siemens_conveyor'
|
||||||
import belt_conveyor from '@/views/acs/device/driver/belt_conveyor'
|
import belt_conveyor from '@/views/acs/device/driver/belt_conveyor'
|
||||||
|
import lamp_three_color from '@/views/acs/device/driver/lamp_three_color'
|
||||||
|
import box_palletizing_manipulator from '@/views/acs/device/driver/box_palletizing_manipulator'
|
||||||
|
import hongxiang_conveyor from '@/views/acs/device/driver/hongxiang_conveyor'
|
||||||
|
import hongxiang_device from '@/views/acs/device/driver/hongxiang_device'
|
||||||
|
import oven_manipulator from '@/views/acs/device/driver/oven_manipulator'
|
||||||
|
import plug_pull_device_site from '@/views/acs/device/driver/plug_pull_device_site'
|
||||||
|
import slit_two_manipulator from '@/views/acs/device/driver/slit_two_manipulator'
|
||||||
// import empty_vehicle_stacking_position from '@/views/acs/device/driver/empty_vehicle_stacking_position'
|
// import empty_vehicle_stacking_position from '@/views/acs/device/driver/empty_vehicle_stacking_position'
|
||||||
import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one'
|
import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one'
|
||||||
import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
|
import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
|
||||||
import xg_agv from '@/views/acs/device/driver/agv/xg_agv'
|
import xg_agv from '@/views/acs/device/driver/agv/xg_agv'
|
||||||
import led_screen from './driver/led_screen'
|
import led_screen from './driver/led_screen'
|
||||||
// import standard_station from '@/views/acs/device/driver/standard_station'
|
import standard_station from '@/views/acs/device/driver/standard_station'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DeviceConfig',
|
name: 'DeviceConfig',
|
||||||
@@ -117,8 +124,16 @@ export default {
|
|||||||
siemens_conveyor_labeling,
|
siemens_conveyor_labeling,
|
||||||
siemens_conveyor,
|
siemens_conveyor,
|
||||||
belt_conveyor,
|
belt_conveyor,
|
||||||
double_station_stacker
|
double_station_stacker,
|
||||||
// standard_station
|
lamp_three_color,
|
||||||
|
box_palletizing_manipulator,
|
||||||
|
hongxiang_conveyor,
|
||||||
|
hongxiang_device,
|
||||||
|
standard_station,
|
||||||
|
oven_manipulator,
|
||||||
|
plug_pull_device_site,
|
||||||
|
slit_two_manipulator
|
||||||
|
|
||||||
},
|
},
|
||||||
dicts: ['device_type'],
|
dicts: ['device_type'],
|
||||||
mixins: [crud],
|
mixins: [crud],
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
v-model="query.task_code"
|
v-model="query.task_code"
|
||||||
size="small"
|
size="small"
|
||||||
clearable
|
clearable
|
||||||
placeholder="输入任务号"
|
:placeholder="$t('task.txt_box.Enter_task_number')"
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
@keyup.enter.native="crud.toQuery"
|
@keyup.enter.native="crud.toQuery"
|
||||||
@@ -17,8 +17,8 @@
|
|||||||
v-model="query.vehicle_code"
|
v-model="query.vehicle_code"
|
||||||
size="small"
|
size="small"
|
||||||
clearable
|
clearable
|
||||||
placeholder="输入载具号"
|
:placeholder="$t('task.txt_box.Vehicle_registration_number')"
|
||||||
style="width: 200px;"
|
style="width: 225px;"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
@keyup.enter.native="crud.toQuery"
|
@keyup.enter.native="crud.toQuery"
|
||||||
/>
|
/>
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
clearable
|
clearable
|
||||||
filterable
|
filterable
|
||||||
size="small"
|
size="small"
|
||||||
placeholder="物料类型"
|
:placeholder="$t('task.txt_box.Material_type')"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
style="width: 190px"
|
style="width: 190px"
|
||||||
@change="crud.toQuery"
|
@change="crud.toQuery"
|
||||||
@@ -39,7 +39,7 @@
|
|||||||
clearable
|
clearable
|
||||||
filterable
|
filterable
|
||||||
size="small"
|
size="small"
|
||||||
placeholder="任务状态"
|
:placeholder="$t('task.txt_box.Task_status')"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
style="width: 190px"
|
style="width: 190px"
|
||||||
@change="crud.toQuery"
|
@change="crud.toQuery"
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
v-model="query.point_code"
|
v-model="query.point_code"
|
||||||
size="small"
|
size="small"
|
||||||
clearable
|
clearable
|
||||||
placeholder="输入起点或终点"
|
:placeholder="$t('task.txt_box.Origin_or_destination')"
|
||||||
style="width: 200px;"
|
style="width: 200px;"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
@keyup.enter.native="crud.toQuery"
|
@keyup.enter.native="crud.toQuery"
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
clearable
|
clearable
|
||||||
filterable
|
filterable
|
||||||
size="small"
|
size="small"
|
||||||
placeholder="任务类型"
|
:placeholder="$t('task.txt_box.Task_type')"
|
||||||
class="filter-item"
|
class="filter-item"
|
||||||
style="width: 190px"
|
style="width: 190px"
|
||||||
@change="crud.toQuery"
|
@change="crud.toQuery"
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
@click="formDia=true"
|
@click="formDia=true"
|
||||||
>
|
>
|
||||||
新增
|
{{ $t('common.Create') }}
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
slot="right"
|
slot="right"
|
||||||
@@ -88,21 +88,21 @@
|
|||||||
icon="el-icon-refresh"
|
icon="el-icon-refresh"
|
||||||
@click="reload"
|
@click="reload"
|
||||||
>
|
>
|
||||||
同步
|
{{ $t('common.Synchronize') }}
|
||||||
</el-button>
|
</el-button>
|
||||||
</crudOperation>
|
</crudOperation>
|
||||||
<!--表单组件-->
|
<!--表单组件-->
|
||||||
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px">
|
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px">
|
||||||
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
|
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
|
||||||
<el-form-item v-if="false" label="任务标识" prop="task_id">
|
<el-form-item v-if="false" label="任务标识" prop="task_id">
|
||||||
<el-input v-model="form.task_id" style="width: 370px;" />
|
<el-input v-model="form.task_id" style="width: 370px;" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="物料类型">
|
<el-form-item :label="$t('task.txt_box.Material_type')">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.material"
|
v-model="form.material"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -113,12 +113,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="任务类型">
|
<el-form-item :label="$t('task.txt_box.Task_type')">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.task_type"
|
v-model="form.task_type"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -129,12 +129,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="form.task_type == '7'" label="立库任务类型">
|
<el-form-item v-if="form.task_type == '7'" :label="$t('task.txt_box.Warehouse_task_type')">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.storage_task_type"
|
v-model="form.storage_task_type"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -145,13 +145,13 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="agv系统">
|
<el-form-item :label="$t('task.txt_box.AGV_system')">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.agv_system_type"
|
v-model="form.agv_system_type"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
clearable
|
clearable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -162,12 +162,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="路由方案">
|
<el-form-item :label="$t('task.txt_box.Routing_scheme')">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.route_plan_code"
|
v-model="form.route_plan_code"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
default-first-option
|
default-first-option
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
@@ -179,12 +179,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="起点" prop="start_point_code">
|
<el-form-item :label="$t('task.select.Start_point')" prop="start_point_code">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.start_point_code"
|
v-model="form.start_point_code"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="showStartStorage"
|
@change="showStartStorage"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -195,12 +195,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-show="start_flag" label="起点-列" prop="from_y">
|
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.from_y"
|
v-model="form.from_y"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -211,12 +211,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-show="start_flag" label="起点-层" prop="from_z">
|
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_layer')" prop="from_z">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.from_z"
|
v-model="form.from_z"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -227,12 +227,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="终点" prop="next_point_code">
|
<el-form-item :label="$t('task.select.Destination')" prop="next_point_code">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.next_point_code"
|
v-model="form.next_point_code"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="showEndStorage"
|
@change="showEndStorage"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -243,12 +243,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-show="end_flag" label="终点-列" prop="to_y">
|
<el-form-item v-show="end_flag" :label="$t('task.select.Ending_column')" prop="to_y">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.to_y"
|
v-model="form.to_y"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -259,12 +259,12 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-show="end_flag" label="终点-层" prop="to_z">
|
<el-form-item v-show="end_flag" :label="$t('task.select.Ending_layer')" prop="to_z">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.to_z"
|
v-model="form.to_z"
|
||||||
style="width: 370px;"
|
style="width: 370px;"
|
||||||
filterable
|
filterable
|
||||||
placeholder="请选择"
|
:placeholder="$t('task.select.Placeholder')"
|
||||||
@change="isDisabled=false"
|
@change="isDisabled=false"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -306,44 +306,44 @@
|
|||||||
<!-- />-->
|
<!-- />-->
|
||||||
<!-- </el-select>-->
|
<!-- </el-select>-->
|
||||||
<!-- </el-form-item>-->
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="优先级">
|
<el-form-item :label="$t('task.txt_box.Priority')">
|
||||||
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
|
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="载具号">
|
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
|
||||||
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
|
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="描述信息" prop="description">
|
<el-form-item :label="$t('task.select.Description')" prop="description">
|
||||||
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" @change="isDisabled=false" />
|
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" @change="isDisabled=false" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button type="text" @click="formDia=false">取消</el-button>
|
<el-button type="text" @click="formDia=false">{{ $t('task.select.Cancel') }}</el-button>
|
||||||
<el-button :loading="crud.cu === 2" :disabled="isDisabled" type="primary" @click="saveBtn">确认</el-button>
|
<el-button :loading="crud.cu === 2" :disabled="isDisabled" type="primary" @click="saveBtn">{{ $t('task.select.Confirm') }}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
<!--表格渲染-->
|
<!--表格渲染-->
|
||||||
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
|
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
|
||||||
<el-table-column type="selection" width="25" />
|
<el-table-column type="selection" width="25" />
|
||||||
<el-table-column v-if="false" prop="task_id" label="任务标识" />
|
<el-table-column v-if="false" prop="task_id" label="任务标识" />
|
||||||
<el-table-column prop="task_code" label="任务号" width="100" />
|
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" width="100" />
|
||||||
<el-table-column prop="task_type" label="任务类型" width="120">
|
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="120">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ dict.label.task_type[scope.row.task_type] }}
|
{{ dict.label.task_type[scope.row.task_type] }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- <el-table-column prop="link_num" label="关联编号" />-->
|
<!-- <el-table-column prop="link_num" label="关联编号" />-->
|
||||||
<el-table-column prop="vehicle_code" label="载具号" width="100" />
|
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" width="100" />
|
||||||
<el-table-column prop="task_status" label="任务状态" width="100">
|
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="100">
|
||||||
<template slot-scope="scope" width="60">
|
<template slot-scope="scope" width="60">
|
||||||
<span v-if="scope.row.task_status==='0' ">就绪</span>
|
<span v-if="scope.row.task_status==='0' ">{{ $t('task.select.Ready') }}</span>
|
||||||
<span v-if="scope.row.task_status==='1' ">执行中</span>
|
<span v-if="scope.row.task_status==='1' ">{{ $t('task.select.In_progress') }}</span>
|
||||||
<span v-if="scope.row.task_status==='2' ">完成</span>
|
<span v-if="scope.row.task_status==='2' ">{{ $t('task.select.Completed') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="priority" label="优先级" width="100" />
|
<el-table-column prop="priority" :label="$t('task.txt_box.Priority')" width="100" />
|
||||||
<el-table-column prop="start_point_code" label="取货点" width="100px" />
|
<el-table-column prop="start_point_code" :label="$t('task.select.Pickup_point')" width="100px" />
|
||||||
<!-- <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
|
<!-- <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
|
||||||
<el-table-column prop="next_point_code" label="放货点" width="120px" />
|
<el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" width="120px" />
|
||||||
<!-- <el-table-column prop="start_point_code2" label="取货点2" width="120px" />-->
|
<!-- <el-table-column prop="start_point_code2" label="取货点2" width="120px" />-->
|
||||||
<!-- <el-table-column prop="next_point_code2" label="放货点2" width="120px" />-->
|
<!-- <el-table-column prop="next_point_code2" label="放货点2" width="120px" />-->
|
||||||
<!-- <el-table-column prop="compound_task" label="复合任务">-->
|
<!-- <el-table-column prop="compound_task" label="复合任务">-->
|
||||||
@@ -355,19 +355,19 @@
|
|||||||
<!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
|
<!-- <el-table-column prop="compound_task_data" width="200" label="复合路线" />-->
|
||||||
<!-- <el-table-column prop="matarial" label="物料" />-->
|
<!-- <el-table-column prop="matarial" label="物料" />-->
|
||||||
<!-- <el-table-column prop="quantity" label="数量" />-->
|
<!-- <el-table-column prop="quantity" label="数量" />-->
|
||||||
<el-table-column prop="remark" label="备注" />
|
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
|
||||||
<el-table-column prop="create_by" label="创建者" />
|
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
|
||||||
<el-table-column prop="create_time" label="创建时间" width="135" />
|
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
|
||||||
<el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="80px" align="center">
|
<el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" :label="$t('task.select.Operation')" width="80px" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-dropdown trigger="click" @command="handleCommand">
|
<el-dropdown trigger="click" @command="handleCommand">
|
||||||
<span class="el-dropdown-link">
|
<span class="el-dropdown-link">
|
||||||
<i class="el-icon-menu" />
|
<i class="el-icon-menu" />
|
||||||
</span>
|
</span>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<el-dropdown-menu slot="dropdown">
|
||||||
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
|
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">{{ $t('task.select.Completed') }}</el-dropdown-item>
|
||||||
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>
|
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('task.select.Cancel') }}</el-dropdown-item>
|
||||||
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">创建指令</el-dropdown-item>
|
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">{{ $t('task.select.Create_command') }}</el-dropdown-item>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user