This commit is contained in:
葛林强 2024-06-11 12:47:28 +08:00
parent 682b9e5ae0
commit 0edf54ed13
5 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,24 @@
// 电子标签任务类型
export const elTagTaskTypeEnum = {
pick: {
value: 1,
label: '拣选任务',
color: 'primary'
},
stock: {
value: 2,
label: '存储任务',
color: 'warning'
}
}
export function formatterElTagTaskTypeEnum(value) {
switch (parseInt(value)){
case elTagTaskTypeEnum.pick.value:
return {label: elTagTaskTypeEnum.pick.label, color: elTagTaskTypeEnum.pick.color};
case elTagTaskTypeEnum.stock.value:
return {label: elTagTaskTypeEnum.stock.label, color: elTagTaskTypeEnum.stock.color};
default:
return {label: `未知类型:${value}`, color: 'danger'};
}
}

View File

@ -6,6 +6,12 @@
<el-table-column fixed prop="taskId" label="任务号" width="230px" align="center" show-overflow-tooltip/> <el-table-column fixed prop="taskId" label="任务号" width="230px" align="center" show-overflow-tooltip/>
<el-table-column fixed prop="taskGroup" label="任务组" width="120px" align="center" show-overflow-tooltip/> <el-table-column fixed prop="taskGroup" label="任务组" width="120px" align="center" show-overflow-tooltip/>
<el-table-column prop="location" label="点位" width="120px" align="center" show-overflow-tooltip/> <el-table-column prop="location" label="点位" width="120px" align="center" show-overflow-tooltip/>
<el-table-column prop="taskType" label="任务类型" width="140px" align="center">
<template #default="scope">
<el-tag class="ml-2" :type=formatterElTagTaskTypeEnum(scope.row.taskType).color>
{{formatterElTagTaskTypeEnum(scope.row.taskType).label }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="orderId" label="订单号" width="100px" align="center" show-overflow-tooltip/> <el-table-column prop="orderId" label="订单号" width="100px" align="center" show-overflow-tooltip/>
<el-table-column prop="vehicleNo" label="载具号" width="100px" align="center" show-overflow-tooltip/> <el-table-column prop="vehicleNo" label="载具号" width="100px" align="center" show-overflow-tooltip/>
<el-table-column prop="goodsId" label="物料编号" width="100px" align="center" show-overflow-tooltip/> <el-table-column prop="goodsId" label="物料编号" width="100px" align="center" show-overflow-tooltip/>
@ -63,6 +69,7 @@ import {Switch} from "@element-plus/icons-vue";
import formatterTime from "@/plugins/formatter/formatter.time"; import formatterTime from "@/plugins/formatter/formatter.time";
import {formatterElTagTaskStatusEnum} from "@/enum/elTag/eltag.task.enum"; import {formatterElTagTaskStatusEnum} from "@/enum/elTag/eltag.task.enum";
import EditElTagTask from "@/view/component/elTagTask/EditElTagTask.vue"; import EditElTagTask from "@/view/component/elTagTask/EditElTagTask.vue";
import {formatterElTagTaskTypeEnum} from "@/enum/elTag/eltag.task.type.enum";
export default { export default {
// import 使 // import 使
@ -86,6 +93,7 @@ export default {
watch: {}, watch: {},
// //
methods: { methods: {
formatterElTagTaskTypeEnum,
formatterElTagTaskStatusEnum, formatterElTagTaskStatusEnum,
// //
changeTaskStatus(row) { changeTaskStatus(row) {

View File

@ -5,6 +5,11 @@
<el-form-item label="查询关键字:"> <el-form-item label="查询关键字:">
<el-input placeholder="输入 点位/任务号/箱号/订单号 查询..." v-model="searchParams.searchStr" clearable></el-input> <el-input placeholder="输入 点位/任务号/箱号/订单号 查询..." v-model="searchParams.searchStr" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务类型:">
<el-select v-model="searchParams.elTagTaskType" multiple placeholder="请选择需要查询的任务类型">
<el-option v-for="item in elTagTaskTypeEnum" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</el-form-item>
<el-form-item label="任务状态:"> <el-form-item label="任务状态:">
<el-select v-model="searchParams.elTagTaskStatus" multiple placeholder="请选择需要查询的任务状态"> <el-select v-model="searchParams.elTagTaskStatus" multiple placeholder="请选择需要查询的任务状态">
<el-option v-for="item in elTagTaskStatusEnum" :key="item.value" :label="item.label" :value="item.value"/> <el-option v-for="item in elTagTaskStatusEnum" :key="item.value" :label="item.label" :value="item.value"/>
@ -38,6 +43,7 @@
// import from ' '; // import from ' ';
import {elTagTaskStatusEnum} from "@/enum/elTag/eltag.task.enum"; import {elTagTaskStatusEnum} from "@/enum/elTag/eltag.task.enum";
import {elTagTaskTypeEnum} from "@/enum/elTag/eltag.task.type.enum";
import {ElLoading, ElMessage} from "element-plus"; import {ElLoading, ElMessage} from "element-plus";
import elTagApi from "@/axios/el.tag" import elTagApi from "@/axios/el.tag"
import AddElTagTask from "@/view/component/elTagTask/AddElTagTask.vue"; import AddElTagTask from "@/view/component/elTagTask/AddElTagTask.vue";
@ -57,6 +63,9 @@ export default {
computed: { computed: {
elTagTaskStatusEnum() { elTagTaskStatusEnum() {
return elTagTaskStatusEnum return elTagTaskStatusEnum
},
elTagTaskTypeEnum() {
return elTagTaskTypeEnum
} }
}, },
// data // data

View File

@ -63,7 +63,7 @@ export default {
h('div', null, '(。•́︿•̀。) ') h('div', null, '(。•́︿•̀。) ')
]), ]),
'页面维护', { '页面维护', {
confirmButtonText: '我知道啦', confirmButtonText: '摸摸头',
callback: (action) => {} callback: (action) => {}
}) })
return return

View File

@ -26,6 +26,7 @@ export default {
// //
searchParams: { searchParams: {
searchStr: '', searchStr: '',
elTagTaskType: [1,2],
elTagTaskStatus: [0,1,2,9], elTagTaskStatus: [0,1,2,9],
timeRange: [], timeRange: [],
page: { page: {