xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change(mes): 更新生产投入扫描信息功能

Browse Source 
- 修改表格列名称和字段，增加投料工位相关功能
- 更新查询条件，增加投料工位筛选
- 调整表单布局和字段名称
- 修改类型定义
master
zch 1 month ago
parent 2d331d1dec
commit c09237fd85
2 changed files with 164 additions and 54 deletions
Show Stats Download Patch File Download Diff File

100
src/api/mes/prodInputScanInfo/types.ts
Unescape Escape View File

@ -15,14 +15,14 @@ export interface ProdInputScanInfoVO {
machineId: string | number;
/**
* 硫化条码
* 投入条码（密炼、半制品、成型）
*/
vulcanizedBarcode: string;
inputBarcode: string;
/**
* 胎胚条码
* 生产条码（半制品、成型、硫化）
*/
embryoBarcode: string;
productionBarcode: string;
/**
* 生产工具
@ -34,6 +34,11 @@ export interface ProdInputScanInfoVO {
*/
materielId: string | number;
/**
* 投料工位ID
*/
stationId: string | number;
/**
* 扫描结果
*/
@ -49,6 +54,26 @@ export interface ProdInputScanInfoVO {
*/
remark: string;
/**
* 工序名称
*/
processName: string;
/**
* 机台名称
*/
machineName: string;
/**
* 物料名称
*/
materielName: string;
/**
* 投料工位名称
*/
stationName: string;
}
export interface ProdInputScanInfoForm extends BaseEntity {
@ -68,14 +93,14 @@ export interface ProdInputScanInfoForm extends BaseEntity {
machineId?: string | number;
/**
* 硫化条码
* 投入条码（密炼、半制品、成型）
*/
vulcanizedBarcode?: string;
inputBarcode?: string;
/**
* 胎胚条码
* 生产条码（半制品、成型、硫化）
*/
embryoBarcode?: string;
productionBarcode?: string;
/**
* 生产工具
@ -87,6 +112,11 @@ export interface ProdInputScanInfoForm extends BaseEntity {
*/
materielId?: string | number;
/**
* 投料工位ID
*/
stationId?: string | number;
/**
* 扫描结果
*/
@ -102,6 +132,26 @@ export interface ProdInputScanInfoForm extends BaseEntity {
*/
remark?: string;
/**
* 工序名称
*/
processName: string;
/**
* 机台名称
*/
machineName: string;
/**
* 物料名称
*/
materielName: string;
/**
* 投料工位名称
*/
stationName: string;
}
export interface ProdInputScanInfoQuery extends PageQuery {
@ -122,14 +172,14 @@ export interface ProdInputScanInfoQuery extends PageQuery {
machineId?: string | number;
/**
* 硫化条码
* 投入条码（密炼、半制品、成型）
*/
vulcanizedBarcode?: string;
inputBarcode?: string;
/**
* 胎胚条码
* 生产条码（半制品、成型、硫化）
*/
embryoBarcode?: string;
productionBarcode?: string;
/**
* 生产工具
@ -141,6 +191,11 @@ export interface ProdInputScanInfoQuery extends PageQuery {
*/
materielId?: string | number;
/**
* 投料工位ID
*/
stationId?: string | number;
/**
* 扫描结果
*/
@ -155,6 +210,27 @@ export interface ProdInputScanInfoQuery extends PageQuery {
* 日期范围参数
*/
params?: any;
/**
* 工序名称
*/
processName: string;
/**
* 机台名称
*/
machineName: string;
/**
* 物料名称
*/
materielName: string;
/**
* 投料工位名称
*/
stationName: string;
}

118
src/views/mes/prodInputScanInfo/index.vue
Unescape Escape View File

@ -4,33 +4,36 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<!-- <el-form-item label="主键标识" prop="prodInputScanInfoId">
<!-- <el-form-item label="主键标识" prop="prodInputScanInfoId">
<el-input v-model="queryParams.prodInputScanInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工序ID" prop="processId">
<el-form-item label="工序" prop="processId">
<el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="机台ID" prop="machineId">
<el-form-item label="机台" prop="machineId">
<el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
<el-form-item label="硫化条码" prop="vulcanizedBarcode">
<el-input v-model="queryParams.vulcanizedBarcode" placeholder="请输入硫化条码" clearable @keyup.enter="handleQuery" />
<el-form-item label="投入条码" prop="inputBarcode">
<el-input v-model="queryParams.inputBarcode" placeholder="请输入投入条码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="胎胚条码" prop="embryoBarcode">
<el-input v-model="queryParams.embryoBarcode" placeholder="请输入胎胚条码" clearable @keyup.enter="handleQuery" />
<el-form-item label="生产条码" prop="productionBarcode">
<el-input v-model="queryParams.productionBarcode" placeholder="请输入生产条码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="生产工具" prop="toolId">
<!-- <el-form-item label="生产工具" prop="toolId">
<el-input v-model="queryParams.toolId" placeholder="请输入生产工具" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料ID" prop="materielId">
<el-form-item label="物料" prop="materielId">
<el-input v-model="queryParams.materielId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="投料工位" prop="stationId">
<el-input v-model="queryParams.stationId" placeholder="请输入投料工位ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="扫描结果" prop="scanResult">
<el-input v-model="queryParams.scanResult" placeholder="请输入扫描结果" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form-item>-->
<el-form-item label="记录人名称" prop="userName">
<el-input v-model="queryParams.userName" placeholder="请输入记录人名称" clearable @keyup.enter="handleQuery" />
</el-form-item>-->
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@ -65,16 +68,17 @@
<el-table v-loading="loading" :data="prodInputScanInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="prodInputScanInfoId" v-if="columns[0].visible" />
<el-table-column label="工序ID" align="center" prop="processId" v-if="columns[2].visible" />
<el-table-column label="机台ID" align="center" prop="machineId" v-if="columns[3].visible" />
<el-table-column label="硫化条码" align="center" prop="vulcanizedBarcode" v-if="columns[4].visible" />
<el-table-column label="胎胚条码" align="center" prop="embryoBarcode" v-if="columns[5].visible" />
<el-table-column label="生产工具" align="center" prop="toolId" v-if="columns[6].visible" />
<el-table-column label="物料ID" align="center" prop="materielId" v-if="columns[7].visible" />
<el-table-column label="扫描结果" align="center" prop="scanResult" v-if="columns[8].visible" />
<el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[9].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible" />
<el-table-column label="主键标识" align="center" prop="prodInputScanInfoId" v-if="columns[0].visible"/>
<el-table-column label="工序" align="center" prop="processId" v-if="columns[2].visible"/>
<el-table-column label="机台" align="center" prop="machineId" v-if="columns[3].visible"/>
<el-table-column label="投入条码" align="center" prop="inputBarcode" v-if="columns[4].visible"/>
<el-table-column label="生产条码" align="center" prop="productionBarcode" v-if="columns[5].visible"/>
<el-table-column label="生产工具" align="center" prop="toolId" v-if="columns[6].visible"/>
<el-table-column label="物料" align="center" prop="materielId" v-if="columns[7].visible"/>
<el-table-column label="投料工位" align="center" prop="stationId" v-if="columns[8].visible"/>
<el-table-column label="扫描结果" align="center" prop="scanResult" v-if="columns[9].visible"/>
<el-table-column label="记录人名称" align="center" prop="userName" v-if="columns[10].visible"/>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[11].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -92,11 +96,11 @@
<!-- 添加或修改生产投入扫描信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="prodInputScanInfoFormRef" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="主键标识" prop="prodInputScanInfoId">
<el-form ref="prodInputScanInfoFormRef" :model="form" :rules="rules" label-width="80px">
<!-- <el-form-item label="主键标识" prop="prodInputScanInfoId">
<el-input v-model="form.prodInputScanInfoId" placeholder="请输入主键标识" />
</el-form-item>-->
<el-form-item label="工序" prop="processId">
<el-form-item label="工序ID" prop="processId">
<!-- <el-input v-model="form.processId" placeholder="请输入工序ID" />-->
<el-select v-model="form.processId" placeholder="请选择工序">
<el-option v-for="item in processOptions"
@ -114,11 +118,11 @@
:value="item.machineId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="硫化条码" prop="vulcanizedBarcode">
<el-input v-model="form.vulcanizedBarcode" placeholder="请输入硫化条码" />
<el-form-item label="投入条码" prop="inputBarcode">
<el-input v-model="form.inputBarcode" placeholder="请输入投入条码" />
</el-form-item>
<el-form-item label="胎胚条码" prop="embryoBarcode">
<el-input v-model="form.embryoBarcode" placeholder="请输入胎胚条码" />
<el-form-item label="生产条码" prop="productionBarcode">
<el-input v-model="form.productionBarcode" placeholder="请输入生产条码" />
</el-form-item>
<el-form-item label="生产工具" prop="toolId">
<el-input v-model="form.toolId" placeholder="请输入生产工具" />
@ -132,6 +136,15 @@
:value="item.materialId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="投料工位" prop="stationId">
<!-- <el-input v-model="form.stationId" placeholder="请输入投料工位ID" />-->
<el-select v-model="form.stationId" placeholder="请选择投料工位">
<el-option v-for="item in stationOptions"
:key="item.stationId"
:label="item.stationName"
:value="item.stationId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="扫描结果" prop="scanResult">
<el-input v-model="form.scanResult" placeholder="请输入扫描结果" />
</el-form-item>
@ -158,6 +171,8 @@ import { ProdInputScanInfoVO, ProdInputScanInfoQuery, ProdInputScanInfoForm } fr
import { getProcessInfoList } from "@/api/mes/baseProcessInfo";
import { getProdBaseMachineInfoList } from "@/api/mes/prodBaseMachineInfo";
import { getBaseMaterialInfoList } from "@/api/mes/baseMaterialInfo";
import {getStationInfoList} from "@/api/mes/baseStationInfo";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -184,31 +199,37 @@ const columns = ref<FieldOption[]>([
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `工序`, visible: true },
{ key: 3, label: `机台`, visible: true },
{ key: 4, label: `硫化条码`, visible: true },
{ key: 5, label: `胎胚条码`, visible: true },
{ key: 4, label: `投入条码`, visible: true },
{ key: 5, label: `生产条码`, visible: true },
{ key: 6, label: `生产工具`, visible: true },
{ key: 7, label: `物料`, visible: true },
{ key: 8, label: `扫描结果`, visible: true },
{ key: 9, label: `记录人名称`, visible: true },
{ key: 10, label: `备注`, visible: true },
{ key: 11, label: `创建部门`, visible: false },
{ key: 12, label: `记录人`, visible: false },
{ key: 13, label: `记录时间`, visible: false },
{ key: 14, label: `更新人`, visible: false },
{ key: 15, label: `更新时间`, visible: false },
{ key: 8, label: `投料工位`, visible: true },
{ key: 9, label: `扫描结果`, visible: true },
{ key: 10, label: `记录人名称`, visible: true },
{ key: 11, label: `备注`, visible: true },
{ key: 12, label: `创建部门`, visible: false },
{ key: 13, label: `记录人`, visible: false },
{ key: 14, label: `记录时间`, visible: false },
{ key: 15, label: `更新人`, visible: false },
{ key: 16, label: `更新时间`, visible: false },
]);
const initFormData: ProdInputScanInfoForm = {
prodInputScanInfoId: undefined,
processId: undefined,
machineId: undefined,
vulcanizedBarcode: undefined,
embryoBarcode: undefined,
inputBarcode: undefined,
productionBarcode: undefined,
toolId: undefined,
materielId: undefined,
stationId: undefined,
scanResult: undefined,
userName: undefined,
remark: undefined,
machineName: undefined,
processName: undefined,
materielName: undefined,
stationName: undefined,
}
const data = reactive<PageData<ProdInputScanInfoForm, ProdInputScanInfoQuery>>({
form: {...initFormData},
@ -218,12 +239,17 @@ const data = reactive<PageData<ProdInputScanInfoForm, ProdInputScanInfoQuery>>({
prodInputScanInfoId: undefined,
processId: undefined,
machineId: undefined,
vulcanizedBarcode: undefined,
embryoBarcode: undefined,
inputBarcode: undefined,
productionBarcode: undefined,
toolId: undefined,
materielId: undefined,
stationId: undefined,
scanResult: undefined,
userName: undefined,
machineName: undefined,
processName: undefined,
materielName: undefined,
stationName: undefined,
params: {
}
},
@ -344,11 +370,19 @@ const getMaterialSelect = async () => {
materialOptions.value = res.data;
}
//获取工位选项
let stationOptions = ref([])
const getStationSelect = async () => {
let res = await getStationInfoList(null);
stationOptions.value = res.data;
}
onMounted(() => {
getProcessSelect();
getMachineSelect();
getMaterialSelect();
getStationSelect();
getList();
});
</script>

Write Preview
Loading…
Cancel
Save