feat: 业务功能前端国际化

This commit is contained in:
2024-04-16 13:53:43 +08:00
parent 67ae97d6da
commit eb08f3f43f
43 changed files with 1387 additions and 304 deletions

View File

@@ -63,7 +63,7 @@ public class CallEmpReelTask extends AbstractTask {
SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper<SchBaseTask>()
.eq(SchBaseTask::getTask_code, task_code), false);
if (schBaseTask == null) {
throw new BadRequestException(LangProcess.msg("CallEmpReelTask_update1"));
throw new BadRequestException("CallEmpReelTask任务更新接口任务号为空");
}
// 执行中
if (TaskStatus.EXECUTING.getCode().equals(status.getCode())) {
@@ -78,7 +78,7 @@ public class CallEmpReelTask extends AbstractTask {
// 取消
if (status.getCode().equals(IOSEnum.IS_NOTANDYES.code(""))) {
if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatus.ISSUE.getCode())) {
throw new BadRequestException(LangProcess.msg("CallEmpReelTask_update2"));
throw new BadRequestException("CallEmpReelTask任务已执行不能取消");
}
// 更新任务表删除字段
schBaseTask.setIs_delete(true);
@@ -90,22 +90,22 @@ public class CallEmpReelTask extends AbstractTask {
@Override
public void createCompletion(SchBaseTask task) {
Assert.notNull(task, LangProcess.msg("CallEmpReelTask_createTaskTip1"));
Assert.notNull(task, "请求参数不能为空");
String taskType = task.getTask_type();
if (StrUtil.isBlank(taskType)) {
throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip2"));
throw new BadRequestException("业务类型不能为空");
}
String vehicleCode = task.getVehicle_code();
if (StrUtil.isBlank(vehicleCode)) {
throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip3"));
throw new BadRequestException("载具号不能为空");
}
String pointCode1 = task.getPoint_code1();
if (StrUtil.isBlank(pointCode1)) {
throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip4"));
throw new BadRequestException("起点不能为空");
}
String pointCode2 = task.getPoint_code2();
if (StrUtil.isBlank(pointCode2)) {
throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip5"));
throw new BadRequestException("下一点不能为空");
}
//是否立即下发
boolean isSend = !StrUtil.isNotBlank(task.getIs_send()) || BooleanUtil.toBoolean(task.getIs_send());

View File

@@ -190,7 +190,7 @@ export default {
this.tableColumns = columns
},
toDelete(datas) {
this.$confirm(this.$t('common.Tip1') + ` ${datas.length} ` + this.$t('common.Tip2'), this.$t('common.Tips'), {
this.$confirm(this.$t('common.Tip1', { count: datas.length }), this.$t('common.Tips'), {
confirmButtonText: this.$t('common.Confirm'),
cancelButtonText: this.$t('common.Cancel'),
type: 'warning'

View File

@@ -22,6 +22,10 @@ import taskConfig from './task/config/zh'
import task from './task/zh'
import point from './point/zh'
import region from './region/zh'
import rawfoil from './workorder/rawfoil/zh'
import sbpointivt from './ivt/sbPointIvt/zh'
import coolregion from './ivt/cool/zh'
import hot from './ivt/hot/zh'
export default {
...zhLocale,
@@ -47,5 +51,9 @@ export default {
...taskConfig,
...task,
...point,
...region
...region,
...rawfoil,
...sbpointivt,
...coolregion,
...hot
}

View File

@@ -23,8 +23,7 @@ export default {
'msg': {
'tip1': 'Are you sure to delete it? If there are lower-level nodes, delete them together. This operation cannot be undone!',
'tip2': 'The upper department cannot be empty',
'tip3.1': 'This operation will',
'tip3.2': 'department, Do you want to continue?'
'tip3': 'This operation will {display_name} {name} department, Do you want to continue?'
},
'rules': {
'r1': 'Please enter name',

View File

@@ -23,8 +23,7 @@ export default {
'msg': {
'tip1': 'Apakah Anda yakin untuk menghapus? Jika ada node bawahan, node tersebut juga akan dihapus. Operasi ini tidak dapat dibatalkan!',
'tip2': 'Departemen induk tidak boleh kosong',
'tip3.1': 'Operasi ini akan terjadi',
'tip3.2': 'departemen, Apakah akan melanjutkan?'
'tip3': 'Operasi ini untuk departemen {display_name} {name}, apakah Anda ingin melanjutkan?'
},
'rules': {
'r1': 'Silakan masukkan nama',

View File

@@ -23,8 +23,7 @@ export default {
'msg': {
'tip1': '确定删除吗,如果存在下级节点则一并删除,此操作不能撤销!',
'tip2': '上级部门不能为空',
'tip3.1': '此操作将',
'tip3.2': '部门, 是否继续?'
'tip3': '此操作将{display_name} {name} 部门, 是否继续?'
},
'rules': {
'r1': '请输入名称',

View File

@@ -72,8 +72,7 @@ export default {
'browses': 'browse',
'fz': 'Full screen zoom',
'Tips': 'Tips',
'Tip1': 'Confirm deletion of selected',
'Tip2': 'Data?',
'Tip1': 'Confirm to delete the selected {count} pieces of data?',
'Tip3': 'User name not used as login',
'Tip4': 'Mobile phone number cannot be duplicate',
'Tip5': 'Please enter a phone number',
@@ -89,7 +88,8 @@ export default {
'Tip15': 'Please enter an icon name',
'Tip16': 'NOT NULL',
'Tip17': 'Please enter what you are searching for',
'loading': 'loading...'
'loading': 'loading...',
'Tip18': 'select date time'
},
'WorkOrder': {
'form': {

View File

@@ -22,6 +22,10 @@ import taskConfig from './task/config/en'
import task from './task/en'
import point from './point/en'
import region from './region/en'
import rawfoil from './workorder/rawfoil/en'
import sbpointivt from './ivt/sbPointIvt/en'
import coolregion from './ivt/cool/en'
import hot from './ivt/hot/en'
export default {
...enLocale,
@@ -47,5 +51,9 @@ export default {
...taskConfig,
...task,
...point,
...region
...region,
...rawfoil,
...sbpointivt,
...coolregion,
...hot
}

View File

@@ -51,7 +51,7 @@ export default {
'Fail': 'gagal',
'Please_select': 'Silakan pilih',
'Operation_success': 'Operasi berhasil',
'Operate': 'operasi',
'Operate': 'Operasi',
'Refresh': 'Segar',
'Closes': 'Tutup',
'Closes_l': 'Tutup Sisi Kiri',
@@ -72,8 +72,7 @@ export default {
'browses': 'melayar',
'fz': 'Zum layar penuh',
'Tips': 'Prompt',
'Tip1': 'Konfirmasi Penghapusan Yang Dipilih',
'Tip2': 'Data?',
'Tip1': 'Konfirmasikan untuk menghapus {count} data yang dipilih?',
'Tip3': 'Nama pengguna tidak digunakan sebagai daftar masuk',
'Tip4': 'Nomor telepon ponsel tidak dapat duplikasi',
'Tip5': 'Silakan masukkan nomor telepon',
@@ -89,7 +88,8 @@ export default {
'Tip15': 'Silakan masukkan nama ikon',
'Tip16': 'TIDAK NULL',
'Tip17': 'Silakan masukkan apa yang Anda cari',
'loading': 'Memuatkan Data...'
'loading': 'Memuatkan Data...',
'Tip18': 'pilih tanggal waktu'
},
'WorkOrder': {
'form': {

View File

@@ -22,6 +22,10 @@ import taskConfig from './task/config/in'
import task from './task/in'
import point from './point/in'
import region from './region/in'
import rawfoil from './workorder/rawfoil/in'
import sbpointivt from './ivt/sbPointIvt/in'
import coolregion from './ivt/cool/in'
import hot from './ivt/hot/in'
export default {
...idLocale,
@@ -47,5 +51,9 @@ export default {
...taskConfig,
...task,
...point,
...region
...region,
...rawfoil,
...sbpointivt,
...coolregion,
...hot
}

View File

@@ -0,0 +1,79 @@
export default {
'CoolRegion': {
'pan1': {
'title': 'Cooling Zone Inventory',
'table': {
'point_code': 'Point Code',
'cool_ivt_status': 'Cool Ivt Status',
'full_point_code': 'Full Point',
'full_point_status': 'Full Status',
'container_name': 'Container Name',
'empty_point_code': 'Empty Point',
'empty_point_status': 'Empty Status',
'empty_vehicle_code': 'Empty Vehicle Code',
'ivt_qty': 'Inventory Qty',
'qty_unit_name': 'Unit',
'instorage_time': 'Instorage Time',
'product_area': 'Production Area',
'point_location': 'Position',
'is_used': 'Enable',
'remark': 'Remark',
'update_time': 'Update Time'
},
'dialog': {
'point_code': 'point code',
'cool_ivt_status': 'cool ivt status',
'full_point_status': 'full point status',
'container_name': 'container name',
'empty_point_status': 'empty status',
'empty_vehicle_code': 'empty vehicle code',
'product_area': 'production area',
'point_location': 'position',
'is_used': 'enable'
},
'search': {
'createTime': 'instorage time',
'button_1': 'Return MES',
'button_2': 'In Cooling return'
},
'msg': {
'm1': 'Enter the point code',
'm2': 'Enter the master volume ID',
'm3': 'Please select a point to send back!'
},
'rules': {
'r1': 'The full axis status cannot be empty',
'r2': 'The empty axis status cannot be empty',
'r3': 'The inventory status cannot be empty'
}
},
'pan2': {
'title': 'Cooling Zone Access Record',
'table': {
'bill_code': 'Bill Code',
'io_type': 'Io Type',
'qty': 'Qty',
'pcsn': 'Pcsn',
'start_point_code': 'Start Point',
'end_point_code': 'End Point',
'create_name': 'Create Name',
'create_time': 'Create Time',
'confirm_optname': 'Confirm Name',
'confirm_time': 'Confirm Time'
},
'search': {
'start_point_code': 'start point code',
'end_point_code': 'end point code',
'pcsn': 'pcsn',
'vehicle_code': 'vehicle code',
'createTime': 'create time'
},
'msg': {
'm1': 'Enter the starting point code',
'm2': 'Enter the end point code',
'm3': 'Input batch',
'm4': 'Enter vehicle number'
}
}
}
}

View File

@@ -0,0 +1,79 @@
export default {
'CoolRegion': {
'pan1': {
'title': 'Inventarisasi Zona Pendinginan',
'table': {
'point_code': 'Kode Titik',
'cool_ivt_status': 'Status Ivt Keren',
'full_point_code': 'Titik Penuh',
'full_point_status': 'Status Penuh',
'container_name': 'Nama Kontainer',
'empty_point_code': 'Titik Kosong',
'empty_point_status': 'Status Kosong',
'empty_vehicle_code': 'Kode Kendaraan Kosong',
'ivt_qty': 'Jumlah Persediaan',
'qty_unit_name': 'Satuan',
'instorage_time': 'Waktu Penyimpanan',
'product_area': 'Area Produksi',
'point_location': 'Posisi',
'is_used': 'Aktifkan',
'remark': 'Komentar',
'update_time': 'Waktu Pembaruan'
},
'dialog': {
'point_code': 'kode titik',
'cool_ivt_status': 'status ivt keren',
'full_point_status': 'titik penuh',
'container_name': 'nama kontainer',
'empty_point_status': 'status kosong',
'empty_vehicle_code': 'kode kendaraan kosong',
'product_area': 'area produksi',
'point_location': 'posisi',
'is_used': 'aktifkan'
},
'search': {
'createTime': 'waktu penyimpanan',
'button_1': 'Kembalikan MES',
'button_2': 'Dalam Pendinginan kembali'
},
'msg': {
'm1': 'Masukkan kode poin',
'm2': 'Masukkan ID volume master',
'm3': 'Silakan pilih titik untuk dikirim kembali!'
},
'rules': {
'r1': 'Status sumbu penuh tidak boleh kosong',
'r2': 'Status sumbu kosong tidak boleh kosong',
'r3': 'Status inventaris tidak boleh kosong'
}
},
'pan2': {
'title': 'Catatan Akses Zona Pendinginan',
'table': {
'bill_code': 'Kode Tagihan',
'io_type': 'Jenis Io',
'qty': 'Jumlah',
'pcsn': 'pcsn',
'start_point_code': 'Titik Awal',
'end_point_code': 'Titik Akhir',
'create_name': 'Buat Nama',
'create_time': 'Buat Waktu',
'confirm_optname': 'Konfirmasi Nama',
'confirm_time': 'Konfirmasi Waktu'
},
'search': {
'start_point_code': 'kode titik awal',
'end_point_code': 'kode titik akhir',
'pcsn': 'pcsn',
'vehicle_code': 'kode kendaraan',
'createTime': 'buat waktu'
},
'msg': {
'm1': 'Masukkan kode titik awal',
'm2': 'Masukkan kode titik akhir',
'm3': 'Masukan kumpulan',
'm4': 'Masukkan nomor kendaraan'
}
}
}
}

View File

@@ -0,0 +1,79 @@
export default {
'CoolRegion': {
'pan1': {
'title': '冷却区库存',
'table': {
'point_code': '点位编码',
'cool_ivt_status': '库存状态',
'full_point_code': '满轴位',
'full_point_status': '满轴位状态',
'container_name': '母卷号',
'empty_point_code': '空轴位',
'empty_point_status': '空轴位状态',
'empty_vehicle_code': '空轴编号',
'ivt_qty': '库存数',
'qty_unit_name': '计量单位',
'instorage_time': '入库时间',
'product_area': '生产区域',
'point_location': '位置',
'is_used': '是否启用',
'remark': '备注',
'update_time': '修改时间'
},
'dialog': {
'point_code': '点位编码',
'cool_ivt_status': '库存状态',
'full_point_status': '满轴位状态',
'container_name': '母卷号',
'empty_point_status': '空轴位状态',
'empty_vehicle_code': '空轴编号',
'product_area': '生产区域',
'point_location': '位置',
'is_used': '是否启用'
},
'search': {
'createTime': '入库时间',
'button_1': '回传MES',
'button_2': '入冷却回传'
},
'msg': {
'm1': '输入点位编码',
'm2': '输入母卷号',
'm3': '请选择一个点位进行回传!'
},
'rules': {
'r1': '满轴位状态不能为空',
'r2': '空轴位状态不能为空',
'r3': '库存状态不能为空'
}
},
'pan2': {
'title': '冷却区出入记录',
'table': {
'bill_code': '单据编码',
'io_type': '出入类型',
'qty': '数量',
'pcsn': '批次',
'start_point_code': '起始点位',
'end_point_code': '终点点位',
'create_name': '创建人',
'create_time': '创建时间',
'confirm_optname': '确认人',
'confirm_time': '确认时间'
},
'search': {
'start_point_code': '起点点位编码',
'end_point_code': '终点点位编码',
'pcsn': '批次号',
'vehicle_code': '载具编码',
'createTime': '创建时间'
},
'msg': {
'm1': '输入起点点位编码',
'm2': '输入终点点位编码',
'm3': '输入批次',
'm4': '输入载具号'
}
}
}
}

View File

@@ -0,0 +1,71 @@
export default {
'Hot': {
'pan1': {
'title': 'Stock Inquiry',
'table': {
'point_code': 'Point Code',
'point_status': 'Point Status',
'container_name': 'Container Name',
'ivt_qty': 'Ivt Qty',
'instorage_time': 'Instorage Time',
'product_area': 'Product Area',
'temperature': 'Temperature',
'last_time': 'Countdown',
'group_name': 'Group',
'ext_code': 'Ext Code',
'point_location': 'Position',
'is_used': 'Enabled',
'remark': 'Remark',
'update_time': 'Update Time'
},
'dialog': {
'point_code': 'point code',
'product_area': 'product area',
'point_status': 'point status',
'container_name': 'container name',
'temperature': 'temperature',
'is_used': 'enabled',
'point_location': 'position',
'instorage_time': 'instorage time'
},
'search': {
'p1': 'Enter the point code',
'button_1': 'Return MES'
},
'msg': {
'm1': 'Point codes cannot be empty',
'm2': 'The point status cannot be empty',
'm3': 'Please select a point to send back!'
}
},
'pan2': {
'title': 'Oven Task',
'table': {
'bill_code': 'Bill Code',
'container_name': 'Container Name',
'start_point_code': 'Start Point',
'end_point_code': 'End Point',
'temperature': 'Temperature',
'oven_time': 'Oven Time',
'task_code': 'Task Code',
'create_name': 'Create Name',
'create_time': 'Create Time',
'confirm_optname': 'Confirm Name',
'confirm_time': 'Confirm Time'
},
'dialog': {
'bill_code': 'bill code',
'task_code': 'task code',
'start_point_code': 'start point',
'end_point_code': 'end point',
'container_name': 'container name',
'create_time': 'create time'
},
'statusDtlList': {
'build': 'build',
'running': 'running',
'confirm': 'confirm'
}
}
}
}

View File

@@ -0,0 +1,71 @@
export default {
'Hot': {
'pan1': {
'title': 'Pertanyaan Stok',
'table': {
'point_code': 'Kode Titik',
'point_status': 'Status Poin',
'container_name': 'Nama Kontainer',
'ivt_qty': 'Ivt_qty',
'instorage_time': 'Waktu Penyimpanan',
'product_area': 'Area Produk',
'temperature': 'Suhu',
'last_time': 'Hitung mundur',
'group_name': 'Grup',
'ext_code': 'Kode Ekst',
'point_location': 'Posisi',
'is_used': 'Diaktifkan',
'remark': 'Komentar',
'update_time': 'Waktu Pembaruan'
},
'dialog': {
'point_code': 'kode titik',
'product_area': 'area produk',
'point_status': 'status poin',
'container_name': 'nama kontainer',
'temperature': 'suhu',
'is_used': 'diaktifkan',
'point_location': 'posisi',
'instorage_time': 'waktu penyimpanan'
},
'search': {
'p1': 'Masukkan kode poin',
'button_1': 'Kembalikan MES'
},
'msg': {
'm1': 'Kode poin tidak boleh kosong',
'm2': 'Status poin tidak boleh kosong',
'm3': 'Silakan pilih titik untuk dikirim kembali!'
}
},
'pan2': {
'title': 'Tugas Oven',
'table': {
'bill_code': 'Kode Tagihan',
'container_name': 'Nama Kontainer',
'start_point_code': 'Titik Awal',
'end_point_code': 'Titik Akhir',
'temperature': 'Suhu',
'oven_time': 'Waktu Oven',
'task_code': 'Kode Tugas',
'create_name': 'Buat Nama',
'create_time': 'Buat Waktu',
'confirm_optname': 'Konfirmasi Nama',
'confirm_time': 'Konfirmasi Waktu'
},
'dialog': {
'bill_code': 'kode tagihan',
'task_code': 'kode tugas',
'start_point_code': 'titik awal',
'end_point_code': 'titik akhir',
'container_name': 'nama kontainer',
'create_time': 'buat waktu'
},
'statusDtlList': {
'build': 'membangun',
'running': 'berlari',
'confirm': 'mengonfirmasi'
}
}
}
}

View File

@@ -0,0 +1,71 @@
export default {
'Hot': {
'pan1': {
'title': '烘烤区点位库存',
'table': {
'point_code': '点位编码',
'point_status': '点位状态',
'container_name': '母卷号',
'ivt_qty': '库存数',
'instorage_time': '入箱时间',
'product_area': '生产区域',
'temperature': '温度',
'last_time': '倒计时',
'group_name': '组别',
'ext_code': '外部编码',
'point_location': '位置',
'is_used': '是否启用',
'remark': '备注',
'update_time': '修改时间'
},
'dialog': {
'point_code': '点位编码',
'product_area': '生产区域',
'point_status': '点位状态',
'container_name': '母卷号',
'temperature': '温度',
'is_used': '是否启用',
'point_location': '生产位置',
'instorage_time': '入箱时间'
},
'search': {
'p1': '输入点位编码',
'button_1': '回传MES'
},
'msg': {
'm1': '点位编码不能为空',
'm2': '点位状态不能为空',
'm3': '请选择一个点位进行回传!'
}
},
'pan2': {
'title': '烘箱任务',
'table': {
'bill_code': '单据编码',
'container_name': '母卷号',
'start_point_code': '起始点位',
'end_point_code': '终点点位',
'temperature': '烤箱温度',
'oven_time': '烘烤时间',
'task_code': '任务编码',
'create_name': '创建人',
'create_time': '创建时间',
'confirm_optname': '确认人',
'confirm_time': '确认时间'
},
'dialog': {
'bill_code': '单据编码',
'task_code': '任务编码',
'start_point_code': '起点编码',
'end_point_code': '终点编码',
'container_name': '母卷号',
'create_time': '创建时间'
},
'statusDtlList': {
'build': '生成',
'running': '执行中',
'confirm': '确认'
}
}
}
}

View File

@@ -0,0 +1,33 @@
export default {
'SbPointIvt': {
'title': 'Raw Foil Point Inventory',
'table': {
'point_code': 'Point Code',
'vehicle_code': 'Vehicle Code',
'product_area': 'Production Area',
'point_location': 'Position',
'ext_code': 'Ext Code',
'remark': 'Remark',
'is_used': 'Enable',
'mes_used': 'MES Enable',
'update_time': 'Update Time'
},
'dialog': {
'point_code': 'point code',
'vehicle_code': 'vehicle code',
'product_area': 'production area',
'point_location': 'position',
'ext_code': 'ext code',
'is_used': 'enable',
'mes_used': 'mes enable'
},
'rules': {
'r1': 'Point codes cannot be empty',
'r2': 'The point status cannot be empty',
'r3': 'Enable or not The value cannot be empty'
},
'msg': {
'm1': 'Enter the point code'
}
}
}

View File

@@ -0,0 +1,33 @@
export default {
'SbPointIvt': {
'title': 'Persediaan Titik Foil Mentah',
'table': {
'point_code': 'Kode Titik',
'vehicle_code': 'Kode Kendaraan',
'product_area': 'Area Produksi',
'point_location': 'Posisi',
'ext_code': 'Kode Ekst',
'remark': 'Komentar',
'is_used': 'Aktifkan',
'mes_used': 'MES Aktif',
'update_time': 'Waktu Pembaruan'
},
'dialog': {
'point_code': 'kode titik',
'vehicle_code': 'kode kendaraan',
'product_area': 'area produksi',
'point_location': 'posisi',
'ext_code': 'kode ekst',
'is_used': 'aktifkan',
'mes_used': 'mes aktif'
},
'rules': {
'r1': 'Kode poin tidak boleh kosong',
'r2': 'Status poin tidak boleh kosong',
'r3': 'Aktifkan atau tidak Nilainya tidak boleh kosong'
},
'msg': {
'm1': 'Masukkan kode poin'
}
}
}

View File

@@ -0,0 +1,33 @@
export default {
'SbPointIvt': {
'title': '生箔点位库存',
'table': {
'point_code': '点位编码',
'vehicle_code': '载具编码',
'product_area': '生产区域',
'point_location': '位置',
'ext_code': '外部编码',
'remark': '备注',
'is_used': '是否启用',
'mes_used': 'MES启用',
'update_time': '修改时间'
},
'dialog': {
'point_code': '点位编码',
'vehicle_code': '载具编码',
'product_area': '生产区域',
'point_location': '位置',
'ext_code': '外部编码',
'is_used': '是否启用',
'mes_used': 'MES启用'
},
'rules': {
'r1': '点位编码不能为空',
'r2': '点位状态不能为空',
'r3': '是否启用不能为空'
},
'msg': {
'm1': '输入点位编码'
}
}
}

View File

@@ -14,8 +14,7 @@ export default {
'msg': {
'm1': 'Are you sure you want to force logout on this use?',
'm2': 'Successful forced withdrawal!',
'm3_1': 'Confirm the forcibly unselected',
'm3_2': 'users?',
'm3': 'Confirm to force-exit the selected {count} users?',
'm4': 'Fuzzy Search'
}
}

View File

@@ -14,8 +14,7 @@ export default {
'msg': {
'm1': 'Apakah Anda yakin ingin memaksa logout pada penggunaan ini?',
'm2': 'Penarikan paksa yang berhasil!',
'm3_1': 'Konfirmasikan yang tidak dipilih secara paksa',
'm3_2': 'pengguna?',
'm3': 'Konfirmasikan untuk keluar paksa dari {count} pengguna yang dipilih?',
'm4': 'Pencarian Kabur'
}
}

View File

@@ -14,8 +14,7 @@ export default {
'msg': {
'm1': '确定强制退出该用户吗?',
'm2': '强退成功!',
'm3_1': '确认强退选中的',
'm3_2': '个用户?',
'm3': '确认强退选中的{count}个用户?',
'm4': '模糊搜索'
}
}

View File

@@ -52,10 +52,8 @@ export default {
'msg': {
'm1': 'Confirm reset the password?',
'm2': 'Password reset succeeded. Password :123456',
'm3_1': 'This operation will ',
'm3_2': 'Account',
'm3_3': '. Do you want to continue?',
'm3_4': ' Already '
'm3': 'This operation will change {display_name} account: {username}. Do you want to continue?',
'm4': 'Account: {username} has been {display_name}'
}
}
}

View File

@@ -52,10 +52,8 @@ export default {
'msg': {
'm1': 'Konfirmasikan setel ulang kata sandi?',
'm2': 'Penyetelan ulang kata sandi berhasil. Kata sandi :123456',
'm3_1': 'Operasi ini akan terjadi',
'm3_2': 'Akun',
'm3_3': ', Apakah Anda ingin melanjutkan?',
'm3_4': ' Sudah '
'm3': 'Operasi ini akan mengubah akun {display_name}: {username}.',
'm4': 'Akun: {username} telah menjadi {display_name}'
}
}
}

View File

@@ -52,10 +52,8 @@ export default {
'msg': {
'm1': '确认重置密码?',
'm2': '密码重置成功,密码:123456',
'm3_1': '此操作将',
'm3_2': '账号:',
'm3_3': ', 是否继续?',
'm3_4': '已'
'm3': '此操作将{display_name}账号:{username},是否继续?',
'm4': '账号:{username}已{display_name}'
}
}
}

View File

@@ -0,0 +1,55 @@
export default {
'RawFoil': {
'title': 'Raw Foil Order',
'table': {
'mfg_order_name': 'Work No',
'status': 'Status',
'container_name': 'Container No',
'point_code2': 'Point Code',
'resource_name': 'Machine Code',
'product_name': 'Product Code',
'theory_height': 'Theory Length',
'realstart_time': 'Start Time',
'realend_time': 'End Time',
'productin_qty': 'Weight',
'agvno': 'AGV No',
'product_area': 'Product Area',
'is_baking': 'Baking',
'is_instor': 'Instor',
'update_time': 'Update Time'
},
'dialog': {
'container_name': 'container no',
'resource_name': 'machine code',
'mfg_order_name': 'work no',
'product_name': 'product code',
'description': 'product name',
'theory_height': 'theory length',
'eqp_velocity': 'production rate',
'up_coiler_date': 'up coiler date',
'productin_qty': 'weight',
'agvno': 'agv no',
'remark': 'remark',
'is_reload_send': 'reload send',
'weight': 'Weighting'
},
'search': {
'product_area': 'product area',
'status': 'status',
'createTime': 'order date',
'button_end': 'forced close',
'button_weight': 'weigh'
},
'msg': {
'm1': 'You cannot force an end to a completed work order',
'm2': 'The master volume number cannot be empty',
'm3': 'The machine code cannot be empty',
'm4': 'The production ticket cannot be empty',
'm5': 'The product code cannot be empty',
'm6': 'The product name cannot be empty',
'm7': 'The theoretical length cannot be empty',
'm8': 'The production speed of the device cannot be empty',
'm9': 'The roll up start time cannot be empty'
}
}
}

View File

@@ -0,0 +1,48 @@
export default {
'RawFoil': {
'title': 'Pesanan Foil Mentah',
'table': {
'mfg_order_name': 'Tidak Ada Pekerjaan',
'status': 'Status',
'container_name': 'Nomor Kontainer',
'point_code2': 'Kode Titik',
'resource_name': 'Kode Mesin',
'product_name': 'Kode Produk',
'theory_height': 'Panjang Teori',
'realstart_time': 'Waktu Mulai',
'realend_time': 'Waktu Berakhir',
'productin_qty': 'Berat',
'agvno': 'AGV Tidak',
'product_area': 'Area Produk',
'is_baking': 'Memanggang',
'is_instor': 'Instor',
'update_time': 'Waktu Pembaruan'
},
'dialog': {
'container_name': 'no container',
'resource_name': 'kode mesin',
'mfg_order_name': 'tidak ada pekerjaan',
'product_name': 'kode produk',
'description': 'nama produk',
'theory_height': 'panjang teori',
'eqp_velocity': 'tingkat produksi',
'up_coiler_date': 'tanggal up coiler',
'productin_qty': 'berat',
'agvno': 'agv tidak',
'remark': 'komentar',
'is_reload_send': 'muat ulang pengiriman',
'weight': 'Pembobotan'
},
'msg': {
'm1': 'Anda tidak dapat memaksa diakhirinya perintah kerja yang sudah selesai',
'm2': 'Nomor volume master tidak boleh kosong',
'm3': 'Kode mesin tidak boleh kosong',
'm4': 'Tiket produksi tidak boleh kosong',
'm5': 'Kode produk tidak boleh kosong',
'm6': 'Nama produk tidak boleh kosong',
'm7': 'Panjang teoritis tidak boleh kosong',
'm8': 'Kecepatan produksi perangkat tidak boleh kosong',
'm9': 'Waktu mulai roll up tidak boleh kosong'
}
}
}

View File

@@ -0,0 +1,55 @@
export default {
'RawFoil': {
'title': '生箔工序工单',
'table': {
'mfg_order_name': '工单号',
'status': '工单状态',
'container_name': '母卷号',
'point_code2': '点位编码',
'resource_name': '机台编码',
'product_name': '产品编码',
'theory_height': '理论长度',
'realstart_time': '开始时间',
'realend_time': '结束时间',
'productin_qty': '重量',
'agvno': '车号',
'product_area': '生产区域',
'is_baking': '请求烘烤',
'is_instor': '请求入半成品库',
'update_time': '更新时间'
},
'dialog': {
'container_name': '母卷号',
'resource_name': '机台编码',
'mfg_order_name': '生产工单',
'product_name': '产品编码',
'description': '产品名称',
'theory_height': '理论长度',
'eqp_velocity': '设备生产速度',
'up_coiler_date': '上卷开始时间',
'productin_qty': '重量',
'agvno': '车号',
'remark': '备注',
'is_reload_send': '是否重新更新',
'weight': '称重'
},
'search': {
'product_area': '生产区域',
'status': '工单状态',
'createTime': '工单日期',
'button_end': '强制结束',
'button_weight': '称重'
},
'msg': {
'm1': '不能对完成状态的工单强制结束',
'm2': '母卷号不能为空',
'm3': '机台编码不能为空',
'm4': '生产工单不能为空',
'm5': '产品编码不能为空',
'm6': '产品名称不能为空',
'm7': '理论长度不能为空',
'm8': '设备生产速度不能为空',
'm9': '上卷开始时间不能为空'
}
}
}

View File

@@ -72,8 +72,7 @@ export default {
'browses': '浏览',
'fz': '全屏缩放',
'Tips': '提示',
'Tip1': '确认删除选中的',
'Tip2': '条数据?',
'Tip1': '确认删除选中的{count}条数据?',
'Tip3': '用户姓名不作为登录使用',
'Tip4': '手机号码不能重复',
'Tip5': '请输入电话号码',
@@ -89,7 +88,8 @@ export default {
'Tip15': '请输入图标名称',
'Tip16': '不能为空',
'Tip17': '请输入你要搜索的内容',
'loading': '数据加载中...'
'loading': '数据加载中...',
'Tip18': '选择日期时间'
},
'WorkOrder': {
'form': {

View File

@@ -89,7 +89,7 @@ export default {
},
methods: {
doDelete(datas) {
this.$confirm(i18n.t('Online.m3_1') + `${datas.length}` + i18n.t('Online.m3_1'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('Online.msg.m3', { count: datas.length }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'

View File

@@ -289,7 +289,7 @@ export default {
const satus = this.enabledTypeOptions.find(item => {
return item.key == data.is_used
})
this.$confirm(i18n.t('Dept.msg.tip3.1') + ' "' + satus.display_name + '" ' + data.name + i18n.t('Dept.msg.tip3.2'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('Dept.msg.tip3', { display_name: satus.display_name, name: data.name }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'

View File

@@ -231,7 +231,7 @@ export default {
this.delBtlStatu = val.length == 0
},
batchDel() {
this.$confirm(i18n.t('common.Tip1') + this.multipleSelection.length + i18n.t('common.Tip2'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('common.Tip1', { count: this.multipleSelection.length }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'

View File

@@ -610,7 +610,7 @@ export default {
// 改变状态
changeEnabled(row) {
const satus = this.enabledTypeOptions.find(item => { return item.key !== row.is_used })
this.$confirm(i18n.t('User.msg.m3_1') + satus.display_name + i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_3'), i18n.t('common.Tips'), {
this.$confirm(i18n.t('User.msg.m3', {display_name: satus.display_name, username: row.username}), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'
@@ -618,7 +618,7 @@ export default {
row.is_used = satus.key
crudUser.edit(row).then(res => {
this.crud.toQuery()
this.crud.notify(i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_4') + satus.display_name)
this.crud.notify(i18n.t('User.msg.m4', { display_name: satus.display_name, username: row.username }))
})
})
},

View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="回传MES"
:title="$t('CoolRegion.pan1.search.button_1')"
append-to-body
:visible.sync="dialogVisible"
:before-close="handleClose"
@@ -9,14 +9,14 @@
@close="close"
>
<el-form ref="form" :model="form1" size="mini" label-width="110px">
<el-form-item label="母卷号" prop="container_name">
<el-form-item :label="$t('CoolRegion.pan1.dialog.container_name')" prop="container_name">
<el-input v-model="form1.container_name" clearable size="mini" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="close">取消</el-button>
<el-button type="primary" @click="confirm('1')">入冷却回传</el-button>
<el-button type="text" @click="close">{{ $t('common.Cancel') }}</el-button>
<el-button type="primary" @click="confirm('1')">{{ $t('CoolRegion.pan1.search.button_2') }}</el-button>
</div>
</el-dialog>
</template>

View File

@@ -8,56 +8,55 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="起点点位编码" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.start_point_code')">
<el-input
v-model="query.start_point_code"
clearable
placeholder="输入起点点位编码"
:placeholder="$t('CoolRegion.pan2.msg.m1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="终点点位编码" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.end_point_code')">
<el-input
v-model="query.end_point_code"
clearable
placeholder="输入终点点位编码"
:placeholder="$t('CoolRegion.pan2.msg.m2')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="批次号" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.pcsn')">
<el-input
v-model="query.pcsn"
clearable
placeholder="输入批次"
:placeholder="$t('CoolRegion.pan2.msg.m3')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="载具编码" label-width="120px">
<el-form-item :label="$t('CoolRegion.pan2.search.vehicle_code')">
<el-input
v-model="query.vehicle_code"
clearable
placeholder="输入载具"
:placeholder="$t('CoolRegion.pan2.msg.m4')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('CoolRegion.pan2.search.createTime')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -140,13 +139,25 @@
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column show-overflow-tooltip prop="bill_code" label="单据编号" width="120px" />
<el-table-column prop="io_type" label="出入类型">
<el-table-column
show-overflow-tooltip
prop="bill_code"
:label="$t('CoolRegion.pan2.table.bill_code')"
width="120px"
/>
<el-table-column
prop="io_type"
:label="$t('CoolRegion.pan2.table.io_type')"
>
<template slot-scope="scope">
{{ dict.label.io_type[scope.row.io_type] }}
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty" label="数量" />
<el-table-column
show-overflow-tooltip
prop="qty"
:label="$t('CoolRegion.pan2.table.qty')"
/>
<!-- <el-table-column prop="bill_status" label="单据状态" >
<template slot-scope="scope">
{{ dict.label.st_bill_status[scope.row.bill_status] }}
@@ -157,14 +168,48 @@
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>-->
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" width="120px" />
<el-table-column show-overflow-tooltip prop="start_point_code" label="起始点位" width="120px" />
<el-table-column show-overflow-tooltip prop="end_point_code" label="终点点位" width="120px" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="confirm_optname" label="确认人" />
<el-table-column prop="confirm_time" label="确认时间" min-width="150" show-overflow-tooltip />
<el-table-column
show-overflow-tooltip
prop="pcsn"
:label="$t('CoolRegion.pan2.table.pcsn')"
width="120px"
/>
<el-table-column
how-overflow-tooltip
prop="start_point_code"
:label="$t('CoolRegion.pan2.table.start_point_code')"
width="120px"
/>
<el-table-column
show-overflow-tooltip
prop="end_point_code"
:label="$t('CoolRegion.pan2.table.end_point_code')"
width="120px"
/>
<el-table-column
prop="remark"
:label="$t('CoolRegion.pan1.table.remark')"
/>
<el-table-column
prop="create_name"
:label="$t('CoolRegion.pan2.table.create_name')"
/>
<el-table-column
prop="create_time"
:label="$t('CoolRegion.pan2.table.create_time')"
min-width="150"
show-overflow-tooltip
/>
<el-table-column
prop="confirm_optname"
:label="$t('CoolRegion.pan2.table.confirm_optname')"
/>
<el-table-column
prop="confirm_time"
:label="$t('CoolRegion.pan2.table.confirm_time')"
min-width="150"
show-overflow-tooltip
/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
@@ -188,6 +233,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import i18n from "@/i18n";
const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
export default {
@@ -197,7 +243,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '冷却区出入',
title: i18n.t('CoolRegion.pan2.title'),
url: 'api/stIvtCoolpointivt/coolRegionIOQueryAll',
idField: 'iostorinv_id',
sort: 'iostorinv_id,desc',
@@ -217,17 +263,17 @@ export default {
},
rules: {
full_point_status: [
{ required: true, message: '满轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r1'), trigger: 'blur' }
],
empty_point_status: [
{ required: true, message: '空轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r2'), trigger: 'blur' }
],
cool_ivt_status: [
{ required: true, message: '库存状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r3'), trigger: 'blur' }
]
},
queryTypeOptions: [
{ key: 'point_code', display_name: '点位编码' }
{ key: 'point_code', display_name: i18n.t('CoolRegion.pan1.dialog.point_code') }
]
}
},

View File

@@ -2,10 +2,10 @@
<div class="app-container">
<el-tabs type="border-card">
<el-tab-pane>
<span slot="label"><i class="el-icon-date" /> 库存查询</span>
<span slot="label"><i class="el-icon-date" /> {{ $t('CoolRegion.pan1.title') }}</span>
<Inventory />
</el-tab-pane>
<el-tab-pane label="冷却区出入记录">
<el-tab-pane :label="$t('CoolRegion.pan2.title')">
<CoolRegionIO />
</el-tab-pane>
</el-tabs>

View File

@@ -8,30 +8,29 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item :label="$t('CoolRegion.pan1.dialog.point_code')">
<el-input
v-model="query.point_code"
clearable
placeholder="输入点位编码"
:placeholder="$t('CoolRegion.pan1.msg.m1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('CoolRegion.pan1.dialog.container_name')">
<el-input
v-model="query.container_name"
clearable
placeholder="输入母卷号"
:placeholder="$t('CoolRegion.pan1.msg.m2')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="满轴位状态">
<el-form-item :label="$t('CoolRegion.pan1.dialog.full_point_status')">
<el-select
v-model="query.full_point_status"
clearable
@@ -48,7 +47,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="空轴位状态">
<el-form-item :label="$t('CoolRegion.pan1.dialog.empty_point_status')">
<el-select
v-model="query.empty_point_status"
clearable
@@ -65,7 +64,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('CoolRegion.pan1.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -82,7 +81,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="生产位置">
<el-form-item :label="$t('CoolRegion.pan1.dialog.point_location')">
<el-select
v-model="query.point_location"
clearable
@@ -99,7 +98,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="库存状态">
<el-form-item :label="$t('CoolRegion.pan1.dialog.cool_ivt_status')">
<el-select
v-model="query.cool_ivt_status"
clearable
@@ -116,7 +115,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('CoolRegion.pan1.dialog.is_used')">
<el-switch
v-model="query.is_used"
active-value="0"
@@ -126,13 +125,13 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="入库时间">
<el-form-item :label="$t('CoolRegion.pan1.search.createTime')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -151,20 +150,32 @@
:disabled="crud.selections.length !== 1"
@click="uploadMES"
>
回传MES
{{ $t('CoolRegion.pan1.search.button_1') }}
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
:width="computedLabelWidth"
>
<el-form
ref="form"
:model="form"
:rules="rules"
size="mini"
:label-width="computedFormLabelWidth"
>
<el-form-item :label="$t('CoolRegion.pan1.dialog.point_code')" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('CoolRegion.pan1.dialog.product_area')">
<el-select
v-model="form.product_area"
size="mini"
placeholder="生产区域"
:placeholder="$t('CoolRegion.pan1.dialog.product_area')"
class="filter-item"
style="width: 370px;"
>
@@ -175,14 +186,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('CoolRegion.pan1.dialog.is_used')">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
<el-form-item label="满轴位状态" prop="full_point_status">
<el-form-item :label="$t('CoolRegion.pan1.dialog.full_point_status')" prop="full_point_status">
<el-select
v-model="form.full_point_status"
size="mini"
placeholder="满轴位状态"
:placeholder="$t('CoolRegion.pan1.dialog.full_point_status')"
class="filter-item"
style="width: 370px;"
>
@@ -193,10 +204,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('CoolRegion.pan1.dialog.container_name')">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-form-item :label="$t('CoolRegion.pan1.dialog.empty_point_status')" prop="empty_point_status">
<el-select
v-model="form.empty_point_status"
clearable
@@ -212,10 +223,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="空轴编码">
<el-form-item :label="$t('CoolRegion.pan1.dialog.empty_vehicle_code')">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="库存状态" prop="cool_ivt_status">
<el-form-item :label="$t('CoolRegion.pan1.dialog.cool_ivt_status')" prop="cool_ivt_status">
<el-select
v-model="form.cool_ivt_status"
clearable
@@ -233,54 +244,121 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="cool_ivt_status" label="库存状态" min-width="100" show-overflow-tooltip>
<el-table-column
prop="point_code"
:label="$t('CoolRegion.pan1.table.point_code')"
:min-width="flexWidth('point_code',crud.data,$t('CoolRegion.pan1.table.point_code'))"
/>
<el-table-column
prop="cool_ivt_status"
:label="$t('CoolRegion.pan1.table.cool_ivt_status')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.cool_ivt_status'))"
>
<template slot-scope="scope">
{{ dict.label.sch_cool_ivt_status[scope.row.cool_ivt_status] }}
</template>
</el-table-column>
<el-table-column prop="full_point_code" label="满轴位" :min-width="flexWidth('full_point_code',crud.data,'满轴位')" />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip>
<el-table-column
prop="full_point_code"
:label="$t('CoolRegion.pan1.table.full_point_code')"
:min-width="flexWidth('full_point_code',crud.data,$t('CoolRegion.pan1.table.full_point_code'))"
/>
<el-table-column
prop="full_point_status"
:label="$t('CoolRegion.pan1.table.full_point_code')"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ dict.label.sch_full_point_status[scope.row.full_point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="empty_point_code" label="空轴位" :min-width="flexWidth('empty_point_code',crud.data,'空轴位')" />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip>
<el-table-column
prop="container_name"
:label="$t('CoolRegion.pan1.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('CoolRegion.pan1.table.container_name'))"
/>
<el-table-column
prop="empty_point_code"
:label="$t('CoolRegion.pan1.table.empty_point_code')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.empty_point_code'))"
/>
<el-table-column
prop="empty_point_status"
:label="$t('CoolRegion.pan1.table.empty_point_code')"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
</template>
</el-table-column>
<el-table-column prop="empty_vehicle_code" label="空轴编号" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="qty_unit_name" label="计量单位" />
<el-table-column prop="instorage_time" label="入库时间" min-width="140" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域">
<el-table-column
prop="empty_vehicle_code"
:label="$t('CoolRegion.pan1.table.empty_vehicle_code')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.empty_vehicle_code'))"
/>
<el-table-column
prop="ivt_qty"
:label="$t('CoolRegion.pan1.table.ivt_qty')"
:formatter="crud.formatNum3"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.ivt_qty'))"
/>
<el-table-column
prop="qty_unit_name"
:label="$t('CoolRegion.pan1.table.qty_unit_name')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.qty_unit_name'))"
/>
<el-table-column
prop="instorage_time"
:label="$t('CoolRegion.pan1.table.instorage_time')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.instorage_time'))"
show-overflow-tooltip
/>
<el-table-column
prop="product_area"
:label="$t('CoolRegion.pan1.table.product_area')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.product_area'))"
>
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="point_location" label="位置">
<el-table-column
prop="point_location"
:label="$t('CoolRegion.pan1.table.point_location')"
>
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<el-table-column
prop="is_used"
:label="$t('CoolRegion.pan1.table.is_used')"
>
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="remark"
:label="$t('CoolRegion.pan1.table.remark')"
:min-width="flexWidth('empty_point_code',crud.data,$t('CoolRegion.pan1.table.remark'))"
/>
<el-table-column
prop="update_time"
:label="$t('CoolRegion.pan1.table.update_time')"
min-width="150"
show-overflow-tooltip
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -305,6 +383,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Dialog from '@/views/wms/pdm/ivt/coolpointivt/Dialog.vue'
import i18n from '@/i18n'
const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, container_name: null, workorder_id: null, full_vehicle_code: null, empty_point_code: null, empty_vehicle_code: null, region_id: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, full_point_status: null, cool_ivt_status: null, empty_point_status: null }
export default {
@@ -314,7 +393,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '冷却区库存',
title: i18n.t('CoolRegion.pan1.title'),
url: 'api/stIvtCoolpointivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
@@ -336,20 +415,39 @@ export default {
openParam: null,
rules: {
full_point_status: [
{ required: true, message: '满轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r1'), trigger: 'blur' }
],
empty_point_status: [
{ required: true, message: '空轴位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r2'), trigger: 'blur' }
],
cool_ivt_status: [
{ required: true, message: '库存状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('CoolRegion.pan1.rules.r3'), trigger: 'blur' }
]
},
queryTypeOptions: [
{ key: 'point_code', display_name: '点位编码' }
{ key: 'point_code', display_name: i18n.t('CoolRegion.pan1.dialog.point_code') }
]
}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `520px`
}
return `600px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `100px`
}
if (item === 'in') {
return `180px`
}
return `150px`
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -359,7 +457,7 @@ export default {
debugger
const _selectData = this.$refs.table.selection
if (_selectData.length !== 1) {
return this.crud.notify('请选择一个点位进行回传!', CRUD.NOTIFICATION_TYPE.INFO)
return this.crud.notify(i18n.t('CoolRegion.pan1.msg.m3'), CRUD.NOTIFICATION_TYPE.INFO)
}
this.openParam = _selectData[0]
this.dialogShow = true

View File

@@ -2,10 +2,10 @@
<div class="app-container">
<el-tabs type="border-card">
<el-tab-pane>
<span slot="label"><i class="el-icon-date" /> 库存查询</span>
<span slot="label"><i class="el-icon-date" /> {{ $t('Hot.pan1.title') }}</span>
<PointIvt />
</el-tab-pane>
<el-tab-pane label="烘箱任务">
<el-tab-pane :label="$t('Hot.pan2.title')">
<TaskDtl />
</el-tab-pane>
</el-tabs>

View File

@@ -8,20 +8,19 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item :label="$t('Hot.pan1.dialog.point_code')">
<el-input
v-model="query.point_code"
clearable
placeholder="输入点位编码"
:placeholder="$t('Hot.pan1.search.p1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="点位状态">
<el-form-item :label="$t('Hot.pan1.dialog.point_status')">
<el-select
v-model="query.point_status"
clearable
@@ -38,7 +37,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('Hot.pan1.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -55,7 +54,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('Hot.pan1.dialog.is_used')">
<el-switch
v-model="query.is_used"
active-value="0"
@@ -65,7 +64,7 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="生产位置">
<el-form-item :label="$t('Hot.pan1.dialog.point_location')">
<el-select
v-model="query.point_location"
clearable
@@ -81,13 +80,13 @@
/>
</el-select>
</el-form-item>
<el-form-item label="入箱时间">
<el-form-item :label="$t('Hot.pan1.dialog.instorage_time')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -106,7 +105,7 @@
:disabled="crud.selections.length !== 1"
@click="uploadMES"
>
回传MES
{{ $t('Hot.pan1.search.button_1') }}
</el-button>
</crudOperation>
<!--表单组件-->
@@ -115,13 +114,13 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="520px"
:width="computedLabelWidth"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-form ref="form" :model="form" :rules="rules" size="mini" :label-width="computedFormLabelWidth">
<el-form-item :label="$t('Hot.pan1.dialog.point_code')" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('Hot.pan1.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -137,7 +136,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-form-item :label="$t('Hot.pan1.dialog.point_status')" prop="point_status">
<el-select
v-model="form.point_status"
clearable
@@ -153,19 +152,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('Hot.pan1.dialog.container_name')">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="温度">
<el-form-item :label="$t('Hot.pan1.dialog.temperature')">
<el-input v-model="form.temperature" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-form-item :label="$t('Hot.pan1.dialog.is_used')" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -178,37 +177,98 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" width="120px" show-overflow-tooltip label="点位编码" />
<el-table-column prop="point_status" label="点位状态">
<el-table-column
prop="point_code"
:min-width="flexWidth('point_code',crud.data,$t('Hot.pan1.table.point_code'))"
show-overflow-tooltip
:label="$t('Hot.pan1.table.point_code')"
/>
<el-table-column
prop="point_status"
:label="$t('Hot.pan1.table.point_status')"
:min-width="flexWidth('point_status',crud.data,$t('Hot.pan1.table.point_status'))"
>
<template slot-scope="scope">
{{ dict.label.sch_hot_point_status[scope.row.point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" width="150px" show-overflow-tooltip />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="instorage_time" label="入箱时间" width="150px" show-overflow-tooltip />
<el-table-column prop="product_area" label="生产区域">
<el-table-column
prop="container_name"
:label="$t('Hot.pan1.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('Hot.pan1.table.container_name'))"
show-overflow-tooltip
/>
<el-table-column
prop="ivt_qty"
:label="$t('Hot.pan1.table.ivt_qty')"
:formatter="crud.formatNum3"
:min-width="flexWidth('ivt_qty',crud.data,$t('Hot.pan1.table.ivt_qty'))"
/>
<el-table-column
prop="instorage_time"
:label="$t('Hot.pan1.table.instorage_time')"
:min-width="flexWidth('instorage_time',crud.data,$t('Hot.pan1.table.instorage_time'))"
show-overflow-tooltip
/>
<el-table-column
prop="product_area"
:label="$t('Hot.pan1.table.product_area')"
:min-width="flexWidth('product_area',crud.data,$t('Hot.pan1.table.product_area'))"
>
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="temperature" label="温度" />
<el-table-column prop="last_time" label="倒计时" width="120" />
<el-table-column prop="group_name" label="组别" />
<el-table-column prop="ext_code" label="外部编码" width="130" />
<el-table-column prop="point_location" label="位置">
<el-table-column
prop="temperature"
:label="$t('Hot.pan1.table.temperature')"
:min-width="flexWidth('temperature',crud.data,$t('Hot.pan1.table.temperature'), 10)"
/>
<el-table-column
prop="last_time"
:label="$t('Hot.pan1.table.last_time')"
:min-width="flexWidth('last_time',crud.data,$t('Hot.pan1.table.last_time'))"
/>
<el-table-column
prop="group_name"
:label="$t('Hot.pan1.table.group_name')"
:min-width="flexWidth('group_name',crud.data,$t('Hot.pan1.table.group_name'))"
/>
<el-table-column
prop="ext_code"
:label="$t('Hot.pan1.table.ext_code')"
:min-width="flexWidth('ext_code',crud.data,$t('Hot.pan1.table.ext_code'))"
/>
<el-table-column
prop="point_location"
:label="$t('Hot.pan1.table.point_location')"
:min-width="flexWidth('point_location',crud.data,$t('Hot.pan1.table.point_location'), 10)"
>
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<el-table-column
prop="is_used"
:label="$t('Hot.pan1.table.is_used')"
:min-width="flexWidth('is_used',crud.data,$t('Hot.pan1.table.is_used'))"
>
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="remark"
:label="$t('Hot.pan1.table.remark')"
:min-width="flexWidth('remark',crud.data,$t('Hot.pan1.table.remark'))"
/>
<el-table-column
prop="update_time"
:label="$t('Hot.pan1.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('Hot.pan1.table.update_time'))"
show-overflow-tooltip
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -233,6 +293,7 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Dialog from '@/views/wms/pdm/ivt/hotpointivt/Dialog.vue'
import i18n from "@/i18n";
const defaultForm = {
ivt_id: null,
@@ -266,7 +327,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '烘烤区点位库存',
title: i18n.t('Hot.pan1.title'),
url: 'api/hotpointivt',
idField: 'ivt_id',
sort: 'ivt_id,desc',
@@ -287,14 +348,30 @@ export default {
dialogShow: false,
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Hot.pan1.msg.m1'), trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('Hot.pan1.msg.m2'), trigger: 'blur' }
]
}
}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `520px`
}
return `540px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `100px`
}
return `120px`
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -307,7 +384,7 @@ export default {
debugger
const _selectData = this.$refs.table.selection
if (_selectData.length !== 1) {
return this.crud.notify('请选择一个点位进行回传!', CRUD.NOTIFICATION_TYPE.INFO)
return this.crud.notify(i18n.t('Hot.pan1.msg.m3'), CRUD.NOTIFICATION_TYPE.INFO)
}
this.openParam = _selectData[0]
this.dialogShow = true

View File

@@ -8,66 +8,65 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="单据编码">
<el-form-item :label="$t('Hot.pan2.dialog.bill_code')">
<el-input
v-model="query.bill_code"
clearable
placeholder="单据编码"
:placeholder="$t('Hot.pan2.dialog.bill_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务编码">
<el-form-item :label="$t('Hot.pan2.dialog.task_code')">
<el-input
v-model="query.task_code"
clearable
placeholder="任务编码"
:placeholder="$t('Hot.pan2.dialog.task_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="起点编码">
<el-form-item :label="$t('Hot.pan2.dialog.start_point_code')">
<el-input
v-model="query.start_point_code"
clearable
placeholder="起点编码"
:placeholder="$t('Hot.pan2.dialog.start_point_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="终点编码">
<el-form-item :label="$t('Hot.pan2.dialog.end_point_code')">
<el-input
v-model="query.next_point_code"
clearable
placeholder="终点编码"
:placeholder="$t('Hot.pan2.dialog.end_point_code')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<el-form-item :label="$t('Hot.pan2.dialog.container_name')">
<el-input
v-model="query.container_name"
clearable
placeholder="母卷号"
:placeholder="$t('Hot.pan2.dialog.container_name')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('Hot.pan2.dialog.create_time')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -79,17 +78,61 @@
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column prop="bill_code" label="单据编码" :min-width="flexWidth('bill_code',crud.data,'单据编码')" />
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="start_point_code" label="起始点位" :min-width="flexWidth('start_point_code',crud.data,'起始点位')" />
<el-table-column prop="end_point_code" label="终点点位" :min-width="flexWidth('end_point_code',crud.data,'终点点位')" />
<el-table-column prop="temperature" label="烤箱温度" :min-width="flexWidth('temperature',crud.data,'烤箱温度')" />
<el-table-column prop="oven_time" label="烘烤时间" :min-width="flexWidth('oven_time',crud.data,'烘烤时间')" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="confirm_optname" label="确认人" :min-width="flexWidth('confirm_optname',crud.data,'确认人')" />
<el-table-column prop="confirm_time" label="确认时间" :min-width="flexWidth('confirm_time',crud.data,'确认时间')" />
<el-table-column
prop="bill_code"
:label="$t('Hot.pan2.table.bill_code')"
:min-width="flexWidth('bill_code',crud.data,$t('Hot.pan2.table.bill_code'))"
/>
<el-table-column
prop="container_name"
:label="$t('Hot.pan2.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('Hot.pan2.table.container_name'))"
/>
<el-table-column
prop="start_point_code"
:label="$t('Hot.pan2.table.start_point_code')"
:min-width="flexWidth('start_point_code',crud.data,$t('Hot.pan2.table.start_point_code'))"
/>
<el-table-column
prop="end_point_code"
:label="$t('Hot.pan2.table.start_point_code')"
:min-width="flexWidth('end_point_code',crud.data,$t('Hot.pan2.table.start_point_code'))"
/>
<el-table-column
prop="temperature"
:label="$t('Hot.pan2.table.temperature')"
:min-width="flexWidth('temperature',crud.data,$t('Hot.pan2.table.temperature'))"
/>
<el-table-column
prop="oven_time"
:label="$t('Hot.pan2.table.oven_time')"
:min-width="flexWidth('oven_time',crud.data,$t('Hot.pan2.table.oven_time'))"
/>
<el-table-column
prop="task_code"
:label="$t('Hot.pan2.table.task_code')"
:min-width="flexWidth('task_code',crud.data,$t('Hot.pan2.table.task_code'))"
/>
<el-table-column
prop="create_name"
:label="$t('Hot.pan2.table.create_name')"
:min-width="flexWidth('create_name',crud.data,$t('Hot.pan2.table.create_name'))"
/>
<el-table-column
prop="create_time"
:label="$t('Hot.pan2.table.create_time')"
:min-width="flexWidth('create_time',crud.data,$t('Hot.pan2.table.create_time'))"
/>
<el-table-column
prop="confirm_optname"
:label="$t('Hot.pan2.table.confirm_optname')"
:min-width="flexWidth('confirm_optname',crud.data,$t('Hot.pan2.table.confirm_optname'))"
/>
<el-table-column
prop="confirm_time"
:label="$t('Hot.pan2.table.confirm_time')"
:min-width="flexWidth('confirm_time',crud.data,$t('Hot.pan2.table.confirm_time'))"
/>
</el-table>
<!--分页组件-->
<pagination />
@@ -104,6 +147,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import i18n from "@/i18n";
const defaultForm = { }
export default {
@@ -130,9 +174,9 @@ export default {
data() {
return {
statusDtlList: [
{ 'label': '生成', 'value': '10' },
{ 'label': '执行中', 'value': '40' },
{ 'label': '确认', 'value': '50' }
{ 'label': i18n.t('Hot.pan2.statusDtlList.build'), 'value': '10' },
{ 'label': i18n.t('Hot.pan2.statusDtlList.running'), 'value': '40' },
{ 'label': i18n.t('Hot.pan2.statusDtlList.confirm'), 'value': '50' }
],
permission: {
},

View File

@@ -8,20 +8,19 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="90px"
label-suffix=":"
>
<el-form-item label="点位编码">
<el-form-item :label="$t('SbPointIvt.dialog.point_code')">
<el-input
v-model="query.point_code"
clearable
placeholder="输入点位编码"
:placeholder="$t('SbPointIvt.msg.m1')"
style="width: 185px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('SbPointIvt.dialog.product_area')">
<el-select
v-model="query.product_area"
clearable
@@ -38,7 +37,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-form-item :label="$t('SbPointIvt.dialog.is_used')">
<el-switch
v-model="query.is_used"
active-value="0"
@@ -48,7 +47,7 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="MES启用">
<el-form-item :label="$t('SbPointIvt.dialog.mes_used')">
<el-switch
v-model="query.mes_used"
active-value="0"
@@ -64,19 +63,19 @@
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" :width="computedLabelWidth">
<el-form ref="form" :model="form" :rules="rules" size="mini" :label-width="computedFormLabelWidth">
<el-form-item :label="$t('SbPointIvt.dialog.point_code')" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="载具编码">
<el-form-item :label="$t('SbPointIvt.dialog.vehicle_code')">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产区域">
<el-form-item :label="$t('SbPointIvt.dialog.product_area')">
<el-select
v-model="form.product_area"
size="mini"
placeholder="生产区域"
:placeholder="$t('SbPointIvt.dialog.product_area')"
class="filter-item"
style="width: 370px;"
>
@@ -87,11 +86,11 @@
/>
</el-select>
</el-form-item>
<el-form-item label="位置">
<el-form-item :label="$t('SbPointIvt.dialog.point_location')">
<el-select
v-model="form.point_location"
size="mini"
placeholder="位置"
:placeholder="$t('SbPointIvt.dialog.point_location')"
class="filter-item"
style="width: 370px;"
>
@@ -102,50 +101,50 @@
/>
</el-select>
</el-form-item>
<el-form-item label="外部编码">
<el-form-item :label="$t('SbPointIvt.dialog.ext_code')">
<el-input v-model="form.ext_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-form-item :label="$t('SbPointIvt.dialog.is_used')" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
</el-form-item>
<el-form-item label="MES启用" prop="is_used">
<el-form-item :label="$t('SbPointIvt.dialog.mes_used')" prop="is_used">
<el-switch v-model="form.mes_used" active-value="1" inactive-value="0" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="product_area" label="生产区域">
<el-table-column prop="point_code" :label="$t('SbPointIvt.table.point_code')" />
<el-table-column prop="vehicle_code" :label="$t('SbPointIvt.table.vehicle_code')" />
<el-table-column prop="product_area" :label="$t('SbPointIvt.table.product_area')">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="point_location" label="位置">
<el-table-column prop="point_location" :label="$t('SbPointIvt.table.point_location')">
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}
</template>
</el-table-column>
<el-table-column prop="ext_code" label="外部编码" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="is_used" label="是否启用">
<el-table-column prop="ext_code" :label="$t('SbPointIvt.table.ext_code')" />
<el-table-column prop="remark" :label="$t('SbPointIvt.table.remark')" />
<el-table-column prop="is_used" :label="$t('SbPointIvt.table.is_used')">
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="mes_used" label="MES启用">
<el-table-column prop="mes_used" :label="$t('SbPointIvt.table.mes_used')">
<template slot-scope="scope">
{{ dict.label.is_used[scope.row.mes_used] }}
</template>
</el-table-column>
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column prop="update_time" :label="$t('SbPointIvt.table.update_time')" min-width="150" show-overflow-tooltip />
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -168,6 +167,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import i18n from "@/i18n";
const defaultForm = { point_id: null, point_code: null, point_status: null, vehicle_code: null, product_area: null, point_location: null, ext_code: null, remark: null, is_used: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
export default {
@@ -177,7 +177,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '生箔点位库存',
title: i18n.t('SbPointIvt.title'),
url: 'api/sbpointivt',
idField: 'point_id',
sort: 'point_id,desc',
@@ -197,16 +197,32 @@ export default {
},
rules: {
point_code: [
{ required: true, message: '点位编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('SbPointIvt.rules.r1'), trigger: 'blur' }
],
point_status: [
{ required: true, message: '点位状态不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('SbPointIvt.rules.r2'), trigger: 'blur' }
],
is_used: [
{ required: true, message: '是否启用不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('SbPointIvt.rules.r3'), trigger: 'blur' }
]
}}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `500px`
}
return `530px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `80px`
}
return `120px`
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {

View File

@@ -1,6 +1,6 @@
<template>
<el-dialog
title="称重"
:title="$t('RawFoil.dialog.weight')"
append-to-body
:visible.sync="dialogVisible"
:before-close="handleClose"
@@ -9,14 +9,14 @@
@close="close"
>
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form-item label="重量" prop="productin_qty">
<el-form-item :label="$t('RawFoil.dialog.productin_qty')" prop="productin_qty">
<el-input-number v-model="form1.productin_qty" :min="0" :controls="false" :precision="3" style="width: 250px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="close">取消</el-button>
<el-button type="primary" @click="confirm">确认</el-button>
<el-button type="text" @click="close">{{ $t('common.Cancel') }}</el-button>
<el-button type="primary" @click="confirm">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
</template>

View File

@@ -8,16 +8,15 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-form-item :label="$t('RawFoil.search.product_area')">
<el-select
v-model="query.product_area"
clearable
size="mini"
placeholder="请选择"
:placeholder="$t('common.Please_select')"
class="filter-item"
@change="hand"
>
@@ -29,33 +28,33 @@
</el-select>
</el-form-item>
<el-form-item label="机台编码">
<el-form-item :label="$t('RawFoil.dialog.resource_name')">
<el-input
v-model="query.resource_name"
clearable
size="mini"
placeholder="机台编码"
:placeholder="$t('RawFoil.dialog.resource_name')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="母卷号">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<el-form-item :label="$t('RawFoil.dialog.container_name')">
<!-- <label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;:</label>-->
<el-input
v-model="query.container_name"
clearable
size="mini"
placeholder="母卷号"
:placeholder="$t('RawFoil.dialog.container_name')"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="工单状态">
<el-form-item :label="$t('RawFoil.search.status')">
<el-select
v-model="query.status"
clearable
size="mini"
placeholder="工单状态"
:placeholder="$t('RawFoil.search.status')"
class="filter-item"
@change="hand"
>
@@ -67,13 +66,13 @@
</el-select>
</el-form-item>
<el-form-item label="工单日期">
<el-form-item :label="$t('RawFoil.search.createTime')">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('common.startDate')"
:end-placeholder="$t('common.endDate')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -93,7 +92,7 @@
:disabled="crud.selections.length !== 1"
@click="compelEnd"
>
强制结束
{{ $t('RawFoil.search.button_end') }}
</el-button>
<el-button
slot="right"
@@ -104,7 +103,7 @@
:disabled="crud.selections.length !== 1"
@click="weigh"
>
称重
{{ $t('RawFoil.search.button_weight') }}
</el-button>
</crudOperation>
<!--表单组件-->
@@ -113,17 +112,17 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="800px"
:width="computedLabelWidth"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px">
<el-form ref="form" :model="form" :rules="rules" size="mini" :label-width="computedFormLabelWidth">
<el-row>
<el-col :span="12">
<el-form-item label="母卷号" prop="container_name">
<el-form-item :label="$t('RawFoil.dialog.container_name')" prop="container_name">
<el-input v-model="form.container_name" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="机台编码" prop="resource_name">
<el-form-item :label="$t('RawFoil.dialog.resource_name')" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -131,12 +130,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="生产工单" prop="mfg_order_name">
<el-form-item :label="$t('RawFoil.dialog.mfg_order_name')" prop="mfg_order_name">
<el-input v-model="form.mfg_order_name" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品编码" prop="product_name">
<el-form-item :label="$t('RawFoil.dialog.product_name')" prop="product_name">
<el-input v-model="form.product_name" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -144,12 +143,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="产品名称" prop="description">
<el-form-item :label="$t('RawFoil.dialog.description')" prop="description">
<el-input v-model="form.description" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="理论长度" prop="theory_height">
<el-form-item :label="$t('RawFoil.dialog.theory_height')" prop="theory_height">
<el-input v-model="form.theory_height" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -157,17 +156,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备生产速度" prop="eqp_velocity">
<el-form-item :label="$t('RawFoil.dialog.eqp_velocity')" prop="eqp_velocity">
<el-input v-model="form.eqp_velocity" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上卷开始时间" prop="up_coiler_date">
<el-form-item :label="$t('RawFoil.dialog.up_coiler_date')" prop="up_coiler_date">
<!-- <el-date-picker v-model="form.up_coiler_date" type="date" placeholder="选择日期" style="width: 250px" value-format="yyyy-MM-dd" />-->
<el-date-picker
v-model="form.up_coiler_date"
type="datetime"
placeholder="选择日期时间"
:placeholder="$t('common.Tip18')"
style="width: 250px"
value-format="yyyy-MM-dd HH:mm:ss"
default-time="12:00:00"
@@ -178,12 +177,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="重量">
<el-form-item :label="$t('RawFoil.dialog.productin_qty')">
<el-input v-model="form.productin_qty" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车号">
<el-form-item :label="$t('RawFoil.dialog.agvno')">
<el-input v-model="form.agvno" style="width: 250px;" />
</el-form-item>
</el-col>
@@ -191,22 +190,22 @@
<el-row>
<el-col :span="12">
<el-form-item label="备注">
<el-form-item :label="$t('RawFoil.dialog.remark')">
<el-input v-model="form.remark" style="width: 250px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否重新更新">
<el-radio v-model="form.is_reload_send" label="0"></el-radio>
<el-radio v-model="form.is_reload_send" label="1"></el-radio>
<el-form-item :label="$t('RawFoil.dialog.is_reload_send')">
<el-radio v-model="form.is_reload_send" label="0">{{ $t('common.No') }}</el-radio>
<el-radio v-model="form.is_reload_send" label="1">{{ $t('common.Yes') }}</el-radio>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->
@@ -220,22 +219,86 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="工单标识" />
<el-table-column prop="mfg_order_name" label="工单号" :min-width="flexWidth('mfg_order_name',crud.data,'工单号')" />
<el-table-column prop="status" label="工单状态" :min-width="flexWidth('status',crud.data,'工单状态')" :formatter="formatStatusName" />
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="point_code2" label="点位编码" :min-width="flexWidth('point_code2',crud.data,'点位编码')" />
<el-table-column prop="resource_name" label="机台编码" :min-width="flexWidth('resource_name',crud.data,'机台编码')" />
<el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品编码')" />
<el-table-column prop="theory_height" label="理论长度" :min-width="flexWidth('theory_height',crud.data,'理论长度')" />
<el-table-column prop="realstart_time" label="开始时间" :min-width="flexWidth('realstart_time',crud.data,'开始时间')" />
<el-table-column prop="realend_time" label="结束时间" :min-width="flexWidth('realend_time',crud.data,'结束时间')" />
<el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot" />
<el-table-column prop="is_instor" label="请求入半成品库" :min-width="flexWidth('is_instor',crud.data,'请求入半成品库')" :formatter="formatStorIsOrNot" />
<el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="mfg_order_name"
:label="$t('RawFoil.table.mfg_order_name')"
:min-width="flexWidth('mfg_order_name', crud.data, $t('RawFoil.table.mfg_order_name'))"
/>
<el-table-column
prop="status"
:label="$t('RawFoil.table.status')"
:min-width="flexWidth('status', crud.data, $t('RawFoil.table.status'), 5)"
:formatter="formatStatusName"
/>
<el-table-column
prop="container_name"
:label="$t('RawFoil.table.container_name')"
:min-width="flexWidth('container_name',crud.data,$t('RawFoil.table.container_name'))"
/>
<el-table-column
prop="point_code2"
:label="$t('RawFoil.table.point_code2')"
:min-width="flexWidth('point_code2',crud.data,$t('RawFoil.table.point_code2'))"
/>
<el-table-column
prop="resource_name"
:label="$t('RawFoil.table.resource_name')"
:min-width="flexWidth('resource_name',crud.data,$t('RawFoil.table.resource_name'))"
/>
<el-table-column
prop="product_name"
:label="$t('RawFoil.table.product_name')"
:min-width="flexWidth('product_name',crud.data,$t('RawFoil.table.product_name'))"
/>
<el-table-column
prop="theory_height"
:label="$t('RawFoil.table.theory_height')"
:min-width="flexWidth('theory_height',crud.data,$t('RawFoil.table.theory_height'))"
/>
<el-table-column
prop="realstart_time"
:label="$t('RawFoil.table.realstart_time')"
:min-width="flexWidth('realstart_time',crud.data,$t('RawFoil.table.realstart_time'))"
/>
<el-table-column
prop="realend_time"
:label="$t('RawFoil.table.realend_time')"
:min-width="flexWidth('realend_time',crud.data,$t('RawFoil.table.realend_time'))"
/>
<el-table-column
prop="productin_qty"
:label="$t('RawFoil.table.productin_qty')"
:min-width="flexWidth('productin_qty',crud.data,$t('RawFoil.table.productin_qty'))"
:formatter="crud.formatNum3"
/>
<el-table-column
prop="agvno"
:label="$t('RawFoil.table.agvno')"
:min-width="flexWidth('agvno',crud.data,$t('RawFoil.table.agvno'))"
/>
<el-table-column
prop="product_area"
:label="$t('RawFoil.table.product_area')"
:min-width="flexWidth('product_area',crud.data,$t('RawFoil.table.product_area'))"
/>
<el-table-column
prop="is_baking"
:label="$t('RawFoil.table.is_baking')"
:min-width="flexWidth('is_baking',crud.data,$t('RawFoil.table.is_baking'))"
:formatter="formatBakeIsOrNot"
/>
<el-table-column
prop="is_instor"
:label="$t('RawFoil.table.is_instor')"
:min-width="flexWidth('is_instor',crud.data,$t('RawFoil.table.is_instor'))"
:formatter="formatStorIsOrNot"
/>
<el-table-column
prop="update_time"
:label="$t('RawFoil.table.update_time')"
:min-width="flexWidth('update_time',crud.data,$t('RawFoil.table.update_time'))"
/>
<el-table-column v-permission="[]" :label="$t('common.Operate')" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -261,6 +324,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import i18n from "@/i18n";
const defaultForm = {
workorder_id: null,
@@ -295,7 +359,7 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
title: '生箔工序工单',
title: i18n.t('RawFoil.title'),
url: 'api/rawfoilworkorder',
idField: 'workorder_id',
sort: 'workorder_id,desc',
@@ -316,32 +380,51 @@ export default {
permission: {},
rules: {
container_name: [
{ required: true, message: '母卷号不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m2'), trigger: 'blur' }
],
resource_name: [
{ required: true, message: '机台编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m3'), trigger: 'blur' }
],
mfg_order_name: [
{ required: true, message: '生产工单不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m4'), trigger: 'blur' }
],
product_name: [
{ required: true, message: '产品编码不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m5'), trigger: 'blur' }
],
description: [
{ required: true, message: '产品名称不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m6'), trigger: 'blur' }
],
theory_height: [
{ required: true, message: '理论长度不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m7'), trigger: 'blur' }
],
eqp_velocity: [
{ required: true, message: '设备生产速度不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m8'), trigger: 'blur' }
],
p_coiler_date: [
{ required: true, message: '上卷开始时间不能为空', trigger: 'blur' }
{ required: true, message: i18n.t('RawFoil.msg.m9'), trigger: 'blur' }
]
}
}
},
computed: {
computedLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'in') {
return `900px`
}
return `800px`
},
computedFormLabelWidth() {
const item = localStorage.getItem('lang')
if (item === 'zh') {
return `110px`
}
if (item === 'in') {
return `170px`
}
return `130px`
}
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
@@ -363,11 +446,11 @@ export default {
const _selectData = this.$refs.table.selection
const data = _selectData[0]
if (data.status === '09') {
return this.crud.notify('不能对完成状态的工单强制结束', CRUD.NOTIFICATION_TYPE.INFO)
return this.crud.notify(i18n.t('RawFoil.msg.m1'), CRUD.NOTIFICATION_TYPE.INFO)
}
crudRawfoilworkorder.compelEnd(data).then(res => {
this.crud.toQuery()
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.notify(i18n.t('common.Operation_success'), CRUD.NOTIFICATION_TYPE.SUCCESS)
})
},
weigh() {