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

update mes工艺路线添加字段

Browse Source
master
yinq 3 weeks ago
parent 0ca92b846e
commit b698a07272
3 changed files with 357 additions and 17 deletions
Show Stats Download Patch File Download Diff File

141
src/api/mes/baseRoute/types.ts
Unescape Escape View File

@ -40,7 +40,7 @@ export interface BaseRouteVO {
routeDesc: string; routeDesc: string;
/** /**
* 激活标识(1是 0否) * 状态（1待审核 2审核通过 3审核不通过 4发布 5作废）
*/ */
activeFlag: string; activeFlag: string;
@ -81,6 +81,50 @@ export interface BaseRouteVO {
routeProcessVoList?: ProdBaseRouteProcess[]; routeProcessVoList?: ProdBaseRouteProcess[];
/**
* 工艺路线版本
*/
routeVersion: string;
/**
* 生产类型（1正式 2试制 3返修）
*/
productionType: string;
/**
* 路线类型（1生产 2装配）
*/
routeType: string;
/**
* 审核原因
*/
auditReason: string;
/**
* 审核人
*/
approveBy: number;
/**
* 审核时间
*/
approveTime: string;
/**
* 是否需要首件检验（0否 1是）
*/
needFirstInspect: string;
/**
* 是否打印流转卡（0继承 1是 2否）
*/
printFlowCard: string;
/**
* 批次量（0=不拆分）
*/
batchSize: number;
} }
export interface BaseRouteForm extends BaseEntity { export interface BaseRouteForm extends BaseEntity {
@ -100,7 +144,7 @@ export interface BaseRouteForm extends BaseEntity {
routeDesc?: string; routeDesc?: string;
/** /**
* 激活标识(1是 0否) * 状态（1待审核 2审核通过 3审核不通过 4发布 5作废）
*/ */
activeFlag?: string; activeFlag?: string;
@ -115,10 +159,54 @@ export interface BaseRouteForm extends BaseEntity {
routeProcessBoList?: ProdBaseRouteProcess[]; routeProcessBoList?: ProdBaseRouteProcess[];
routeProcessVoList?: ProdBaseRouteProcess[]; routeProcessVoList?: ProdBaseRouteProcess[];
/**
* 工艺路线版本
*/
routeVersion?: string;
/**
* 生产类型（1正式 2试制 3返修）
*/
productionType?: string;
/**
* 路线类型（1生产 2装配）
*/
routeType?: string;
/**
* 审核原因
*/
auditReason?: string;
/**
* 审核人
*/
approveBy?: number;
/**
* 审核时间
*/
approveTime?: string;
/**
* 是否需要首件检验（0否 1是）
*/
needFirstInspect?: string;
/**
* 是否打印流转卡（0继承 1是 2否）
*/
printFlowCard?: string;
/**
* 批次量（0=不拆分）
*/
batchSize?: number;
} }
export interface BaseRouteQuery extends PageQuery { export interface BaseRouteQuery extends PageQuery {
/** /**
* 工艺路线ID * 工艺路线ID
*/ */
@ -135,10 +223,55 @@ export interface BaseRouteQuery extends PageQuery {
routeDesc?: string; routeDesc?: string;
/** /**
* 激活标识(1是 0否) * 状态（1待审核 2审核通过 3审核不通过 4发布 5作废）
*/ */
activeFlag?: string; activeFlag?: string;
/**
* 工艺路线版本
*/
routeVersion?: string;
/**
* 生产类型（1正式 2试制 3返修）
*/
productionType?: string;
/**
* 路线类型（1生产 2装配）
*/
routeType?: string;
/**
* 审核原因
*/
auditReason?: string;
/**
* 审核人
*/
approveBy?: number;
/**
* 审核时间
*/
approveTime?: string;
/**
* 是否需要首件检验（0否 1是）
*/
needFirstInspect?: string;
/**
* 是否打印流转卡（0继承 1是 2否）
*/
printFlowCard?: string;
/**
* 批次量（0=不拆分）
*/
batchSize?: number;
/** /**
* 日期范围参数 * 日期范围参数
*/ */

86
src/api/mes/baseRouteMaterial/types.ts
Unescape Escape View File

@ -0,0 +1,86 @@
export interface BaseRouteMaterialVO {
/**
* 关联物料ID
*/
routeMaterialId: string | number;
/**
* 工艺路线ID
*/
routeId: string | number;
/**
* 物料ID
*/
materialId: string | number;
/**
* 激活标识(1是 0否)
*/
activeFlag: string;
/**
* 备注
*/
remark: string;
}
export interface BaseRouteMaterialForm extends BaseEntity {
/**
* 关联物料ID
*/
routeMaterialId?: string | number;
/**
* 工艺路线ID
*/
routeId?: string | number;
/**
* 物料ID
*/
materialId?: string | number;
/**
* 激活标识(1是 0否)
*/
activeFlag?: string;
/**
* 备注
*/
remark?: string;
}
export interface BaseRouteMaterialQuery extends PageQuery {
/**
* 关联物料ID
*/
routeMaterialId?: string | number;
/**
* 工艺路线ID
*/
routeId?: string | number;
/**
* 物料ID
*/
materialId?: string | number;
/**
* 激活标识(1是 0否)
*/
activeFlag?: string;
/**
* 日期范围参数
*/
params?: any;
}

147
src/views/mes/baseRoute/index.vue
Unescape Escape View File

@ -8,6 +8,16 @@
<el-form-item label='工艺路线名称' prop='routeName'> <el-form-item label='工艺路线名称' prop='routeName'>
<el-input v-model='queryParams.routeName' placeholder='请输入工艺路线名称' clearable @keyup.enter='handleQuery' /> <el-input v-model='queryParams.routeName' placeholder='请输入工艺路线名称' clearable @keyup.enter='handleQuery' />
</el-form-item> </el-form-item>
<el-form-item label='状态' prop='activeFlag'>
<el-select v-model='queryParams.activeFlag' placeholder='请选择状态' clearable>
<el-option v-for='dict in mes_route_active_flag' :key='dict.value' :label='dict.label' :value='dict.value'/>
</el-select>
</el-form-item>
<!-- <el-form-item label='首件检验' prop='needFirstInspect'>-->
<!-- <el-select v-model='queryParams.needFirstInspect' placeholder='请选择首件检验' clearable>-->
<!-- <el-option v-for='dict in mes_need_first_inspect' :key='dict.value' :label='dict.label' :value='dict.value'/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item> <el-form-item>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button> <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button> <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
@ -48,11 +58,40 @@
<el-table-column type='selection' width='55' align='center' /> <el-table-column type='selection' width='55' align='center' />
<el-table-column label='工艺路线ID' align='center' prop='routeId' v-if='columns[0].visible' /> <el-table-column label='工艺路线ID' align='center' prop='routeId' v-if='columns[0].visible' />
<el-table-column label='租户编号' align='center' prop='tenantId' v-if='columns[1].visible' /> <el-table-column label='租户编号' align='center' prop='tenantId' v-if='columns[1].visible' />
<el-table-column label='工艺路线名称' align='center' prop='routeName' v-if='columns[2].visible' /> <el-table-column label='工艺路线名称' align='center' prop='routeName' v-if='columns[2].visible' width='110'/>
<el-table-column label='工艺路线说明' align='center' prop='routeDesc' v-if='columns[3].visible' /> <el-table-column label='工艺路线说明' align='center' prop='routeDesc' v-if='columns[3].visible' width='110'/>
<el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[4].visible'> <el-table-column label='工艺路线版本' align='center' prop='routeVersion' v-if='columns[11].visible' width='110'/>
<el-table-column label='生产类型' align='center' prop='productionType' v-if='columns[12].visible'>
<template #default='scope'> <template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.activeFlag' /> <dict-tag :options='mes_process_production_type' :value='scope.row.productionType'/>
</template>
</el-table-column>
<el-table-column label='路线类型' align='center' prop='routeType' v-if='columns[13].visible'>
<template #default='scope'>
<dict-tag :options='mes_route_type' :value='scope.row.routeType'/>
</template>
</el-table-column>
<el-table-column label='审核原因' align='center' prop='auditReason' v-if='columns[14].visible'/>
<el-table-column label='审核人' align='center' prop='approveBy' v-if='columns[15].visible'/>
<el-table-column label='审核时间' align='center' prop='approveTime' width='180' v-if='columns[16].visible'>
<template #default='scope'>
<span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label='首件检验' align='center' prop='needFirstInspect' v-if='columns[17].visible'>
<template #default='scope'>
<dict-tag :options='mes_need_first_inspect' :value='scope.row.needFirstInspect'/>
</template>
</el-table-column>
<el-table-column label='打印流转卡' align='center' prop='printFlowCard' v-if='columns[18].visible' width='100'>
<template #default='scope'>
<dict-tag :options='mes_print_flow_card' :value='scope.row.printFlowCard'/>
</template>
</el-table-column>
<el-table-column label='批次量' align='center' prop='batchSize' v-if='columns[19].visible'/>
<el-table-column label='状态' align='center' prop='activeFlag' v-if='columns[4].visible'>
<template #default='scope'>
<dict-tag :options='mes_route_active_flag' :value='scope.row.activeFlag' />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label='备注' align='center' prop='remark' v-if='columns[5].visible' /> <el-table-column label='备注' align='center' prop='remark' v-if='columns[5].visible' />
@ -106,10 +145,68 @@
<el-form-item label='工艺路线说明' prop='routeDesc'> <el-form-item label='工艺路线说明' prop='routeDesc'>
<el-input v-model='form.routeDesc' placeholder='请输入工艺路线说明' /> <el-input v-model='form.routeDesc' placeholder='请输入工艺路线说明' />
</el-form-item> </el-form-item>
<el-form-item label='激活标识' prop='activeFlag'> <el-form-item label='工艺路线版本' prop='routeVersion'>
<el-input v-model='form.routeVersion' placeholder='请输入工艺路线版本' />
</el-form-item>
<el-form-item label='生产类型' prop='productionType'>
<el-select v-model='form.productionType' placeholder='请选择生产类型'>
<el-option
v-for='dict in mes_process_production_type'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label='路线类型' prop='routeType'>
<el-select v-model='form.routeType' placeholder='请选择路线类型'>
<el-option
v-for='dict in mes_route_type'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label='审核原因' prop='auditReason'>-->
<!-- <el-input v-model='form.auditReason' placeholder='请输入审核原因' />-->
<!-- </el-form-item>-->
<!-- <el-form-item label='审核人' prop='approveBy'>-->
<!-- <el-input v-model='form.approveBy' placeholder='请输入审核人' />-->
<!-- </el-form-item>-->
<!-- <el-form-item label='审核时间' prop='approveTime'>-->
<!-- <el-date-picker clearable-->
<!-- v-model='form.approveTime'-->
<!-- type='datetime'-->
<!-- value-format='YYYY-MM-DD HH:mm:ss'-->
<!-- placeholder='请选择审核时间'>-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label='首件检验' prop='needFirstInspect'>
<el-radio-group v-model='form.needFirstInspect'>
<el-radio
v-for='dict in mes_need_first_inspect'
:key='dict.value'
:value='dict.value'
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='打印流转卡' prop='printFlowCard'>
<el-radio-group v-model='form.printFlowCard'>
<el-radio
v-for='dict in mes_print_flow_card'
:key='dict.value'
:value='dict.value'
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label='批次量' prop='batchSize'>
<el-input-number v-model='form.batchSize' placeholder='请输入批次量' />
</el-form-item>
<el-form-item label='状态' prop='activeFlag'>
<el-radio-group v-model='form.activeFlag'> <el-radio-group v-model='form.activeFlag'>
<el-radio <el-radio
v-for='dict in active_flag' v-for='dict in mes_route_active_flag'
:key='dict.value' :key='dict.value'
:value='dict.value' :value='dict.value'
>{{ dict.label }} >{{ dict.label }}
@ -196,7 +293,7 @@ import {getProcessInfoList} from "@/api/mes/baseProcessInfo";
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { active_flag } = toRefs<any>(proxy?.useDict('active_flag')); const { mes_route_active_flag, mes_process_production_type, mes_need_first_inspect, mes_route_type, mes_print_flow_card } = toRefs<any>(proxy?.useDict('mes_route_active_flag', 'mes_process_production_type', 'mes_need_first_inspect', 'mes_route_type', 'mes_print_flow_card'));
const baseRouteList = ref<BaseRouteVO[]>([]); const baseRouteList = ref<BaseRouteVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);
@ -234,13 +331,22 @@ const columns = ref<FieldOption[]>([
{ key: 1, label: `租户编号`, visible: false }, { key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `工艺路线名称`, visible: true }, { key: 2, label: `工艺路线名称`, visible: true },
{ key: 3, label: `工艺路线说明`, visible: true }, { key: 3, label: `工艺路线说明`, visible: true },
{ key: 4, label: `激活标识`, visible: true }, { key: 4, label: `状态`, visible: true },
{ key: 5, label: `备注`, visible: true }, { key: 5, label: `备注`, visible: true },
{ key: 6, label: `创建部门`, visible: false }, { key: 6, label: `创建部门`, visible: false },
{ key: 7, label: `创建人`, visible: false }, { key: 7, label: `创建人`, visible: false },
{ key: 8, label: `创建时间`, visible: true }, { key: 8, label: `创建时间`, visible: false },
{ key: 9, label: `更新人`, visible: false }, { key: 9, label: `更新人`, visible: false },
{ key: 10, label: `更新时间`, visible: false } { key: 10, label: `更新时间`, visible: false },
{ key: 11, label: `工艺路线版本`, visible: true },
{ key: 12, label: `生产类型`, visible: true },
{ key: 13, label: `路线类型`, visible: true },
{ key: 14, label: `审核原因`, visible: false },
{ key: 15, label: `审核人`, visible: false },
{ key: 16, label: `审核时间`, visible: false },
{ key: 17, label: `首件检验`, visible: true },
{ key: 18, label: `打印流转卡`, visible: true },
{ key: 19, label: `批次量`, visible: true }
]); ]);
const initFormData: BaseRouteForm = { const initFormData: BaseRouteForm = {
@ -249,6 +355,15 @@ const initFormData: BaseRouteForm = {
routeDesc: undefined, routeDesc: undefined,
activeFlag: '1', activeFlag: '1',
remark: undefined, remark: undefined,
routeVersion: undefined,
productionType: '1',
routeType: '1',
auditReason: undefined,
approveBy: undefined,
approveTime: undefined,
needFirstInspect: '0',
printFlowCard: '0',
batchSize: 0,
routeProcessBoList: []//工艺步骤 routeProcessBoList: []//工艺步骤
}; };
const data = reactive<PageData<BaseRouteForm, BaseRouteQuery>>({ const data = reactive<PageData<BaseRouteForm, BaseRouteQuery>>({
@ -260,14 +375,20 @@ const data = reactive<PageData<BaseRouteForm, BaseRouteQuery>>({
routeName: undefined, routeName: undefined,
routeDesc: undefined, routeDesc: undefined,
activeFlag: undefined, activeFlag: undefined,
routeVersion: undefined,
productionType: undefined,
routeType: undefined,
auditReason: undefined,
approveBy: undefined,
approveTime: undefined,
needFirstInspect: undefined,
printFlowCard: undefined,
batchSize: undefined,
params: {} params: {}
}, },
rules: { rules: {
routeName: [ routeName: [
{ required: true, message: '工艺路线名称不能为空', trigger: 'blur' } { required: true, message: '工艺路线名称不能为空', trigger: 'blur' }
],
activeFlag: [
{ required: true, message: '激活标识不能为空', trigger: 'change' }
] ]
} }
}); });

Write Preview
Loading…
Cancel
Save