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

add:深坑物料管理

Browse Source
This commit is contained in:
zhangzhiqiang
2023-06-02 11:47:13 +08:00
parent 432e5e020d
commit c2b304c318
26 changed files with 328 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/qd/src/views/wms/scheduler_manage/region/index.vue
View File

@@ -70,9 +70,9 @@
<el-form-item label="区域名称" prop="region_name">
<el-input v-model="form.region_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="是否合并任务" prop="merge">
<el-form-item label="是否合并任务" prop="is_merge">
<el-select
v-model="form.merge"
v-model="form.is_merge"
placeholder=""
style="width: 370px"
>
@@ -111,9 +111,9 @@
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="product_area" label="生产车间" :min-width="flexWidth('product_area',crud.data,'生产车间')" />
<el-table-column prop="merge" label="是否合并任务" :min-width="flexWidth('merge',crud.data,'是否合并任务')">
<el-table-column prop="is_merge" label="是否合并任务" :min-width="flexWidth('is_merge',crud.data,'是否合并任务')">
<template slot-scope="scope">
{{ scope.row.merge ? '是' : '否' }}
{{ dict.label.IS_OR_NOT[scope.row.is_merge] }}
</template>
</el-table-column>
<el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
@@ -150,7 +150,7 @@ const defaultForm = {
product_area: 'A1',
point_type_explain: null,
point_status_explain: null,
merge: '1',
is_merge: '1',
remark: null,
create_id: null,
create_name: null,

44
mes/qd/src/views/wms/scheduler_manage/task/index.vue
View File

@@ -56,15 +56,6 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!-- <el-form-item label="任务类型">-->
<!-- <treeselect-->
<!-- v-model="query.task_type"-->
<!-- :load-options="loadChildNodes"-->
<!-- :options="classes1"-->
<!-- style="width: 180px"-->
<!-- placeholder="请选择"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="任务类型">
<el-select
v-model="query.task_type"
@@ -116,7 +107,7 @@
<el-form-item label="任务状态">
<el-select
v-model="query.task_status"
v-model="task_status"
multiple
style="width: 400px"
placeholder="任务状态"
@@ -124,6 +115,10 @@
clearable
@change="handTaskStatus"
>
<el-option
label="调度中任务"
value="-1"
/>
<el-option
v-for="item in taskStatusList"
:key="item.code"
@@ -137,7 +132,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<el-button type="primary" @click="taskScheduler()" >任务调度</el-button>
<el-button type="primary" @click="taskScheduler()">任务调度</el-button>
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-table
@@ -152,16 +147,11 @@
<el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
<el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
<el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
<el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ acsTaskTypeList[scope.row.acs_task_type - 1] }}
</template>
</el-table-column>
<el-table-column prop = "acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip :formatter = "acsTypeName"></el-table-column>
<el-table-column prop="task_name" label="任务类型" min-width="120" show-overflow-tooltip />
<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="120px" :formatter="formatTaskStatusName" />
<el-table-column prop="point_code1" label="起点" width="100" />
<el-table-column prop="point1_region_name" label="起点区域" width="120" />
<el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
@@ -242,7 +232,7 @@ import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import {scheduler} from "./task";
import { scheduler } from './task'
export default {
name: 'Task',
@@ -266,7 +256,7 @@ export default {
task_type: '',
finished_type: '',
product_area: 'A1',
task_status: ''
task_status: '-1'
},
optShow: {
add: false,
@@ -284,6 +274,7 @@ export default {
currentComponent: '',
openParam: {},
create_time: [],
task_status: ['-1'],
taskStatusList: [],
taskTypeList: [],
acsTaskTypeList: [],
@@ -309,7 +300,7 @@ export default {
crudTask.getAcsTaskType().then(res => {
this.acsTaskTypeList = res
})
// this.crud.query.task_status = ['-1']
this.crud.query.task_status = ['-1']
// this.crud.toQuery()
},
methods: {
@@ -359,12 +350,17 @@ export default {
this.crud.toQuery()
},
handTaskStatus(value) {
this.crud.query.more_task_status = null
if (value) {
this.crud.query.more_task_status = value.toString()
}
this.crud.query.task_status = value.toString()
this.crud.toQuery()
},
acsTypeName(row, column) {
for (const item of this.acsTaskTypeList) {
if (Number(item.value) === Number(row.acs_task_type)) {
return item.label
}
}
return ''
},
formatTaskStatusName(row, column) {
for (const item of this.taskStatusList) {
if (item.value === row.task_status) {