项目完善

This commit is contained in:
张江玮
2022-10-22 15:23:07 +08:00
parent 9875df80db
commit 971b20e955
19 changed files with 1002 additions and 83 deletions

View File

@@ -30,6 +30,7 @@
>
<el-option
v-for="item in dict.sch_point_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
@@ -48,6 +49,7 @@
>
<el-option
v-for="item in reginoList"
:key="item.id"
:label="item.region_name"
:value="item.region_id"
/>
@@ -66,6 +68,7 @@
>
<el-option
v-for="item in dict.sch_point_status"
:key="item.id"
:label="item.label"
:value="item.value"
/>
@@ -83,6 +86,7 @@
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
@@ -100,6 +104,7 @@
>
<el-option
v-for="item in dict.is_used"
:key="item.id"
:label="item.label"
:value="item.value"
/>
@@ -132,14 +137,14 @@
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
<el-form-item v-if="false" label="点位标识" prop="point_id" >
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" />
<el-input v-model="form.point_code" style="width: 370px;" :disabled="form.point_type==='01'" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-input v-model="form.point_name" style="width: 370px;" :disabled="this.form.point_type==='01'" />
<el-input v-model="form.point_name" style="width: 370px;" :disabled="form.point_type==='01'" />
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
@@ -151,6 +156,7 @@
>
<el-option
v-for="item in dict.sch_point_status"
:key="item.id"
:label="item.label"
:value="item.value"
/>
@@ -166,6 +172,7 @@
>
<el-option
v-for="item in dict.d_lock_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
@@ -181,6 +188,7 @@
>
<el-option
v-for="item in dict.current_material_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
@@ -196,18 +204,20 @@
>
<el-option
v-for="item in dict.material_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="" prop="col">
<el-form-item label="排号" prop="col">
<el-input v-model="form.col" style="width: 370px;" type="number" />
</el-form-item>
<el-form-item v-if="false" label="点位类型" prop="point_type">
<el-radio-group v-model="form.point_type">
<el-radio
v-for="item in dict.sch_point_type"
:key="item.id"
:label="item.value"
>{{ item.label }}
</el-radio>
@@ -221,6 +231,7 @@
>
<el-option
v-for="item in reginoList"
:key="item.id"
:label="item.region_name"
:value="item.region_id"
/>
@@ -234,6 +245,7 @@
>
<el-option
v-for="item in reginoList"
:key="item.id"
:label="item.region_name"
:value="item.region_id"
/>
@@ -247,6 +259,7 @@
>
<el-option
v-for="item in reginoList"
:key="item.id"
:label="item.region_name"
:value="item.region_id"
/>
@@ -281,7 +294,7 @@
<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="40" />
<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" />
@@ -386,7 +399,7 @@ export default {
{ required: true, message: '当前存放物料类型不能为空', trigger: 'blur' }
],
col: [
{ required: true, message: '不能为空', trigger: 'blur' }
{ required: true, message: '排号不能为空', trigger: 'blur' }
]
// lock_type: [
// { required: true, message: '锁定类型不能为空', trigger: 'blur' }

View File

@@ -56,7 +56,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务明细">
<el-form-item v-if="false" label="任务明细">
<el-select
filterable
v-model="query.taskdtl_type"
@@ -143,7 +143,7 @@
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" />
<el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
<el-table-column prop="taskdtl_type_name" label="任务明细" />
<el-table-column v-if="false" prop="taskdtl_type_name" label="任务明细" />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<!--
@@ -154,9 +154,9 @@
<el-table-column prop="start_point_code" label="起点编码" width="85" />
<el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip/>
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
<el-table-column prop="next_point_code" label="下一点编码" width="85" />
<el-table-column prop="next_point_code" label="下一点编码" width="90" />
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip/>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column v-if="false" prop="material_code" label="物料编码" />
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="update_by" label="修改者" />
<el-table-column prop="create_time" label="创建时间" width="135" />