add: mes对接、日志优化

This commit is contained in:
2023-09-11 21:20:42 +08:00
parent 673f4dbbb5
commit 540efe8478
79 changed files with 1497 additions and 561 deletions

View File

@@ -107,7 +107,6 @@
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
</el-option>
</el-select>
<!-- <el-input v-model="form.point_code" style="width: 240px;" />-->
</el-form-item>
<el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 240px;" disabled/>
@@ -192,6 +191,39 @@
<!--<el-form-item label="是否首个流程任务">
<el-input v-model="form.is_first_flow_task" style="width: 240px;" />
</el-form-item>-->
<el-form-item label="绑定状态">
<el-select
v-model="form.group_bind_material_status"
size="mini"
placeholder="绑定状态"
class="filter-item"
style="width: 240px;"
clearable
>
<el-option
v-for="item in dict.group_bind_material_status"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="载具类型">
<el-select
v-model="form.vehicle_type"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 240px;"
@change="hand"
>
<el-option
v-for="item in dict.vehicle_type"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="流程编码">
<el-input v-model="form.flow_code" style="width: 240px;" />
</el-form-item>
@@ -296,6 +328,7 @@ import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
const defaultForm = {
group_id: null,
vehicle_code: null,
vehicle_type: null,
material_id: null,
child_vehicle_code: null,
source_vehicle_code: null,
@@ -330,7 +363,7 @@ const defaultForm = {
}
export default {
name: 'VehicleMaterialGroup',
dicts: ['group_status', 'group_bind_material_status'],
dicts: ['group_status', 'group_bind_material_status', 'vehicle_type'],
components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -403,6 +436,7 @@ export default {
this.form.material_id = row.material_id
this.form.material_spec = row.material_spec
this.form.material_code = row.material_code
this.form.redundance_material_code = row.raw_material_code
if (this.choose === '工单') {
this.form.workorder_code = row.workorder_code
}
@@ -412,6 +446,7 @@ export default {
this.form.material_id = null
this.form.material_spec = null
this.form.material_code = null
this.form.redundance_material_code = null
},
setPointName(data) {
var point = this.pointList.find(item => item.point_code === data)