This commit is contained in:
张江玮
2023-02-22 17:30:28 +08:00
parent 9b95d60d87
commit 1451500dbf
43 changed files with 2086 additions and 253 deletions

View File

@@ -117,6 +117,7 @@
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
v-if="false"
slot="right"
class="filter-item"
type="info"
@@ -178,13 +179,14 @@
/>
</el-select>
</el-form-item>
<el-form-item label="当前存放物料类型" prop="current_material_type">
<el-form-item label="当前存放物料" prop="current_material_type">
<el-select
v-model="form.current_material_type"
size="mini"
placeholder="当前存放物料类型"
placeholder="当前存放物料"
class="filter-item"
style="width: 370px;"
clearable
>
<el-option
v-for="item in dict.current_material_type"
@@ -197,7 +199,9 @@
<el-form-item label="限定物料类型" prop="material_type">
<el-select
v-model="form.material_type"
size="mini"
multiple
filterable
size="medium"
placeholder="限定物料类型"
class="filter-item"
style="width: 370px;"
@@ -242,6 +246,7 @@
v-model="form.prev_region_id"
placeholder="请选择"
style="width: 370px;"
clearable
>
<el-option
v-for="item in reginoList"
@@ -256,6 +261,7 @@
v-model="form.next_region_id"
placeholder="请选择"
style="width: 370px;"
clearable
>
<el-option
v-for="item in reginoList"
@@ -289,16 +295,6 @@
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" sortable width="90" />
<el-table-column prop="point_name" label="点位名称" width="200" />
<el-table-column v-if="false" prop="point_type_name" label="点位类型" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<el-table-column prop="current_material_type_name" label="当前存放物料类型" width="120" />
<el-table-column prop="material_type_name" label="限定物料类型" width="120" />
<el-table-column prop="col" label="排号" width="60" />
<el-table-column prop="region_name" label="所属区域" width="190" />
<el-table-column prop="prev_region_name" label="叫料区域" width="190" />
<el-table-column prop="next_region_name" label="送料区域" width="190" />
<el-table-column prop="seq" label="出入库顺序" width="90" />
<el-table-column label="是否启用" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -309,8 +305,18 @@
/>
</template>
</el-table-column>
<el-table-column prop="taskdtl_type" label="锁定任务类型" width="110" :formatter="taskdtl_typeFormat" />
<el-table-column prop="task_code" label="锁定任务编码" width="100" />
<el-table-column v-if="false" prop="point_type_name" label="点位类型" />
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<el-table-column prop="current_material_type_name" label="存放物料" width="120" />
<el-table-column v-if="false" prop="material_type_name" label="限定物料类型" width="120" />
<el-table-column prop="col" label="排号" width="60" />
<el-table-column prop="region_name" label="所属区域" width="190" />
<el-table-column prop="prev_region_name" label="叫料区域" width="190" />
<el-table-column prop="next_region_name" label="送料区域" width="190" />
<el-table-column prop="seq" label="出入库顺序" width="90" />
<el-table-column v-if="false" prop="taskdtl_type" label="锁定任务类型" width="110" :formatter="taskdtl_typeFormat" />
<el-table-column v-if="false" prop="task_code" label="锁定任务编码" width="100" />
<el-table-column prop="update_optname" label="修改者" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column
@@ -343,7 +349,7 @@ import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
// import checkoutbill from '@/api/wms/st/core/outbill/checkoutbill'
const defaultForm = { device_point_type: null, point_id: null, is_host: null, point_code: null, point_name: null, area_type: null, point_type: '00', point_status: '00', lock_type: '00', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, material_type: '14', region_id: null, prev_region_id: null, next_region_id: null, seq: 0, current_material_type: '14', col: 0 }
const defaultForm = { device_point_type: null, point_id: null, is_host: null, point_code: null, point_name: null, area_type: null, point_type: '00', point_status: '00', lock_type: '00', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, material_type: [], region_id: null, prev_region_id: null, next_region_id: null, seq: 0, current_material_type: null, col: 1 }
export default {
name: 'Point',
dicts: ['sch_point_type', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'storagevehicle_type', 'IS_HOST', 'device_point_type', 'material_type', 'current_material_type'],
@@ -356,7 +362,7 @@ export default {
idField: 'point_id',
optShow: {
add: true,
edit: true,
edit: false,
del: true,
download: false,
reset: true
@@ -395,15 +401,12 @@ export default {
material_type: [
{ required: true, message: '物料类型不能为空', trigger: 'blur' }
],
current_material_type: [
{ required: true, message: '当前存放物料类型不能为空', trigger: 'blur' }
],
col: [
{ required: true, message: '排号不能为空', trigger: 'blur' }
],
lock_type: [
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
]
// lock_type: [
// { required: true, message: '锁定类型不能为空', trigger: 'blur' }
// ]
}
}