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

工序维护、工单管理、区域管理、点位管理、任务管理等bug修复与添加生产区域判断

Browse Source
This commit is contained in:
liyongde
2023-03-21 19:26:13 +08:00
parent ca0b9a858d
commit e181a4a6e7
18 changed files with 220 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mes/qd/src/views/wms/sch/task/index.vue
View File

@@ -10,6 +10,23 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
placeholder="区域类型"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务号">
<label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
<el-input
@@ -117,13 +134,13 @@
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.acs_task_type[scope.row.acs_task_type] }}
{{ dict.label.SCH_TASK_TYPE_DTL[scope.row.acs_task_type] }}
</template>
</el-table-column>
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip >
<el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.task_finished_type[scope.row.finished_type] }}
</template>
@@ -132,7 +149,7 @@
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
<el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
@@ -141,8 +158,8 @@
<el-table-column prop="point1_region_name" label="起点区域" width="120" />
<el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
<el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
<!-- <el-table-column prop="point_code3" label="等待点" min-width="100" show-overflow-tooltip />-->
<!-- <el-table-column prop="point3_region_name" label="等待点区域" min-width="120" show-overflow-tooltip />-->
<!-- <el-table-column prop="point_code3" label="等待点" min-width="100" show-overflow-tooltip />-->
<!-- <el-table-column prop="point3_region_name" label="等待点区域" min-width="120" show-overflow-tooltip />-->
<el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
<el-table-column prop="point3_region_name" label="点位3区域" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_code4" label="点位4" min-width="100" show-overflow-tooltip />
@@ -214,7 +231,7 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
export default {
name: 'Task',
dicts: ['acs_task_type', 'vehicle_type', 'task_finished_type'],
dicts: ['SCH_TASK_TYPE_DTL', 'vehicle_type', 'task_finished_type', 'product_area'],
components: {
pagination, crudOperation, rrOperation, Treeselect, udOperation
},
@@ -233,6 +250,7 @@ export default {
next_point_code: '',
task_type: '',
finished_type: '',
product_area: 'A1',
task_status: ''
},
optShow: {