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

update add工序步序维护

Browse Source
master
yinq 5 months ago
parent 8d75410f7d
commit 02cf70aed5
2 changed files with 386 additions and 171 deletions
Show Stats Download Patch File Download Diff File

5
src/api/mes/technologyInfo/types.ts
Unescape Escape View File

@ -81,7 +81,9 @@ export interface TechnologyInfoForm extends BaseEntity {
* 硫化标准时间（秒）
*/
standardTime?: number;
productionTimeDays?: number;
productionTimeHours?: number;
productionTimeMinutes?: number;
/**
* 激活标识（1是 0否）
*/
@ -92,6 +94,7 @@ export interface TechnologyInfoForm extends BaseEntity {
*/
remark?: string;
prodTechnologyStepInfoList?: [];
}
export interface TechnologyInfoQuery extends PageQuery {

278
src/views/mes/technologyInfo/index.vue
Unescape Escape View File

@ -7,12 +7,12 @@
<el-card shadow='hover'>
<el-form ref='queryFormRef' :model='queryParams' :inline='true'>
<el-form-item label='工序ID' prop='processId'>
<el-select v-model="queryParams.processId" placeholder="请选择所属工序" clearable @keyup.enter='handleQuery' >
<el-select v-model='queryParams.processId' placeholder='请选择所属工序' clearable @keyup.enter='handleQuery'>
<el-option
v-for="item in processInfoList"
:key="item.processId"
:label="item.processName"
:value="item.processId"
v-for='item in processInfoList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
@ -91,7 +91,11 @@
</template>
</el-table-column>
<el-table-column label='工艺版本' align='center' prop='technologyVersion' v-if='columns[6].visible' />
<el-table-column label='硫化标准时间' align='center' prop='standardTime' v-if='columns[7].visible' />
<el-table-column label='硫化标准时间' align='center' prop='standardTime' v-if='columns[7].visible'>
<template v-slot='scope'>
<span>{{ formatDayHourMinutes(scope.row.standardTime) }}</span>
</template>
</el-table-column>
<el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[8].visible'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.activeFlag' />
@ -100,14 +104,15 @@
<el-table-column label='备注' align='center' prop='remark' v-if='columns[9].visible' />
<el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
<template #default='scope'>
<el-tooltip content='修改' placement='top'>
<el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
v-hasPermi="['mes:technologyInfo:edit']"></el-button>
</el-tooltip>
<el-tooltip content='删除' placement='top'>
<el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
v-hasPermi="['mes:technologyInfo:remove']"></el-button>
<el-tooltip content='步序' placement='top'>
<el-button link type='primary' @click='handleStepUpdate(scope.row)'
v-hasPermi="['mes:technologyInfo:edit']">步序
</el-button>
</el-tooltip>
<!-- <el-tooltip content='删除' placement='top'>-->
<!-- <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'-->
<!-- v-hasPermi="['mes:technologyInfo:remove']"></el-button>-->
<!-- </el-tooltip>-->
</template>
</el-table-column>
</el-table>
@ -119,19 +124,21 @@
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='technologyInfoFormRef' :model='form' :rules='rules' label-width='100px'>
<el-form-item label='工序ID' prop='processId'>
<el-select v-model="form.processId" placeholder="请选择所属工序">
<el-select v-model='form.processId' placeholder='请选择所属工序'>
<el-option
v-for="item in processInfoList"
:key="item.processId"
:label="item.processName"
:value="item.processId"
v-for='item in processInfoList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
<el-form-item label='物料名称' prop='materialId'>
<el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd" readonly>
<el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
<template #append>
<el-icon class="el-input__icon" ><search/></el-icon>
<el-icon class='el-input__icon'>
<search />
</el-icon>
</template>
</el-input>
</el-form-item>
@ -159,7 +166,15 @@
<el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' />
</el-form-item>
<el-form-item label='硫化标准时间' prop='standardTime'>
<el-input-number v-model='form.standardTime' placeholder='请输入硫化标准时间' style="width: 220px;"/>
<el-input-number v-model='form.productionTimeDays' placeholder='请输入天数' :min='0' :max='10000'
:controls='false' :style="{ width: '50px' }" />
<span>&nbsp;天&nbsp;</span>
<el-input-number v-model='form.productionTimeHours' placeholder='请输入小时' :min='0' :max='23'
:controls='false' :style="{ width: '50px' }" />
<span>&nbsp;小时&nbsp;</span>
<el-input-number v-model='form.productionTimeMinutes' placeholder='请输入分钟' :min='0' :max='59'
:controls='false' :style="{ width: '50px' }" />
<span>&nbsp;分钟&nbsp;</span>
</el-form-item>
<el-form-item label='激活标识' prop='activeFlag'>
<el-radio-group v-model='form.activeFlag'>
@ -185,18 +200,127 @@
</div>
<!-- 添加物料信息对话框 -->
<el-dialog title="选择物料信息" v-model="materialOpen" width='1200px' append-to-body>
<MaterialSelect @selection="handleSelection" ref="materialSelectRef" v-if="materialOpen"></MaterialSelect>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitMaterialForm">确 定</el-button>
<el-button @click="materialOpen = false">取 消</el-button>
<el-dialog title='选择物料信息' v-model='materialOpen' width='1200px' append-to-body>
<MaterialSelect @selection='handleSelection' ref='materialSelectRef' v-if='materialOpen'></MaterialSelect>
<div slot='footer' class='dialog-footer'>
<el-button type='primary' @click='submitMaterialForm'>确 定</el-button>
<el-button @click='materialOpen = false'>取 消</el-button>
</div>
</el-dialog>
</div>
<!-- 添加或修改工序工艺信息对话框 -->
<el-dialog :title='dialog.title' v-model='stepOpen' width='1100px' append-to-body>
<el-form ref='technologyInfoFormRef' :model='form' :rules='rules' label-width='100px'>
<el-row :gutter='10' class='mb8'>
<el-col :span='12'>
<el-form-item label='工序' prop='processId'>
<el-select v-model='form.processId' placeholder='请选择所属工序' disabled>
<el-option
v-for='item in processInfoList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label='物料名称' prop='materialName'>
<el-input v-model='form.materialName' placeholder='请输入物料名称' disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter='10' class='mb8'>
<el-col :span='12'>
<el-form-item label='机台类型' prop='machineType'>
<el-select v-model='form.machineType' placeholder='请选择机台类型' disabled>
<el-option
v-for='dict in mes_machine_type'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
</el-select>
</el-form-item>
<el-form-item label='工艺类型' prop='technologyType'>
<el-select v-model='form.technologyType' placeholder='请选择工艺类型' disabled>
<el-option
v-for='dict in mes_technology_type'
:key='dict.value'
:label='dict.label'
:value='dict.value'
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label='工艺版本' prop='technologyVersion'>
<el-input v-model='form.technologyVersion' placeholder='请输入工艺版本' disabled />
</el-form-item>
</el-col>
</el-row>
<el-divider content-position='center'>工艺步序信息</el-divider>
<el-row :gutter='10' class='mb8'>
<el-col :span='1.5'>
<el-button type='primary' plain icon='Plus' @click='handleAddStep'>添加</el-button>
</el-col>
<el-col :span='1.5'>
<el-button type='danger' icon='Delete' @click='handleDeleteProdLine'>删除</el-button>
</el-col>
</el-row>
<el-table :data='prodTechnologyStepInfoList' :row-class-name='rowProdBaseProcessProdlineIndex'
@selection-change='handleProdLineSelectionChange'>
<el-table-column type='selection' width='50' align='center' />
<el-table-column label='序号' width='50' align='center' prop='index' />
<el-table-column align='center' label='步序编号' prop='stepCode'>
<template #default='scope'>
<!-- <el-input v-model='scope.row.stepCode' :disabled='true' placeholder='请输入步序编号' />-->
<el-input v-model='scope.row.stepCode' placeholder='请输入步序编号' />
</template>
</el-table-column>
<el-table-column align='center' label='步序名称' prop='stepName'>
<template #default='scope'>
<el-input v-model='scope.row.stepName' placeholder='请输入步序名称' />
</template>
</el-table-column>
<el-table-column align='center' label='步序时间' prop='stepTime'>
<template #default='scope'>
<el-input v-model='scope.row.stepTime' placeholder='请输入步序时间' />
</template>
</el-table-column>
<el-table-column align='center' label='步序参数' prop='stepParameter'>
<template #default='scope'>
<el-input v-model='scope.row.stepParameter' placeholder='请输入步序参数' />
</template>
</el-table-column>
<el-table-column align='center' label='阀门状态' prop='valueState'>
<template #default='scope'>
<el-input v-model='scope.row.valueState' placeholder='请输入阀门状态' />
</template>
</el-table-column>
<el-table-column align='center' label='激活标识' prop='activeFlag'>
<template #default='scope'>
<el-select v-model='scope.row.activeFlag' placeholder='请输入激活标识' >
<el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</template>
</el-table-column>
</el-table>
</el-form>
<template #footer>
<div class='dialog-footer'>
<el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
<el-button @click='cancelStep'>取 消</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup lang='ts'>
<script setup name='TechnologyInfo' lang='ts'>
import {
listTechnologyInfo,
getTechnologyInfo,
@ -237,6 +361,11 @@ const processInfoList = ref([]);
const materialOpen = ref(false);
const materialSelectRef = ref();
const stepOpen = ref(false);
const prodTechnologyStepInfoList = ref([]);
const chekedProdLineList = ref([]);
/** 查询工位下拉树结构 */
const getProcessInfoListSelect = async () => {
let res = await getProcessInfoList(null);
@ -270,8 +399,12 @@ const initFormData: TechnologyInfoForm = {
technologyType: undefined,
technologyVersion: undefined,
standardTime: undefined,
productionTimeDays: 0,
productionTimeHours: 0,
productionTimeMinutes: 0,
activeFlag: '1',
remark: undefined
remark: undefined,
prodTechnologyStepInfoList: []
};
const data = reactive<PageData<TechnologyInfoForm, TechnologyInfoQuery>>({
form: { ...initFormData },
@ -314,7 +447,6 @@ const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
@ -333,6 +465,12 @@ const resetQuery = () => {
handleQuery();
};
const cancelStep = () => {
reset();
stepOpen.value = false;
prodTechnologyStepInfoList.value = [];
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: TechnologyInfoVO[]) => {
ids.value = selection.map(item => item.technologyId);
@ -357,18 +495,36 @@ const handleUpdate = async (row?: TechnologyInfoVO) => {
dialog.title = '修改工序工艺信息';
};
/** 工艺步序信息维护按钮操作 */
const handleStepUpdate = async (row?: TechnologyInfoVO) => {
reset();
const _technologyId = row?.technologyId || ids.value[0];
const res = await getTechnologyInfo(_technologyId);
Object.assign(form.value, res.data);
prodTechnologyStepInfoList.value = form.value.prodTechnologyStepInfoList.map((item, index) => ({
...item,
index: index + 1 // 初始化 index
}));
stepOpen.value = true;
dialog.title = '工艺步序信息维护';
};
/** 提交按钮 */
const submitForm = () => {
technologyInfoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
convertToSeconds();
if (form.value.technologyId) {
form.value.prodTechnologyStepInfoList = prodTechnologyStepInfoList;
await updateTechnologyInfo(form.value).finally(() => buttonLoading.value = false);
} else {
await addTechnologyInfo(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
stepOpen.value = false;
form.value.prodTechnologyStepInfoList = [];
await getList();
}
});
@ -393,15 +549,71 @@ const handleExport = () => {
/** 新增按钮操作 */
const handleMaterialAdd = () => {
materialOpen.value = true;
}
};
/** 天小时分钟转换为秒 */
const convertToSeconds = () => {
const daysInSeconds = form.value.productionTimeDays * 24 * 60 * 60;
const hoursInSeconds = form.value.productionTimeHours * 60 * 60;
const minutesInSeconds = form.value.productionTimeMinutes * 60;
form.value.standardTime = daysInSeconds + hoursInSeconds + minutesInSeconds;
};
/** 秒转换为天小时分钟 */
const convertToTime = () => {
const totalSeconds = form.value.standardTime;
const days = Math.floor(totalSeconds / (24 * 60 * 60));
const hours = Math.floor((totalSeconds % (24 * 60 * 60)) / 3600);
const minutes = Math.floor((totalSeconds % 3600) / 60);
// 更新到表单中
form.value.productionTimeDays = days;
form.value.productionTimeHours = hours;
form.value.productionTimeMinutes = minutes;
};
/** 提交物料BOM信息按钮 */
const submitMaterialForm = () => {
let selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value;
form.value.materialId = selectedRow.materialId
form.value.materialName = selectedRow.materialName
form.value.materialId = selectedRow.materialId;
form.value.materialName = selectedRow.materialName;
materialOpen.value = false;
};
// 添加关联产线
const handleAddStep = () => {
return prodTechnologyStepInfoList.value.push({
technologyId: form.value.technologyId, // 确保 technologyId 被正确赋值
index: prodTechnologyStepInfoList.value.length + 1,
activeFlag: '1'
});
};
const rowProdBaseProcessProdlineIndex = ({ row, rowIndex }: { row: any; rowIndex: number }): string => {
// 根据行数据和行索引返回一个类名字符串
if (row.someCondition) {
return 'custom-class';
}
return '';
};
// 删除关联产线
const handleDeleteProdLine = () => {
if (chekedProdLineList.value.length === 0) {
proxy?.$modal.msgError('请先选择要删除的工序关联产线数据');
} else {
prodTechnologyStepInfoList.value = prodTechnologyStepInfoList.value
.filter(item => !chekedProdLineList.value.includes(item.index))
.map((item, index) => ({
...item,
index: index + 1 // 更新 index
}));
}
};
// 选中关联产线
const handleProdLineSelectionChange = (selection) => {
chekedProdLineList.value = selection.map(item => item.index);
};
onMounted(() => {
getProcessInfoListSelect();

Write Preview
Loading…
Cancel
Save