update 配方信息维护

master
yinq 5 days ago
parent 0b9ec8f636
commit a662bfa16d

@ -1,6 +1,8 @@
import request from '@/utils/request'; import request from '@/utils/request';
import { AxiosPromise } from 'axios'; import { AxiosPromise } from 'axios';
import { RecipeInfoVO, RecipeInfoForm, RecipeInfoQuery } from '@/api/mes/recipeInfo/types'; import { RecipeInfoVO, RecipeInfoForm, RecipeInfoQuery } from '@/api/mes/recipeInfo/types';
import type { RecipeWeightForm } from '@/api/mes/recipeWeight/types';
import type { RecipeMixingForm } from '@/api/mes/recipeMixing/types';
/** /**
* - * -
@ -69,9 +71,26 @@ export const delRecipeInfo = (recipeId: string | number | Array<string | number>
* @returns {*} * @returns {*}
*/ */
export function getProdRecipeInfoList (query) { export function getProdRecipeInfoList (query) {
return request({ return request({
url: '/mes/recipeInfo/getProdRecipeInfoList', url: '/mes/recipeInfo/getProdRecipeInfoList',
method: 'get', method: 'get',
params: query params: query
}); });
};
/**
* ++
*/
export interface RecipeDetailSaveDto {
recipeInfo: RecipeInfoForm;
weightList: RecipeWeightForm[];
mixingList: RecipeMixingForm[];
}
export const saveRecipeDetail = (data: RecipeDetailSaveDto) => {
return request({
url: '/mes/recipeInfo/saveDetail',
method: 'post',
data
});
}; };

@ -0,0 +1,120 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
/**
*
* @param query
* @returns {*}
*/
export const listPendingWorkOrders = (query?: any): AxiosPromise<any> => {
return request({
url: '/mes/workReport/pendingWorkOrders',
method: 'get',
params: query
});
};
/**
*
* @param query
* @returns {*}
*/
export const getCurrentWorkOrder = (query?: any): AxiosPromise<any> => {
return request({
url: '/mes/workReport/currentWorkOrder',
method: 'get',
params: query
});
};
/**
*
* @param data
* @returns {*}
*/
export const issueWorkOrder = (data: any) => {
return request({
url: '/mes/workReport/issueWorkOrder',
method: 'post',
data: data
});
};
/**
*
* @param data
* @returns {*}
*/
export const startWork = (data: any) => {
return request({
url: '/mes/workReport/startWork',
method: 'post',
data: data
});
};
/**
*
* @param data
* @returns {*}
*/
export const stopWork = (data: any) => {
return request({
url: '/mes/workReport/stopWork',
method: 'post',
data: data
});
};
/**
*
* @param data
* @returns {*}
*/
export const resumeWork = (data: any) => {
return request({
url: '/mes/workReport/resumeWork',
method: 'post',
data: data
});
};
/**
*
* @param data
* @returns {*}
*/
export const reportWork = (data: any) => {
return request({
url: '/mes/workReport/reportWork',
method: 'post',
data: data
});
};
/**
*
* @param query
* @returns {*}
*/
export const listWorkReportRecords = (query?: any): AxiosPromise<any> => {
return request({
url: '/mes/workReport/records',
method: 'get',
params: query
});
};
/**
*
* @param query
* @returns {*}
*/
export const listProcessDocuments = (query?: any): AxiosPromise<any> => {
return request({
url: '/mes/workReport/processDocuments',
method: 'get',
params: query
});
};

@ -219,6 +219,20 @@ export const constantRoutes: RouteRecordRaw[] = [
meta: { title: '不合格品主管审批', activeMenu: '/qms/qcUnqualifiedApproval', noCache: true } meta: { title: '不合格品主管审批', activeMenu: '/qms/qcUnqualifiedApproval', noCache: true }
} }
] ]
},
{
path: '/mes/recipeInfoDetail',
component: Layout,
hidden: true,
redirect: '/mes/recipeInfoDetail/index',
children: [
{
path: 'index',
component: () => import('@/views/mes/recipeInfo/detail.vue'),
name: 'RecipeInfoDetail',
meta: { title: '配方明细信息', activeMenu: '/mes/recipeInfo', noCache: true }
}
]
} }
]; ];

