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

更新

Browse Source
This commit is contained in:
gengby
2023-03-10 17:58:22 +08:00
parent 2be2b3f853
commit 4a46029a35
11 changed files with 129 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
View File

@@ -23,16 +23,16 @@
@keyup.enter.native="crud.toQuery"
/>
<el-select
v-model="query.material_type"
v-model="query.instruction_type"
clearable
filterable
size="small"
placeholder="物料类型"
placeholder="指令类型"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-select
v-model="query.status"
@@ -96,7 +96,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="instruction_id" label="指令标识" />
<el-table-column prop="instruction_code" label="指令编号" />
<el-table-column prop="instruction_code" label="指令编号" width="200" />
<el-table-column prop="task_code" label="任务号" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="instruction_type" label="指令类型" width="120">
@@ -113,7 +113,18 @@
<el-table-column prop="next_point_code" label="终点" />
<el-table-column prop="start_point_code2" label="起点2" />
<el-table-column prop="next_point_code2" label="终点2" />
<el-table-column prop="matarial" label="物料" />
<el-table-column prop="car_no" label="车号" />
<el-table-column prop="agv_system_type" label="AGV系统类型">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
</template>
</el-table-column>
<el-table-column prop="agv_inst_type" label="AGV指令类型">
<!-- <template slot-scope="scope">-->
<!-- {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="weight" label="重量" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="描述" />
<el-table-column prop="create_by" label="创建者" />
@@ -171,7 +182,7 @@ const defaultForm = {
update_time: null
}
export default {
dicts: ['task_status', 'task_type'],
dicts: ['task_status', 'task_type', 'instruction_type', 'agv_system_type'],
name: 'Instruction',
components: { pagination, crudOperation, Search },
mixins: [presenter(), header(), form(defaultForm), crud()],
@@ -184,6 +195,11 @@ export default {
query: { is_over: '1' },
crudMethod: { ...crudInstruction },
optShow: {
add: false,
edit: false,
del: false,
reset: false,
download: true
}
})
},

33
acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -34,16 +34,16 @@
@keyup.enter.native="crud.toQuery"
/>
<el-select
v-model="query.material_type"
v-model="query.task_type"
clearable
filterable
size="small"
placeholder="物料类型"
placeholder="任务类型"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-select
v-model="query.status"
@@ -230,7 +230,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号" />
<el-table-column prop="task_code" label="任务号" width="200" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="task_type" label="任务类型" width="120">
<template slot-scope="scope">
@@ -247,7 +247,20 @@
<el-table-column prop="next_point_code" label="终点" />
<el-table-column prop="start_point_code2" label="起点2" />
<el-table-column prop="start_point_code2" label="终点2" />
<el-table-column prop="matarial" label="物料" />
<el-table-column prop="car_no" label="车号" />
<el-table-column prop="agv_system_type" label="AGV系统类型">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
</template>
</el-table-column>
<el-table-column prop="storage_task_type" label="立库任务类型">
<template slot-scope="scope">
{{ dict.label.storage_task_type[scope.row.storage_task_type] }}
</template>
</el-table-column>
<el-table-column prop="weight" label="重量" />
<el-table-column prop="temperature" label="温度" />
<el-table-column prop="oven_time" label="烘箱时间" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
@@ -292,7 +305,7 @@ const defaultForm = {
export default {
name: 'Task',
components: { pagination, crudOperation, Search },
dicts: ['task_status', 'task_type'],
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -302,7 +315,13 @@ export default {
sort: 'task_id,desc',
query: { is_over: '1' },
crudMethod: { ...crudTask },
optShow: {}
optShow: {
add: false,
edit: false,
del: false,
reset: false,
download: true
}
})
},
data() {

29
acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
View File

@@ -34,16 +34,16 @@
@keyup.enter.native="crud.toQuery"
/>
<el-select
v-model="query.material_type"
v-model="query.task_type"
clearable
filterable
size="small"
placeholder="物料类型"
placeholder="任务类型"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-select
v-model="query.status"
@@ -87,7 +87,7 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号(指令编号)" />
<el-table-column prop="task_code" label="任务号(指令编号)" width="200" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="task_type" label="任务类型" width="120">
<template slot-scope="scope">
@@ -104,7 +104,24 @@
<el-table-column prop="next_point_code" label="终点" />
<el-table-column prop="start_point_code2" label="起点2" />
<el-table-column prop="next_point_code2" label="终点2" />
<el-table-column prop="matarial" label="物料" />
<el-table-column prop="car_no" label="车号" />
<el-table-column prop="agv_system_type" label="AGV系统类型">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
</template>
</el-table-column>
<el-table-column prop="agv_inst_type" label="AGV指令类型">
<!-- <template slot-scope="scope">-->
<!-- {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="storage_task_type" label="立库任务类型">
<template slot-scope="scope">
{{ dict.label.storage_task_type[scope.row.storage_task_type] }}
</template>
</el-table-column>
<el-table-column prop="weight" label="重量" />
<el-table-column prop="temperature" label="温度" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
@@ -141,7 +158,7 @@ const defaultForm = {
export default {
name: 'Task',
components: { pagination, crudOperation, Search },
dicts: ['task_status', 'task_type'],
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '任务', url: 'api/task/getAll', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask }, optShow: {

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

@@ -22,18 +22,6 @@
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-select
v-model="query.material_type"
clearable
filterable
size="small"
placeholder="物料类型"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-select
v-model="query.status"
clearable
@@ -344,13 +332,13 @@
<el-table-column prop="start_point_code2" label="取货点2" width="120px" />
<el-table-column prop="next_point_code2" label="放货点2" width="120px" />
<el-table-column prop="put_point_code" label="中转点" width="100px" />
<!-- <el-table-column prop="agv_task_type" label="AGV任务类型" width="120px" />-->
<!-- <el-table-column prop="agv_task_type" label="AGV任务类型" width="120px" />-->
<el-table-column prop="agv_system_type" label="AGV系统类型" width="120px">
<template slot-scope="scope">
{{ dict.label.agv_system_type[scope.row.agv_system_type] }}
</template>
</el-table-column>
<el-table-column prop="storage_task_type" label="立库任务类型" width="120px" >
<el-table-column prop="storage_task_type" label="立库任务类型" width="120px">
<template slot-scope="scope">
{{ dict.label.storage_task_type[scope.row.storage_task_type] }}
</template>