opt:更新pc点位查询,叠盘任务增加相同点位限制

This commit is contained in:
zds
2024-09-14 18:04:06 +08:00
parent 816f08809c
commit fc418ce8d6
13 changed files with 115 additions and 103 deletions

View File

@@ -93,8 +93,7 @@ export default {
url: 'api/schBasePoint',
optShow: {},
query: {
is_used: true,
parent_point: true
is_used: true
}
})
},

View File

@@ -60,22 +60,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位类型">
<el-select
v-model="query.point_type"
clearable
size="mini"
placeholder="点位类型"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in pointTypesList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="母托盘编码">
<el-input
v-model="query.vehicle_code"
@@ -181,22 +165,6 @@
<el-form-item label="点位名称" prop="point_name" disabled >
<el-input v-model="form.point_name" style="width: 370px;" />
</el-form-item>
<el-form-item v-if="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
size="mini"
placeholder="点位状态"
class="filter-item"
style="width: 370px;"
clearable
>
<el-option
v-for="item in pointStatusDialogList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
<el-select
v-model="form.point_type"
@@ -258,11 +226,11 @@
{{ scope.row.ing_task_code?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
<el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
<el-table-column prop="ing_task_code" label="当前任务编码" :min-width="flexWidth('ing_task_code',crud.data,'当前任务编码')" />
<el-table-column prop="row_num" label="" :min-width="flexWidth('row_num',crud.data,'排')" />
<el-table-column prop="col_num" label="" :min-width="flexWidth('col_num',crud.data,'列')" />
<el-table-column prop="layer_num" label="" :min-width="flexWidth('layer_num',crud.data,'层')" />
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
<el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
<template slot-scope="scope">
{{ scope.row.is_auto?'是':'否' }}
@@ -483,12 +451,6 @@ export default {
}
return false
},
showButton(point_status) {
if (point_status && point_status === '2') {
return true
}
return false
},
toView(row) {
if (row) {
this.$refs.viewDialog.setParentData(row)