@ -0,0 +1,93 @@
<template>
<div class="material-select">
<el-form :inline="true" class="mb-2">
<el-form-item label="物料编码">
<el-input v-model="queryParams.materialCode" placeholder="物料编码" clearable style="width: 160px" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="物料名称">
<el-input v-model="queryParams.materialName" placeholder="物料名称" clearable style="width: 160px" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-table
ref="tableRef"
v-loading="loading"
:data="materialList"
highlight-current-row
@row-click="handleRowClick"
max-height="360"
>
<el-table-column label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip />
<el-table-column label="物料名称" prop="materialName" min-width="160" show-overflow-tooltip />
<el-table-column label="物料规格" prop="materialSpec" width="120" show-overflow-tooltip />
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script setup lang="ts">
import { listBaseMaterialInfo } from '@/api/mes/baseMaterialInfo';
import type { BaseMaterialInfoVO } from '@/api/mes/baseMaterialInfo/types';
const tableRef = ref<ElTableInstance>();
const loading = ref(false);
const materialList = ref<BaseMaterialInfoVO[]>([]);
const total = ref(0);
const selectedRow = ref<BaseMaterialInfoVO | null>(null);
const queryParams = ref({
pageNum: 1,
pageSize: 10,
materialCode: undefined as string | undefined,
materialName: undefined as string | undefined
});
const getList = async () => {
loading.value = true;
try {
const res = await listBaseMaterialInfo(queryParams.value);
materialList.value = (res as any).rows ?? res.data ?? [];
total.value = (res as any).total ?? 0;
} finally {
loading.value = false;
}
};
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
const resetQuery = () => {
queryParams.value.materialCode = undefined;
queryParams.value.materialName = undefined;
queryParams.value.pageNum = 1;
handleQuery();
};
const handleRowClick = (row: BaseMaterialInfoVO) => {
selectedRow.value = row;
};
/** 获取当前选中的物料,供父组件在确认时调用 */
const getSelected = () => selectedRow.value;
defineExpose({ getSelected, getList });
onMounted(() => {
getList();
});
</script>
<style scoped>
.material-select { padding: 0 8px; }
</style>

