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

update 硫化批量计划新增

Browse Source
master
yinq 5 months ago
parent ca69eba7f2
commit 3ae65be041
2 changed files with 574 additions and 313 deletions
Show Stats Download Patch File Download Diff File

6
src/api/mes/planInfo/types.ts
Unescape Escape View File

@ -147,7 +147,7 @@ export interface PlanInfoVO {
/**
* 模号（1左模 2右模）
*/
modelCode: string;
modelCode: string | number | [] | null;
/**
* 备注
@ -289,7 +289,7 @@ export interface PlanInfoForm extends BaseEntity {
/**
* 完成标识（0正常 1降级 2超额）
*/
finishFlag?: string | [];
finishFlag?: number | string | [];
/**
* 优先级
@ -309,7 +309,7 @@ export interface PlanInfoForm extends BaseEntity {
/**
* 模号（1左模 2右模）
*/
modelCode?: string;
modelCode?: number | string | [] | null;
/**
* 备注

665
src/views/mes/planInfo/index.vue
Unescape Escape View File

@ -1,14 +1,15 @@
<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">
<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="生产订单ID" prop="productOrderId">-->
<!-- <el-input v-model="queryParams.productOrderId" placeholder="请输入生产订单ID" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="计划编号" prop="planCode">
<el-input v-model="queryParams.planCode" placeholder="请输入计划编号" clearable @keyup.enter="handleQuery" />
<el-form-item label='计划编号' prop='planCode'>
<el-input v-model='queryParams.planCode' placeholder='请输入计划编号' clearable @keyup.enter='handleQuery' />
</el-form-item>
<!-- <el-form-item label="物料ID" prop="materialId">-->
<!-- <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />-->
@ -30,9 +31,9 @@
<!-- placeholder="请选择计划开始时间"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="计划状态" prop="planStatus">
<el-select v-model="queryParams.planStatus" placeholder="请选择计划状态" clearable >
<el-option v-for="dict in mes_plan_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
<el-form-item label='计划状态' prop='planStatus'>
<el-select v-model='queryParams.planStatus' placeholder='请选择计划状态' clearable>
<el-option v-for='dict in mes_plan_status' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<!-- <el-form-item label="班次" prop="shiftId">-->
@ -41,129 +42,143 @@
<!-- <el-form-item label="班组" prop="classTeamId">-->
<!-- <el-input v-model="queryParams.classTeamId" placeholder="请输入班组" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="模号" prop="modelCode">
<el-select v-model="queryParams.modelCode" placeholder="请选择模号" clearable >
<el-option v-for="dict in mes_model_code" :key="dict.value" :label="dict.label" :value="dict.value"/>
<el-form-item label='模号' prop='modelCode'>
<el-select v-model='queryParams.modelCode' placeholder='请选择模号' clearable>
<el-option v-for='dict in mes_model_code' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</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-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">
<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:planInfo:add']">新增</el-button>
<el-row :gutter='10' class='mb8'>
<el-col :span='1.5'>
<el-button type='primary' plain icon='Plus' @click='handleAdd' v-hasPermi="['mes:planInfo:add']">新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:planInfo:edit']">修改</el-button>
<el-col :span='1.5'>
<el-button type='primary' plain icon='Plus' @click='handleBatchAdd' v-hasPermi="['mes:planInfo:add']"
v-if="workshopId == '4'">硫化新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:planInfo:remove']">删除</el-button>
<el-col :span='1.5'>
<el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
v-hasPermi="['mes:planInfo:edit']">修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:planInfo:export']">导出</el-button>
<el-col :span='1.5'>
<el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
v-hasPermi="['mes:planInfo:remove']">删除
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
<el-col :span='1.5'>
<el-button type='warning' plain icon='Download' @click='handleExport' v-hasPermi="['mes:planInfo: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="planInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="planId" v-if="columns[0].visible"/>
<el-table-column label="生产订单ID" align="center" prop="productOrderId" v-if="columns[2].visible" width="100"/>
<el-table-column label="销售订单ID" align="center" prop="saleOrderId" v-if="columns[3].visible"/>
<el-table-column label="销售订单编号" align="center" prop="saleorderCode" v-if="columns[4].visible"/>
<el-table-column label="计划编号" align="center" prop="planCode" v-if="columns[5].visible" width="120"/>
<el-table-column label="派工单号" align="center" prop="dispatchCode" v-if="columns[6].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[7].visible" width="160"/>
<el-table-column label="物料BOM" align="center" prop="materialBomName" v-if="columns[8].visible" width="160"/>
<el-table-column label="工序名称" align="center" prop="processName" v-if="columns[9].visible"/>
<el-table-column label="顺序" align="center" prop="processOrder" v-if="columns[10].visible"/>
<el-table-column label="上一工序ID" align="center" prop="lastProcessId" v-if="columns[11].visible" width="100"/>
<el-table-column label="最后工序标识" align="center" prop="finalProcessFlag" v-if="columns[12].visible" width="110">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.finalProcessFlag"/>
<el-table v-loading='loading' :data='planInfoList' @selection-change='handleSelectionChange'>
<el-table-column type='selection' width='55' align='center' />
<el-table-column label='主键标识' align='center' prop='planId' v-if='columns[0].visible' />
<el-table-column label='生产订单ID' align='center' prop='productOrderId' v-if='columns[2].visible' width='100' />
<el-table-column label='销售订单ID' align='center' prop='saleOrderId' v-if='columns[3].visible' />
<el-table-column label='销售订单编号' align='center' prop='saleorderCode' v-if='columns[4].visible' />
<el-table-column label='计划编号' align='center' prop='planCode' v-if='columns[5].visible' width='120' />
<el-table-column label='派工单号' align='center' prop='dispatchCode' v-if='columns[6].visible' />
<el-table-column label='物料名称' align='center' prop='materialName' v-if='columns[7].visible' width='160' />
<el-table-column label='物料BOM' align='center' prop='materialBomName' v-if='columns[8].visible' width='160' />
<el-table-column label='工序名称' align='center' prop='processName' v-if='columns[9].visible' />
<el-table-column label='顺序' align='center' prop='processOrder' v-if='columns[10].visible' />
<el-table-column label='上一工序ID' align='center' prop='lastProcessId' v-if='columns[11].visible' width='100' />
<el-table-column label='最后工序标识' align='center' prop='finalProcessFlag' v-if='columns[12].visible' width='110'>
<template #default='scope'>
<dict-tag :options='active_flag' :value='scope.row.finalProcessFlag' />
</template>
</el-table-column>
<el-table-column label="下达类型" align="center" prop="releaseType" v-if="columns[13].visible">
<template #default="scope">
<dict-tag :options="mes_release_type" :value="scope.row.releaseType"/>
<el-table-column label='下达类型' align='center' prop='releaseType' v-if='columns[13].visible'>
<template #default='scope'>
<dict-tag :options='mes_release_type' :value='scope.row.releaseType' />
</template>
</el-table-column>
<el-table-column label="下达机台" align="center" prop="releaseName" v-if="columns[14].visible"/>
<el-table-column label="单位生产时间(秒)" align="center" prop="productionTime" v-if="columns[15].visible"/>
<el-table-column label="计划数量" align="center" prop="planAmount" v-if="columns[16].visible"/>
<el-table-column label="派工数量" align="center" prop="dispatchAmount" v-if="columns[17].visible"/>
<el-table-column label="完成数量" align="center" prop="completeAmount" v-if="columns[18].visible"/>
<el-table-column label="计划开始时间" align="center" prop="planBeginTime" width="180" v-if="columns[19].visible">
<template #default="scope">
<el-table-column label='下达机台' align='center' prop='releaseName' v-if='columns[14].visible' />
<el-table-column label='单位生产时间(秒)' align='center' prop='productionTime' v-if='columns[15].visible' />
<el-table-column label='计划数量' align='center' prop='planAmount' v-if='columns[16].visible' />
<el-table-column label='派工数量' align='center' prop='dispatchAmount' v-if='columns[17].visible' />
<el-table-column label='完成数量' align='center' prop='completeAmount' v-if='columns[18].visible' />
<el-table-column label='计划开始时间' align='center' prop='planBeginTime' width='180' v-if='columns[19].visible'>
<template #default='scope'>
<span>{{ parseTime(scope.row.planBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="计划结束时间" align="center" prop="planEndTime" width="180" v-if="columns[20].visible">
<template #default="scope">
<el-table-column label='计划结束时间' align='center' prop='planEndTime' width='180' v-if='columns[20].visible'>
<template #default='scope'>
<span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际开始时间" align="center" prop="realBeginTime" width="180" v-if="columns[21].visible">
<template #default="scope">
<el-table-column label='实际开始时间' align='center' prop='realBeginTime' width='180' v-if='columns[21].visible'>
<template #default='scope'>
<span>{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="实际完成时间" align="center" prop="realEndTime" width="180" v-if="columns[22].visible">
<template #default="scope">
<el-table-column label='实际完成时间' align='center' prop='realEndTime' width='180' v-if='columns[22].visible'>
<template #default='scope'>
<span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="附件信息" align="center" prop="attachId" v-if="columns[23].visible"/>
<el-table-column label="计划状态" align="center" prop="planStatus" v-if="columns[24].visible">
<template #default="scope">
<dict-tag :options="mes_plan_status" :value="scope.row.planStatus"/>
<el-table-column label='附件信息' align='center' prop='attachId' v-if='columns[23].visible' />
<el-table-column label='计划状态' align='center' prop='planStatus' v-if='columns[24].visible'>
<template #default='scope'>
<dict-tag :options='mes_plan_status' :value='scope.row.planStatus' />
</template>
</el-table-column>
<el-table-column label="导入类型" align="center" prop="importFlag" v-if="columns[25].visible">
<template #default="scope">
<dict-tag :options="mes_import_flag" :value="scope.row.importFlag"/>
<el-table-column label='导入类型' align='center' prop='importFlag' v-if='columns[25].visible'>
<template #default='scope'>
<dict-tag :options='mes_import_flag' :value='scope.row.importFlag' />
</template>
</el-table-column>
<el-table-column label="完成标识" align="center" prop="finishFlag" v-if="columns[26].visible">
<template #default="scope">
<dict-tag :options="mes_finish_flag" :value="scope.row.finishFlag ? scope.row.finishFlag.split(',') : []"/>
<el-table-column label='完成标识' align='center' prop='finishFlag' v-if='columns[26].visible'>
<template #default='scope'>
<dict-tag :options='mes_finish_flag' :value="scope.row.finishFlag ? scope.row.finishFlag.split(',') : []" />
</template>
</el-table-column>
<el-table-column label="优先级" align="center" prop="priority" v-if="columns[27].visible"/>
<el-table-column label="班次" align="center" prop="shiftName" v-if="columns[28].visible"/>
<el-table-column label="班组" align="center" prop="teamName" v-if="columns[29].visible"/>
<el-table-column label="模号" align="center" prop="modelCode" v-if="columns[30].visible">
<template #default="scope">
<dict-tag :options="mes_model_code" :value="scope.row.modelCode"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[31].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:planInfo:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:planInfo:remove']"></el-button>
</el-tooltip>
<el-table-column label='优先级' align='center' prop='priority' v-if='columns[27].visible' />
<el-table-column label='班次' align='center' prop='shiftName' v-if='columns[28].visible' />
<el-table-column label='班组' align='center' prop='teamName' v-if='columns[29].visible' />
<el-table-column label='模号' align='center' prop='modelCode' v-if='columns[30].visible'>
<template #default='scope'>
<dict-tag :options='mes_model_code' :value='scope.row.modelCode' />
</template>
</el-table-column>
<el-table-column label='备注' align='center' prop='remark' v-if='columns[31].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:planInfo:edit']"></el-button>-->
<!-- </el-tooltip>-->
<!-- <el-tooltip content="删除" placement="top">-->
<!-- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:planInfo: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" />
<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="planInfoFormRef" :model="form" :rules="rules" label-width="100px">
<el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
<el-form ref='planInfoFormRef' :model='form' :rules='rules' label-width='100px'>
<!-- <el-form-item label="生产订单ID" prop="productOrderId">-->
<!-- <el-input v-model="form.productOrderId" placeholder="请输入生产订单ID" />-->
<!-- </el-form-item>-->
@ -179,27 +194,31 @@
<!-- <el-form-item label="派工单号" prop="dispatchCode">-->
<!-- <el-input v-model="form.dispatchCode" placeholder="请输入派工单号" />-->
<!-- </el-form-item>-->
<el-form-item label="物料名称" prop="materialId">
<el-input v-model="form.materialName" placeholder="请点击检索物料" @click="handleMaterialAdd" readonly>
<el-form-item label='物料名称' prop='materialId'>
<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>
<el-form-item label="物料BOM" prop="materialBoMName">
<el-input v-model="form.materialBoMName" placeholder="请点击检索物料BOM" @click="handleMaterialBomAdd" readonly>
<el-form-item label='物料BOM' prop='materialBoMName'>
<el-input v-model='form.materialBoMName' placeholder='请点击检索物料BOM' @click='handleMaterialBomAdd' 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>
<el-form-item label="工序名称" prop="processId">
<el-select v-model="form.processId" placeholder="请选择工序">
<el-form-item label='工序名称' prop='processId'>
<el-select v-model='form.processId' placeholder='请选择工序'>
<el-option
v-for="item in processList"
:key="item.processId"
:label="item.processName"
:value="item.processId"
v-for='item in processList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
@ -218,119 +237,286 @@
<!-- >{{dict.label}}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="下达类型" prop="releaseType">
<el-radio-group v-model="form.releaseType" :disabled="true" >
<el-form-item label='下达类型' prop='releaseType'>
<el-radio-group v-model='form.releaseType' :disabled='true'>
<el-radio
v-for="dict in mes_release_type"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
v-for='dict in mes_release_type'
:key='dict.value'
:value='dict.value'
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="机台" prop="releaseId">
<el-select v-model="form.releaseId" placeholder="请选择">
<el-form-item label='机台' prop='releaseId'>
<el-select v-model='form.releaseId' placeholder='请选择'>
<el-option
v-for="item in releaseList"
:key="item.machineId"
:label="item.machineName"
:value="item.machineId"
v-for='item in releaseList'
:key='item.machineId'
:label='item.machineName'
:value='item.machineId'
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="单位生产时间(秒)" prop="productionTime">-->
<!-- <el-input v-model="form.productionTime" placeholder="请输入单位生产时间(秒)" />-->
<!-- </el-form-item>-->
<el-form-item label="计划数量" prop="planAmount">
<el-input-number v-model="form.planAmount" placeholder="请输入计划数量" style="width: 200px;" />
<el-form-item label='计划数量' prop='planAmount'>
<el-input-number v-model='form.planAmount' placeholder='请输入计划数量' style='width: 200px;' />
</el-form-item>
<!-- <el-form-item label="派工数量" prop="dispatchAmount">-->
<!-- <el-input-number v-model="form.dispatchAmount" placeholder="请输入派工数量" style="width: 200px;" />-->
<!-- </el-form-item>-->
<el-form-item label="计划开始时间" prop="planBeginTime">
<el-form-item label='计划开始时间' prop='planBeginTime'>
<el-date-picker clearable
v-model="form.planBeginTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择计划开始时间">
v-model='form.planBeginTime'
type='datetime'
value-format='YYYY-MM-DD HH:mm:ss'
placeholder='请选择计划开始时间'>
</el-date-picker>
</el-form-item>
<el-form-item label="计划结束时间" prop="planEndTime">
<el-form-item label='计划结束时间' prop='planEndTime'>
<el-date-picker clearable
v-model="form.planEndTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择计划结束时间">
v-model='form.planEndTime'
type='datetime'
value-format='YYYY-MM-DD HH:mm:ss'
placeholder='请选择计划结束时间'>
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="附件信息" prop="attachId">-->
<!-- <el-input v-model="form.attachId" placeholder="请输入附件信息" />-->
<!-- </el-form-item>-->
<el-form-item label="优先级" prop="priority">
<el-input-number v-model="form.priority" placeholder="请输入优先级" style="width: 200px;" />
<el-form-item label='优先级' prop='priority'>
<el-input-number v-model='form.priority' placeholder='请输入优先级' style='width: 200px;' />
</el-form-item>
<el-form-item label="班次" prop="shiftId">
<el-radio-group v-model="form.shiftId">
<el-form-item label='班次' prop='shiftId'>
<el-radio-group v-model='form.shiftId'>
<el-radio
v-for="dict in shiftList"
:key="dict.shiftId"
:value="dict.shiftId"
>{{dict.shiftName}}</el-radio>
v-for='dict in shiftList'
:key='dict.shiftId'
:value='dict.shiftId'
>{{ dict.shiftName }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="班组" prop="classTeamId">
<el-select v-model="form.classTeamId" placeholder="请选择班组">
<el-form-item label='班组' prop='classTeamId'>
<el-select v-model='form.classTeamId' placeholder='请选择班组'>
<el-option
v-for="item in classTeamList"
:key="item.classTeamId"
:label="item.teamName"
:value="item.classTeamId"
v-for='item in classTeamList'
:key='item.classTeamId'
:label='item.teamName'
:value='item.classTeamId'
/>
</el-select>
</el-form-item>
<el-form-item label="模号" prop="modelCode">
<el-radio-group v-model="form.modelCode">
<el-form-item label='模号' prop='modelCode'>
<el-radio-group v-model='form.modelCode'>
<el-radio
v-for="dict in mes_model_code"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
v-for='dict in mes_model_code'
:key='dict.value'
:value='dict.value'
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item label='备注' prop='remark'>
<el-input v-model='form.remark' placeholder='请输入备注' />
</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 class='dialog-footer'>
<el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
<el-button @click='cancel'>取 消</el-button>
</div>
</template>
</el-dialog>
<!-- 添加物料BOM信息对话框 -->
<el-dialog title="选择物料BOM信息" v-model="materialBomOpen" append-to-body>
<BomSelect @selection="handleSelection" ref="bomSelectRef" v-if="materialBomOpen"></BomSelect>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitMaterialBomForm">确 定</el-button>
<el-button @click="materialBomOpen = false">取 消</el-button>
<el-dialog title='选择物料BOM信息' v-model='materialBomOpen' append-to-body>
<BomSelect @selection='handleSelection' ref='bomSelectRef' v-if='materialBomOpen'></BomSelect>
<div slot='footer' class='dialog-footer'>
<el-button type='primary' @click='submitMaterialBomForm'>确 定</el-button>
<el-button @click='materialBomOpen = false'>取 消</el-button>
</div>
</el-dialog>
<!-- 添加物料信息对话框 -->
<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>
<!-- 批量添加生产工单信息对话框 -->
<el-dialog :title='batchDialog.title' v-model='batchDialog.visible' width='1000px' append-to-body>
<el-form ref='planInfoFormRef' :model='form' :rules='rules' label-width='100px'>
<el-row :gutter='10' class='mb8'>
<el-col :span='12'>
<el-form-item label='物料名称' prop='materialId'>
<el-input v-model='form.materialName' placeholder='请点击检索物料' @click='handleMaterialAdd' readonly>
<template #append>
<el-icon class='el-input__icon'>
<search />
</el-icon>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label='物料BOM' prop='materialBoMName'>
<el-input v-model='form.materialBoMName' placeholder='请点击检索物料BOM' @click='handleMaterialBomAdd' readonly>
<template #append>
<el-icon class='el-input__icon'>
<search />
</el-icon>
</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter='10' class='mb8'>
<el-col :span='12'>
<el-form-item label='工序名称' prop='processId'>
<el-select v-model='form.processId' placeholder='请选择工序'>
<el-option
v-for='item in processList'
: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='releaseType'>-->
<!-- <el-radio-group v-model='form.releaseType' :disabled='true'>-->
<!-- <el-radio-->
<!-- v-for='dict in mes_release_type'-->
<!-- :key='dict.value'-->
<!-- :value='dict.value'-->
<!-- >{{ dict.label }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label='机台名称' prop='releaseId'>
<el-select v-model='form.releaseId' placeholder='请选择机台名称'>
<el-option
v-for='item in releaseList'
:key='item.machineId'
:label='item.machineName'
:value='item.machineId'
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter='10' class='mb8'>
<el-col :span='12'>
<el-form-item label='计划开始时间' prop='planBeginTime'>
<el-date-picker clearable
v-model='form.planBeginTime'
type='datetime'
value-format='YYYY-MM-DD HH:mm:ss'
placeholder='请选择计划开始时间'>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label='计划结束时间' prop='planEndTime'>
<el-date-picker clearable
v-model='form.planEndTime'
type='datetime'
value-format='YYYY-MM-DD HH:mm:ss'
placeholder='请选择计划结束时间'>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-form-item label='班组' prop='classTeamId'>
<el-select v-model='form.classTeamId' placeholder='请选择班组'>
<el-option
v-for='item in classTeamList'
:key='item.classTeamId'
:label='item.teamName'
:value='item.classTeamId'
/>
</el-select>
</el-form-item>
<el-row :gutter='10' class='mb8'>
<el-col :span='12'>
<el-form-item label='左模早班数量' prop='planAmount1'>
<el-input-number v-model='form.planAmount1' placeholder='请输入计划数量' style='width: 200px;' />
</el-form-item>
<el-form-item label='左模中班数量' prop='planAmount2'>
<el-input-number v-model='form.planAmount2' placeholder='请输入计划数量' style='width: 200px;' />
</el-form-item>
<el-form-item label='左模晚班数量' prop='planAmount3'>
<el-input-number v-model='form.planAmount3' placeholder='请输入计划数量' style='width: 200px;' />
</el-form-item>
</el-col>
<el-col :span='12'>
<el-form-item label='右模早班数量' prop='planAmount4'>
<el-input-number v-model='form.planAmount4' placeholder='请输入计划数量' style='width: 200px;' />
</el-form-item>
<el-form-item label='右模中班数量' prop='planAmount5'>
<el-input-number v-model='form.planAmount5' placeholder='请输入计划数量' style='width: 200px;' />
</el-form-item>
<el-form-item label='右模晚班数量' prop='planAmount6'>
<el-input-number v-model='form.planAmount6' placeholder='请输入计划数量' style='width: 200px;' />
</el-form-item>
</el-col>
</el-row>
<!-- <el-form-item label="附件信息" prop="attachId">-->
<!-- <el-input v-model="form.attachId" placeholder="请输入附件信息" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label='优先级' prop='priority'>-->
<!-- <el-input-number v-model='form.priority' placeholder='请输入优先级' style='width: 200px;' />-->
<!-- </el-form-item>-->
<!-- <el-form-item label='班次' prop='shiftId'>-->
<!-- <el-radio-group v-model='form.shiftId'>-->
<!-- <el-radio-->
<!-- v-for='dict in shiftList'-->
<!-- :key='dict.shiftId'-->
<!-- :value='dict.shiftId'-->
<!-- >{{ dict.shiftName }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label='模号' prop='modelCode'>-->
<!-- <el-radio-group v-model='form.modelCode'>-->
<!-- <el-radio-->
<!-- v-for='dict in mes_model_code'-->
<!-- :key='dict.value'-->
<!-- :value='dict.value'-->
<!-- >{{ dict.label }}-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- <el-form-item label='备注' prop='remark'>-->
<!-- <el-input v-model='form.remark' placeholder='请输入备注' />-->
<!-- </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="PlanInfo" lang="ts">
import { listPlanInfo, getPlanInfo, delPlanInfo, addPlanInfo, updatePlanInfo } from '@/api/mes/planInfo';
<script setup name='PlanInfo' lang='ts'>
import {
listPlanInfo,
getPlanInfo,
delPlanInfo,
addPlanInfo,
updatePlanInfo,
orderAddProductPlanList
} from '@/api/mes/planInfo';
import { PlanInfoVO, PlanInfoQuery, PlanInfoForm } from '@/api/mes/planInfo/types';
import { getBaseShiftInfoList } from '@/api/mes/baseShiftInfo';
import { getBaseClassTeamInfoList } from '@/api/mes/baseClassTeamInfo';
@ -341,7 +527,14 @@ import { getStationInfoList } from '@/api/mes/baseStationInfo';
import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { mes_import_flag, active_flag, mes_plan_status, mes_release_type, mes_finish_flag, mes_model_code } = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code'));
const {
mes_import_flag,
active_flag,
mes_plan_status,
mes_release_type,
mes_finish_flag,
mes_model_code
} = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code'));
const planInfoList = ref<PlanInfoVO[]>([]);
const buttonLoading = ref(false);
@ -360,6 +553,11 @@ const dialog = reactive<DialogOption>({
title: ''
});
const batchDialog = reactive<DialogOption>({
visible: false,
title: ''
});
const shiftList = ref([]);
const classTeamList = ref([]);
const processList = ref([]);
@ -399,11 +597,11 @@ const getReleaseSelect = async () => {
const columns = ref<FieldOption[]>([
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `租户编号`, visible: false },
{ key: 2, label: `生产订单ID`, visible: true },
{ key: 2, label: `生产订单ID`, visible: false },
{ key: 3, label: `销售订单ID`, visible: false },
{ key: 4, label: `销售订单编号`, visible: false },
{ key: 5, label: `计划编号`, visible: true },
{ key: 6, label: `派工单号`, visible: true },
{ key: 6, label: `派工单号`, visible: false },
{ key: 7, label: `物料名称`, visible: true },
{ key: 8, label: `物料BOM`, visible: true },
{ key: 9, label: `工序名称`, visible: true },
@ -433,7 +631,7 @@ const columns = ref<FieldOption[]>([
{ key: 33, label: `创建人`, visible: false },
{ key: 34, label: `创建时间`, visible: false },
{ key: 35, label: `更新人`, visible: false },
{ key: 36, label: `更新时间`, visible: false },
{ key: 36, label: `更新时间`, visible: false }
]);
const initFormData: PlanInfoForm = {
@ -470,7 +668,7 @@ const initFormData: PlanInfoForm = {
remark: undefined,
materialBoMName: undefined,
workshopId: undefined
}
};
const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
form: { ...initFormData },
queryParams: {
@ -507,22 +705,24 @@ const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
classTeamId: undefined,
modelCode: undefined,
workshopId: undefined,
params: {
}
params: {}
},
rules: {
materialId: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
{ required: true, message: '物料名称不能为空', trigger: 'blur' }
],
processId: [
{ required: true, message: "工序不能为空", trigger: "blur" }
{ required: true, message: '工序不能为空', trigger: 'blur' }
],
releaseId: [
{ required: true, message: '机台名称不能为空', trigger: 'blur' }
],
materialName: [
{ required: true, message: "物料BOM不能为空", trigger: "blur" }
{ required: true, message: '物料BOM不能为空', trigger: 'blur' }
],
planAmount: [
{ required: true, message: "计划数量不能为空", trigger: "blur" }
],
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
]
}
});
@ -537,124 +737,185 @@ const getWorkshopId = async () => {
console.log(workshopId.value);
}
/** 查询生产工单信息列表 */
/** 查询生产计划信息列表 */
const getList = async () => {
loading.value = true;
const res = await listPlanInfo(queryParams.value);
planInfoList.value = res.rows;
total.value = res.total;
loading.value = false;
}
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
batchDialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
form.value.workshopId = workshopId.value;
planInfoFormRef.value?.resetFields();
}
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
};
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: PlanInfoVO[]) => {
ids.value = selection.map(item => item.planId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加生产工单信息";
}
dialog.title = '添加生产计划信息';
};
/** 新增按钮操作 */
const handleBatchAdd = () => {
reset();
batchDialog.visible = true;
batchDialog.title = '批量添加生产计划信息';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: PlanInfoVO) => {
reset();
const _planId = row?.planId || ids.value[0]
const _planId = row?.planId || ids.value[0];
const res = await getPlanInfo(_planId);
Object.assign(form.value, res.data);
form.value.finishFlag = form.value.finishFlag.split(",");
form.value.finishFlag = form.value.finishFlag.split(',');
dialog.visible = true;
dialog.title = "修改生产工单信息";
}
dialog.title = '修改生产计划信息';
};
/** 提交按钮 */
const submitForm = () => {
planInfoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
form.value.finishFlag = form.value.finishFlag.join(",");
form.value.finishFlag = form.value.finishFlag.join(',');
if (form.value.planId) {
await updatePlanInfo(form.value).finally(() => buttonLoading.value = false);
} else if (batchDialog.visible) {
let assemblyData = batchesAddAssemblyData();
await orderAddProductPlanList({ mesProductPlanList: assemblyData, productOrderId: 0 }).finally(() => buttonLoading.value = false);
} else {
await addPlanInfo(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
batchDialog.visible = false;
await getList();
}
});
};
/** 批量新增组装数据 */
const batchesAddAssemblyData = () => {
const formData = form.value;
let list = [];
if (formData.planAmount1 > 0) {
let data = { ...formData };
data.modelCode = 'L';
data.shiftId = '1';
data.planAmount = formData.planAmount1;
list.push(data);
}
if (formData.planAmount2 > 0) {
let data = { ...formData };
data.modelCode = 'L';
data.shiftId = '2';
data.planAmount = formData.planAmount2;
list.push(data);
}
if (formData.planAmount3 > 0) {
let data = { ...formData };
data.modelCode = 'L';
data.shiftId = '3';
data.planAmount = formData.planAmount3;
list.push(data);
}
if (formData.planAmount4 > 0) {
let data = { ...formData };
data.modelCode = 'R';
data.shiftId = '1';
data.planAmount = formData.planAmount4;
list.push(data);
}
if (formData.planAmount5 > 0) {
let data = { ...formData };
data.modelCode = 'R';
data.shiftId = '2';
data.planAmount = formData.planAmount5;
list.push(data);
}
if (formData.planAmount6 > 0) {
let data = { ...formData };
data.modelCode = 'R';
data.shiftId = '3';
data.planAmount = formData.planAmount6;
list.push(data);
}
return list;
};
/** 删除按钮操作 */
const handleDelete = async (row?: PlanInfoVO) => {
const _planIds = row?.planId || ids.value;
await proxy?.$modal.confirm('是否确认删除生产工单信息编号为"' + _planIds + '"的数据项？').finally(() => loading.value = false);
await proxy?.$modal.confirm('是否确认删除生产计划信息编号为"' + _planIds + '"的数据项？').finally(() => loading.value = false);
await delPlanInfo(_planIds);
proxy?.$modal.msgSuccess("删除成功");
proxy?.$modal.msgSuccess('删除成功');
await getList();
}
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('mes/planInfo/export', {
...queryParams.value
}, `planInfo_${new Date().getTime()}.xlsx`)
}
}, `planInfo_${new Date().getTime()}.xlsx`);
};
/** 新增按钮操作 */
const handleMaterialBomAdd = () => {
materialBomOpen.value = true;
}
};
/** 提交物料BOM信息按钮 */
const submitMaterialBomForm = () => {
let selectedRow = bomSelectRef.value.tableRef.store.states.currentRow.value;
form.value.materialBomId = selectedRow.materialBomId
form.value.materialBoMName = selectedRow.materialName
form.value.materialBomId = selectedRow.materialBomId;
form.value.materialBoMName = selectedRow.materialName;
materialBomOpen.value = false;
}
};
/** 新增按钮操作 */
const handleMaterialAdd = () => {
materialOpen.value = true;
}
};
/** 提交物料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;
}
};
onMounted(() => {
getWorkshopId();
@ -669,7 +930,7 @@ onMounted(() => {
watch(
() => form.value.processId, (newValue, oldValue) => {
// 监听到变化时执行的函数
getReleaseSelect(); // 调用你的方法
getReleaseSelect();
}
);
</script>

Write Preview
Loading…
Cancel
Save