@ -0,0 +1,399 @@
<template>
<div class="recipe-detail-page p-2">
<div class="page-header">
<span class="page-title">配方明细信息</span>
<div class="header-actions">
<el-button type="primary" :icon="isEdit ? 'Select' : 'Edit'" @click="toggleEdit">
{{ isEdit ? '取消编辑' : '编辑' }}
</el-button>
<el-button type="success" icon="Select" :loading="saveLoading" :disabled="!isEdit" @click="handleSave">
保存
</el-button>
</div>
</div>
<el-tabs v-model="activeTab" type="border-card">
<el-tab-pane label="基本信息" name="basic">
<el-card shadow="never" class="mb-4">
<template #header>配方基本信息</template>
<el-form ref="basicFormRef" :model="recipeInfo" :disabled="!isEdit" label-width="140px" class="form-grid">
<el-row :gutter="16">
<el-col :span="8">
<el-form-item label="配方代码" prop="recipeCode">
<el-input v-model="recipeInfo.recipeCode" placeholder="配方代码" />
</el-form-item>
<el-form-item label="超时时间(秒)" prop="overtimeTime">
<el-input-number v-model="recipeInfo.overtimeTime" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
<el-form-item label="超温最短时间(秒)" prop="overtempMintime">
<el-input-number v-model="recipeInfo.overtempMintime" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
<el-form-item label="最小间隔时间(秒)" prop="miniTime">
<el-input-number v-model="recipeInfo.miniTime" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
<el-form-item label="每架车数(车)" prop="shelfNum">
<el-input-number v-model="recipeInfo.shelfNum" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料名称" prop="recipeCode">
<el-input v-model="recipeInfo.recipeCode" placeholder="物料名称" />
</el-form-item>
<el-form-item label="超温温度(℃)" prop="overtempTemp">
<el-input-number v-model="recipeInfo.overtempTemp" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
<el-form-item label="最低进胶温度(℃)" prop="minInpolytemp">
<el-input-number v-model="recipeInfo.minInpolytemp" controls-position="right" style="width: 100%" />
</el-form-item>
<el-form-item label="配方总重(千克)" prop="totalWeight">
<el-input-number v-model="recipeInfo.totalWeight" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配方状态" prop="recipeState">
<el-select v-model="recipeInfo.recipeState" placeholder="配方状态" style="width: 100%">
<el-option v-for="d in recipe_state" :key="d.value" :label="d.label" :value="d.value" />
</el-select>
</el-form-item>
<el-form-item label="机台名称" prop="machineId">
<el-select v-model="recipeInfo.machineId" placeholder="请选择机台" style="width: 100%">
<el-option v-for="m in machineOptions" :key="m.machineId" :label="m.machineName || m.machineCode" :value="m.machineId" />
</el-select>
</el-form-item>
<el-form-item label="超能能量(kw/h)" prop="overTemp">
<el-input-number v-model="recipeInfo.overTemp" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
<el-form-item label="最高进胶温度(℃)" prop="maxInpolytemp">
<el-input-number v-model="recipeInfo.maxInpolytemp" :min="0" controls-position="right" style="width: 100%" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
</el-tab-pane>
<el-tab-pane label="称量信息" name="weight">
<div class="tab-toolbar mb-3">
<el-button type="primary" size="small" @click="calcWeight"></el-button>
<el-button size="small" @click="refreshWeight"></el-button>
</div>
<el-card shadow="never" class="mb-3">
<template #header>称量明细</template>
<el-table :data="weightList" border>
<el-table-column type="index" label="序号" width="60" align="center" />
<el-table-column label="物料名称/炭黑名称" prop="childCode" min-width="120">
<template #default="{ row }">
<el-input v-if="isEdit" v-model="row.childCode" size="small" placeholder="物料编码" />
<span v-else>{{ row.childCode || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="物料编码" prop="fatherCode" min-width="100">
<template #default="{ row }">
<el-input v-if="isEdit" v-model="row.fatherCode" size="small" />
<span v-else>{{ row.fatherCode || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="称量动作" prop="actCode" width="100">
<template #default="{ row }">
<el-input v-if="isEdit" v-model="row.actCode" size="small" />
<span v-else>{{ row.actCode || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="设定重量(千克)" prop="setWeight" width="140">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.setWeight" :min="0" :precision="3" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.setWeight ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column label="允许误差(千克)" prop="errorAllow" width="140">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.errorAllow" :min="0" :precision="3" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.errorAllow ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column v-if="isEdit" label="操作" width="180" fixed="right" align="center">
<template #default="{ $index }">
<el-button link type="primary" size="small" @click="addWeightRow($index)"></el-button>
<el-button link type="primary" size="small" @click="insertWeightRow($index)"></el-button>
<el-button link type="danger" size="small" @click="removeWeightRow($index)"></el-button>
</template>
</el-table-column>
</el-table>
<div class="mt-2 text-secondary">
总计 {{ weightTotalWeight }} 千克允许误差 {{ weightTotalError }} 千克 {{ weightList.length }}
</div>
</el-card>
</el-tab-pane>
<el-tab-pane label="混炼信息" name="mixing">
<div class="tab-toolbar mb-3">
<el-button type="primary" size="small" @click="refreshMixing"></el-button>
<el-button size="small" @click="refreshMixing"></el-button>
</div>
<el-card shadow="never">
<el-table :data="mixingList" border>
<el-table-column type="index" label="步骤" width="70" align="center" />
<el-table-column label="动作" prop="actCode" min-width="120">
<template #default="{ row }">
<el-input v-if="isEdit" v-model="row.actCode" size="small" />
<span v-else>{{ row.actCode || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="条件" prop="condCode" width="100">
<template #default="{ row }">
<el-input v-if="isEdit" v-model="row.condCode" size="small" />
<span v-else>{{ row.condCode || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="时间(s)" prop="setTime" width="90">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.setTime" :min="0" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.setTime ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column label="温度(°C)" prop="setTemp" width="90">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.setTemp" :min="0" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.setTemp ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column label="能量(kw/h)" prop="setEnergy" width="100">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.setEnergy" :min="0" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.setEnergy ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column label="功率(kw)" prop="setPower" width="90">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.setPower" :min="0" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.setPower ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column label="压力" prop="setPres" width="80">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.setPres" :min="0" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.setPres ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column label="转速(rpm)" prop="setRota" width="100">
<template #default="{ row }">
<el-input-number v-if="isEdit" v-model="row.setRota" :min="0" size="small" controls-position="right" style="width: 100%" />
<span v-else>{{ row.setRota ?? '-' }}</span>
</template>
</el-table-column>
<el-table-column v-if="isEdit" label="操作" width="120" fixed="right" align="center">
<template #default="{ $index }">
<el-button link type="primary" size="small" @click="insertMixingRow($index)"></el-button>
<el-button link type="danger" size="small" @click="removeMixingRow($index)"></el-button>
</template>
</el-table-column>
</el-table>
<div class="mt-2 text-secondary"> {{ mixingList.length }} </div>
</el-card>
</el-tab-pane>
</el-tabs>
</div>
</template>
<script setup name="RecipeInfoDetail" lang="ts">
import { getRecipeInfo, saveRecipeDetail } from '@/api/mes/recipeInfo';
import { listRecipeWeight } from '@/api/mes/recipeWeight';
import { listRecipeMixing } from '@/api/mes/recipeMixing';
import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
import type { RecipeInfoForm } from '@/api/mes/recipeInfo/types';
import type { RecipeWeightForm } from '@/api/mes/recipeWeight/types';
import type { RecipeMixingForm } from '@/api/mes/recipeMixing/types';
import type { ProdBaseMachineInfoVO } from '@/api/mes/prodBaseMachineInfo/types';
const route = useRoute();
const router = useRouter();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { recipe_state } = toRefs<any>(proxy?.useDict('recipe_state'));
const recipeId = computed(() => route.query.recipeId as string || '');
const activeTab = ref('basic');
const isEdit = ref(false);
const saveLoading = ref(false);
const basicFormRef = ref<ElFormInstance>();
const recipeInfo = ref<RecipeInfoForm>({});
const weightList = ref<RecipeWeightForm[]>([]);
const mixingList = ref<RecipeMixingForm[]>([]);
const machineOptions = ref<ProdBaseMachineInfoVO[]>([]);
const weightTotalWeight = computed(() =>
weightList.value.reduce((s, r) => s + (Number(r.setWeight) || 0), 0).toFixed(3)
);
const weightTotalError = computed(() =>
weightList.value.reduce((s, r) => s + (Number(r.errorAllow) || 0), 0).toFixed(3)
);
function toggleEdit() {
isEdit.value = !isEdit.value;
}
async function loadData() {
if (!recipeId.value) {
proxy?.$modal.msgWarning('缺少配方ID');
return;
}
try {
const [infoRes, weightRes, mixingRes] = await Promise.all([
getRecipeInfo(recipeId.value),
listRecipeWeight({ recipeId: recipeId.value, pageNum: 1, pageSize: 9999 }),
listRecipeMixing({ recipeId: recipeId.value, pageNum: 1, pageSize: 9999 })
]);
const infoData = (infoRes as any).data ?? infoRes;
recipeInfo.value = { ...infoData };
weightList.value = (weightRes.rows || []).map((r: any) => ({ ...r }));
const mixRows = mixingRes.rows || [];
mixingList.value = mixRows.map((r: any) => ({ ...r }));
} catch (e) {
proxy?.$modal.msgError('加载失败');
}
}
async function loadMachines() {
try {
const res = await getProdBaseMachineInfoList({});
machineOptions.value = res.data || [];
} catch {
machineOptions.value = [];
}
}
function addWeightRow(index: number) {
const base = weightList.value[index] || {};
weightList.value.splice(index + 1, 0, {
recipeId: recipeId.value,
machineId: recipeInfo.value.machineId,
edtCode: recipeInfo.value.edtCode,
weightSeq: (weightList.value.length + 1) as any,
weightType: base.weightType || '',
scaleCode: base.scaleCode,
actCode: base.actCode || '称量',
setWeight: undefined,
errorAllow: undefined,
fatherCode: '',
unitId: undefined,
childCode: '',
ifUseBat: '',
maxRate: ''
} as RecipeWeightForm);
}
function insertWeightRow(index: number) {
const base = weightList.value[index] || {};
weightList.value.splice(index, 0, {
recipeId: recipeId.value,
machineId: recipeInfo.value.machineId,
edtCode: recipeInfo.value.edtCode,
weightSeq: (index + 1) as any,
weightType: base.weightType || '',
scaleCode: base.scaleCode,
actCode: base.actCode || '称量',
setWeight: undefined,
errorAllow: undefined,
fatherCode: '',
unitId: undefined,
childCode: '',
ifUseBat: '',
maxRate: ''
} as RecipeWeightForm);
}
function removeWeightRow(index: number) {
weightList.value.splice(index, 1);
}
function insertMixingRow(index: number) {
const base = mixingList.value[index] || {};
mixingList.value.splice(index, 0, {
recipeId: recipeId.value,
machineId: recipeInfo.value.machineId,
edtCode: recipeInfo.value.edtCode,
mixId: index + 1,
condCode: base.condCode || '',
actCode: base.actCode || '',
setTime: undefined,
setTemp: undefined,
setEnergy: undefined,
setPower: undefined,
setPres: undefined,
setRota: undefined,
fatherCode: '',
childCode: '',
termCode: ''
} as RecipeMixingForm);
}
function removeMixingRow(index: number) {
mixingList.value.splice(index, 1);
}
function calcWeight() {
proxy?.$modal.msg('计算重量功能可按业务规则扩展');
}
async function refreshWeight() {
await loadData();
activeTab.value = 'weight';
}
async function refreshMixing() {
await loadData();
activeTab.value = 'mixing';
}
async function handleSave() {
if (!recipeId.value) return;
saveLoading.value = true;
try {
const payload = {
recipeInfo: { ...recipeInfo.value, recipeId: recipeId.value },
weightList: weightList.value.map((w, i) => ({
...w,
recipeId: recipeId.value,
machineId: recipeInfo.value.machineId ?? w.machineId,
edtCode: recipeInfo.value.edtCode ?? w.edtCode,
weightSeq: (w.weightSeq ?? i + 1) as number
})),
mixingList: mixingList.value.map((m, i) => ({
...m,
recipeId: recipeId.value,
machineId: recipeInfo.value.machineId ?? m.machineId,
edtCode: recipeInfo.value.edtCode ?? m.edtCode,
mixId: (m.mixId ?? i + 1) as number
}))
};
await saveRecipeDetail(payload);
proxy?.$modal.msgSuccess('保存成功');
isEdit.value = false;
await loadData();
} catch (e) {
proxy?.$modal.msgError('保存失败');
} finally {
saveLoading.value = false;
}
}
onMounted(() => {
loadMachines();
loadData();
});
</script>
<style lang="scss" scoped>
.recipe-detail-page {
.page-header {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 16px;
.page-title { font-size: 18px; font-weight: 600; }
.header-actions { display: flex; gap: 8px; }
}
.tab-toolbar { display: flex; gap: 8px; }
.form-grid .el-input-number { width: 100%; }
}
</style>

File diff suppressed because it is too large Load Diff

@ -4,23 +4,10 @@
<div v-show="showSearch" class="mb-[10px]"> <div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover"> <el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" > <el-form ref="queryFormRef" :model="queryParams" :inline="true" >
<el-form-item label="主键标识" prop="weightId">
<el-input v-model="queryParams.weightId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="配方ID" prop="recipeId">
<el-input v-model="queryParams.recipeId" placeholder="请输入配方ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="称量序号" prop="weightSeq">
<el-input v-model="queryParams.weightSeq" placeholder="请输入称量序号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="机台ID" prop="machineId">
<el-input v-model="queryParams.machineId" placeholder="请输入机台ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="版本号" prop="edtCode">
<el-input v-model="queryParams.edtCode" placeholder="请输入版本号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="称量类型" prop="weightType"> <el-form-item label="称量类型" prop="weightType">
<el-input v-model="queryParams.weightType" placeholder="请输入称量类型" clearable @keyup.enter="handleQuery" /> <el-select v-model="queryParams.weightType" placeholder="请选择称量类型" clearable >
<el-option v-for="dict in weight_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="秤编码" prop="scaleCode"> <el-form-item label="秤编码" prop="scaleCode">
<el-input v-model="queryParams.scaleCode" placeholder="请输入秤编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.scaleCode" placeholder="请输入秤编码" clearable @keyup.enter="handleQuery" />
@ -43,12 +30,6 @@
<el-form-item label="子级编码" prop="childCode"> <el-form-item label="子级编码" prop="childCode">
<el-input v-model="queryParams.childCode" placeholder="请输入子级编码" clearable @keyup.enter="handleQuery" /> <el-input v-model="queryParams.childCode" placeholder="请输入子级编码" clearable @keyup.enter="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="是否使用批次" prop="ifUseBat">
<el-input v-model="queryParams.ifUseBat" placeholder="请输入是否使用批次" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="最大比例" prop="maxRate">
<el-input v-model="queryParams.maxRate" 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 type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button> <el-button icon="Refresh" @click="resetQuery"></el-button>
@ -84,7 +65,11 @@
<el-table-column label="称量序号" align="center" prop="weightSeq" v-if="columns[2].visible"/> <el-table-column label="称量序号" align="center" prop="weightSeq" v-if="columns[2].visible"/>
<el-table-column label="机台ID" align="center" prop="machineId" v-if="columns[3].visible"/> <el-table-column label="机台ID" align="center" prop="machineId" v-if="columns[3].visible"/>
<el-table-column label="版本号" align="center" prop="edtCode" v-if="columns[4].visible"/> <el-table-column label="版本号" align="center" prop="edtCode" v-if="columns[4].visible"/>
<el-table-column label="称量类型" align="center" prop="weightType" v-if="columns[5].visible"/> <el-table-column label="称量类型" align="center" prop="weightType" v-if="columns[5].visible">
<template #default="scope">
<dict-tag :options="weight_type" :value="scope.row.weightType" />
</template>
</el-table-column>
<el-table-column label="秤编码" align="center" prop="scaleCode" v-if="columns[6].visible"/> <el-table-column label="秤编码" align="center" prop="scaleCode" v-if="columns[6].visible"/>
<el-table-column label="动作编码" align="center" prop="actCode" v-if="columns[7].visible"/> <el-table-column label="动作编码" align="center" prop="actCode" v-if="columns[7].visible"/>
<el-table-column label="设定重量" align="center" prop="setWeight" v-if="columns[8].visible"/> <el-table-column label="设定重量" align="center" prop="setWeight" v-if="columns[8].visible"/>
@ -127,7 +112,9 @@
<el-input v-model="form.edtCode" placeholder="请输入版本号" /> <el-input v-model="form.edtCode" placeholder="请输入版本号" />
</el-form-item> </el-form-item>
<el-form-item label="称量类型" prop="weightType"> <el-form-item label="称量类型" prop="weightType">
<el-input v-model="form.weightType" placeholder="请输入称量类型" /> <el-select v-model="form.weightType" placeholder="请选择称量类型" clearable style="width: 100%">
<el-option v-for="dict in weight_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="秤编码" prop="scaleCode"> <el-form-item label="秤编码" prop="scaleCode">
<el-input v-model="form.scaleCode" placeholder="请输入秤编码" /> <el-input v-model="form.scaleCode" placeholder="请输入秤编码" />
@ -172,6 +159,7 @@ import { listRecipeWeight, getRecipeWeight, delRecipeWeight, addRecipeWeight, up
import { RecipeWeightVO, RecipeWeightQuery, RecipeWeightForm } from '@/api/mes/recipeWeight/types'; import { RecipeWeightVO, RecipeWeightQuery, RecipeWeightForm } from '@/api/mes/recipeWeight/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { weight_type } = toRefs<any>(proxy?.useDict('weight_type'));
const recipeWeightList = ref<RecipeWeightVO[]>([]); const recipeWeightList = ref<RecipeWeightVO[]>([]);
const buttonLoading = ref(false); const buttonLoading = ref(false);

@ -0,0 +1,260 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="主键标识" prop="relationId">
<el-input v-model="queryParams.relationId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工装类型ID" prop="toolingTypeId">
<el-input v-model="queryParams.toolingTypeId" placeholder="请输入工装类型ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="关联信息类型(1物料 2工序)" prop="relationInfoType">
<el-input v-model="queryParams.relationInfoType" placeholder="请输入关联信息类型(1物料 2工序)" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="关联信息ID" prop="relationInfoId">
<el-input v-model="queryParams.relationInfoId" placeholder="请输入关联信息ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:toolingTypeRelation:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:toolingTypeRelation:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:toolingTypeRelation:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:toolingTypeRelation:export']"></el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table v-loading="loading" :data="toolingTypeRelationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="relationId" v-if="columns[0].visible"/>
<el-table-column label="工装类型ID" align="center" prop="toolingTypeId" v-if="columns[2].visible"/>
<el-table-column label="关联信息类型(1物料 2工序)" align="center" prop="relationInfoType" v-if="columns[3].visible"/>
<el-table-column label="关联信息ID" align="center" prop="relationInfoId" v-if="columns[4].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:toolingTypeRelation:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:toolingTypeRelation:remove']"></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改载具工装类型关联信息对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="toolingTypeRelationFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="主键标识" prop="relationId">
<el-input v-model="form.relationId" placeholder="请输入主键标识" />
</el-form-item>
<el-form-item label="工装类型ID" prop="toolingTypeId">
<el-input v-model="form.toolingTypeId" placeholder="请输入工装类型ID" />
</el-form-item>
<el-form-item label="关联信息类型(1物料 2工序)" prop="relationInfoType">
<el-input v-model="form.relationInfoType" placeholder="请输入关联信息类型(1物料 2工序)" />
</el-form-item>
<el-form-item label="关联信息ID" prop="relationInfoId">
<el-input v-model="form.relationInfoId" placeholder="请输入关联信息ID" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="ToolingTypeRelation" lang="ts">
import { listToolingTypeRelation, getToolingTypeRelation, delToolingTypeRelation, addToolingTypeRelation, updateToolingTypeRelation } from '@/api/mes/toolingTypeRelation';
import { ToolingTypeRelationVO, ToolingTypeRelationQuery, ToolingTypeRelationForm } from '@/api/mes/toolingTypeRelation/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const toolingTypeRelationList = ref<ToolingTypeRelationVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const queryFormRef = ref<ElFormInstance>();
const toolingTypeRelationFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `租户编号`, visible: true },
{ key: 2, label: `工装类型ID`, visible: true },
{ key: 3, label: `关联信息类型(1物料 2工序)`, visible: true },
{ key: 4, label: `关联信息ID`, 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 },
]);
const initFormData: ToolingTypeRelationForm = {
relationId: undefined,
toolingTypeId: undefined,
relationInfoType: undefined,
relationInfoId: undefined,
}
const data = reactive<PageData<ToolingTypeRelationForm, ToolingTypeRelationQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
relationId: undefined,
toolingTypeId: undefined,
relationInfoType: undefined,
relationInfoId: undefined,
params: {
}
},
rules: {
relationId: [
{ required: true, message: "主键标识不能为空", trigger: "blur" }
],
toolingTypeId: [
{ required: true, message: "工装类型ID不能为空", trigger: "blur" }
],
relationInfoType: [
{ required: true, message: "关联信息类型(1物料 2工序)不能为空", trigger: "blur" }
],
relationInfoId: [
{ required: true, message: "关联信息ID不能为空", trigger: "blur" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询载具工装类型关联信息列表 */
const getList = async () => {
loading.value = true;
const res = await listToolingTypeRelation(queryParams.value);
toolingTypeRelationList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
toolingTypeRelationFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: ToolingTypeRelationVO[]) => {
ids.value = selection.map(item => item.relationId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加载具工装类型关联信息";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: ToolingTypeRelationVO) => {
reset();
const _relationId = row?.relationId || ids.value[0]
const res = await getToolingTypeRelation(_relationId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改载具工装类型关联信息";
}
/** 提交按钮 */
const submitForm = () => {
toolingTypeRelationFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.relationId) {
await updateToolingTypeRelation(form.value).finally(() => buttonLoading.value = false);
} else {
await addToolingTypeRelation(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: ToolingTypeRelationVO) => {
const _relationIds = row?.relationId || ids.value;
await proxy?.$modal.confirm('是否确认删除载具工装类型关联信息编号为"' + _relationIds + '"的数据项?').finally(() => loading.value = false);
await delToolingTypeRelation(_relationIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('mes/toolingTypeRelation/export', {
...queryParams.value
}, `toolingTypeRelation_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>
Loading…
Cancel
Save