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

Merge remote-tracking branch 'origin/master'

Browse Source
master
夜笙歌 7 months ago
parent 6ce3097c37 62eacaff7e
commit 866839690e
12 changed files with 1567 additions and 434 deletions
Show Stats Download Patch File Download Diff File

29
src/api/qms/QcInspectionMain/index.ts
Unescape Escape View File

@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios';
import { QcInspectionMainVO, QcInspectionMainForm, QcInspectionMainQuery } from '@/api/qms/QcInspectionMain/types';
/**
* 查询质检主表列表
* 查询质检任务列表
* @param query
* @returns {*}
*/
@ -17,7 +17,7 @@ export const listQcInspectionMain = (query?: QcInspectionMainQuery): AxiosPromis
};
/**
* 查询质检主表详细
* 查询质检任务详细
* @param inspectionId
*/
export const getQcInspectionMain = (inspectionId: string | number): AxiosPromise<QcInspectionMainVO> => {
@ -28,7 +28,7 @@ export const getQcInspectionMain = (inspectionId: string | number): AxiosPromise
};
/**
* 新增质检主表
* 新增质检任务
* @param data
*/
export const addQcInspectionMain = (data: QcInspectionMainForm) => {
@ -40,7 +40,7 @@ export const addQcInspectionMain = (data: QcInspectionMainForm) => {
};
/**
* 修改质检主表
* 修改质检任务
* @param data
*/
export const updateQcInspectionMain = (data: QcInspectionMainForm) => {
@ -52,7 +52,7 @@ export const updateQcInspectionMain = (data: QcInspectionMainForm) => {
};
/**
* 删除质检主表
* 删除质检任务
* @param inspectionId
*/
export const delQcInspectionMain = (inspectionId: string | number | Array<string | number>) => {
@ -64,7 +64,7 @@ export const delQcInspectionMain = (inspectionId: string | number | Array<string
/**
* 下拉框查询质检主表列表
* 下拉框查询质检任务列表
* @param query
* @returns {*}
*/
@ -75,20 +75,3 @@ export function getQcInspectionMainList (query) {
params: query
});
};
/**
* 导入数据
*
* @param file 导入文件
* @param updateSupport 是否更新已存在数据
*/
export const importData = (file: File, updateSupport: boolean) => {
const formData = new FormData();
formData.append('file', file);
formData.append('updateSupport', updateSupport.toString());
return request({
url: '/qms/QcInspectionMain/importData',
method: 'post',
data: formData
});
};

88
src/api/qms/QcInspectionMain/types.ts
Unescape Escape View File

@ -9,6 +9,11 @@ export interface QcInspectionMainVO {
*/
inspectionNo: string;
/**
* 关联模板主表ID
*/
templateId: string | number;
/**
* 物料编码
*/
@ -60,9 +65,9 @@ export interface QcInspectionMainVO {
workshop: string;
/**
* 检测类型主键
* 检验类别（首检/过程检等等）
*/
typeId: string | number;
inspectionType: number;
/**
* 单据状态（0未处理/1完成）
@ -114,22 +119,11 @@ export interface QcInspectionMainVO {
*/
remark: string;
/**
* 关联检测类型表
/**
* 模板名称
*/
qcInspectionType: string;
templateName: string;//join
/**
* 关联检测类型表名称
*/
typeName: string;
/**
* 关联检测类型表编码
*/
typeCode: string;
}
@ -144,6 +138,11 @@ export interface QcInspectionMainForm extends BaseEntity {
*/
inspectionNo?: string;
/**
* 关联模板主表ID
*/
templateId?: string | number;
/**
* 物料编码
*/
@ -195,9 +194,9 @@ export interface QcInspectionMainForm extends BaseEntity {
workshop?: string;
/**
* 检测类型主键
* 检验类别（首检/过程检等等）
*/
typeId?: string | number;
inspectionType?: number;
/**
* 单据状态（0未处理/1完成）
@ -249,25 +248,10 @@ export interface QcInspectionMainForm extends BaseEntity {
*/
remark?: string;
/**
* 关联检测类型表
/**
* 模板名称
*/
qcInspectionType?: string;
/**
* 关联检测类型表名称
*/
typeName?: string;
/**
* 关联检测类型表编码
*/
typeCode?: string;
templateName?: string;//join
}
@ -283,6 +267,11 @@ export interface QcInspectionMainQuery extends PageQuery {
*/
inspectionNo?: string;
/**
* 关联模板主表ID
*/
templateId?: string | number;
/**
* 物料编码
*/
@ -334,9 +323,9 @@ export interface QcInspectionMainQuery extends PageQuery {
workshop?: string;
/**
* 检测类型主键
* 检验类别（首检/过程检等等）
*/
typeId?: string | number;
inspectionType?: number;
/**
* 单据状态（0未处理/1完成）
@ -383,25 +372,12 @@ export interface QcInspectionMainQuery extends PageQuery {
*/
supplierName?: string;
/**
* 关联检测类型表
*/
qcInspectionType?: string;
/**
* 关联检测类型表名称
*/
typeName?: string;
/**
* 关联检测类型表编码
*/
typeCode?: string;
/**
* 模板名称
*/
templateName?: string;//join
/**
* 日期范围参数

41
src/api/qms/qcInspectionItemCategory/types.ts
Unescape Escape View File

@ -34,20 +34,6 @@ export interface QcInspectionItemCategoryVO {
*/
description: string;
/**
* 检测类型名称
*/
qcInspectionType?: string;
/**
* 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
*/
typeName?: string | number;
/**
* 子对象
*/
children: QcInspectionItemCategoryVO[];
}
export interface QcInspectionItemCategoryForm extends BaseEntity {
@ -86,19 +72,9 @@ export interface QcInspectionItemCategoryForm extends BaseEntity {
*/
description?: string;
/**
* 检测类型名称
*/
qcInspectionType?: string;
/**
* 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
*/
typeName?: string | number;
}
export interface QcInspectionItemCategoryQuery {
export interface QcInspectionItemCategoryQuery extends PageQuery {
/**
* 检测项类别主键
@ -136,20 +112,9 @@ export interface QcInspectionItemCategoryQuery {
description?: string;
/**
* 检测类型名称
* 日期范围参数
*/
qcInspectionType?: string;
/**
* 检测类型(字典：首检 专检 自检 互检 原材料检 抽检 成品检）
*/
typeName?: string | number;
/**
* 日期范围参数
*/
params?: any;
params?: any;
}

17
src/api/qms/qcInspectionResult/index.ts
Unescape Escape View File

@ -75,20 +75,3 @@ export function getQcInspectionResultList (query) {
params: query
});
};
/**
* 导入数据
*
* @param file 导入文件
* @param updateSupport 是否更新已存在数据
*/
export const importData = (file: File, updateSupport: boolean) => {
const formData = new FormData();
formData.append('file', file);
formData.append('updateSupport', updateSupport.toString());
return request({
url: '/qms/qcInspectionResult/importData',
method: 'post',
data: formData
});
};

210
src/api/qms/qcInspectionResult/types.ts
Unescape Escape View File

@ -34,6 +34,76 @@ export interface QcInspectionResultVO {
*/
problemDetail: string;
/**
* 检测项编码（快照）
*/
itemCode: string;
/**
* 检测项名称（快照）
*/
itemName: string;
/**
* 检测位置（快照）
*/
inspectionPosition: string;
/**
* 检测项目类别（快照）
*/
categoryName: string;
/**
* 关联检测类型表（快照）
*/
typeId: string | number;
/**
* 检测方式（0定性,1定量）（快照）
*/
detectType: number;
/**
* 控制类型(0手动,1自动)（快照）
*/
controlType: number;
/**
* 标准值（快照）
*/
standardValue: number;
/**
* 控制上限（快照）
*/
upperLimit: number;
/**
* 控制下限（快照）
*/
lowerLimit: number;
/**
* 规格名称（快照）
*/
specName: string;
/**
* 规格上限（快照）
*/
specUpper: number;
/**
* 规格下限（快照）
*/
specLower: number;
/**
* 检测项说明（快照）
*/
description: string;
}
export interface QcInspectionResultForm extends BaseEntity {
@ -72,6 +142,76 @@ export interface QcInspectionResultForm extends BaseEntity {
*/
problemDetail?: string;
/**
* 检测项编码（快照）
*/
itemCode?: string;
/**
* 检测项名称（快照）
*/
itemName?: string;
/**
* 检测位置（快照）
*/
inspectionPosition?: string;
/**
* 检测项目类别（快照）
*/
categoryName?: string;
/**
* 关联检测类型表（快照）
*/
typeId?: string | number;
/**
* 检测方式（0定性,1定量）（快照）
*/
detectType?: number;
/**
* 控制类型(0手动,1自动)（快照）
*/
controlType?: number;
/**
* 标准值（快照）
*/
standardValue?: number;
/**
* 控制上限（快照）
*/
upperLimit?: number;
/**
* 控制下限（快照）
*/
lowerLimit?: number;
/**
* 规格名称（快照）
*/
specName?: string;
/**
* 规格上限（快照）
*/
specUpper?: number;
/**
* 规格下限（快照）
*/
specLower?: number;
/**
* 检测项说明（快照）
*/
description?: string;
}
export interface QcInspectionResultQuery extends PageQuery {
@ -111,6 +251,76 @@ export interface QcInspectionResultQuery extends PageQuery {
*/
problemDetail?: string;
/**
* 检测项编码（快照）
*/
itemCode?: string;
/**
* 检测项名称（快照）
*/
itemName?: string;
/**
* 检测位置（快照）
*/
inspectionPosition?: string;
/**
* 检测项目类别（快照）
*/
categoryName?: string;
/**
* 关联检测类型表（快照）
*/
typeId?: string | number;
/**
* 检测方式（0定性,1定量）（快照）
*/
detectType?: number;
/**
* 控制类型(0手动,1自动)（快照）
*/
controlType?: number;
/**
* 标准值（快照）
*/
standardValue?: number;
/**
* 控制上限（快照）
*/
upperLimit?: number;
/**
* 控制下限（快照）
*/
lowerLimit?: number;
/**
* 规格名称（快照）
*/
specName?: string;
/**
* 规格上限（快照）
*/
specUpper?: number;
/**
* 规格下限（快照）
*/
specLower?: number;
/**
* 检测项说明（快照）
*/
description?: string;
/**
* 日期范围参数
*/

515
src/views/mes/baseMaterialInfo/addMaterialInQMS.vue
Unescape Escape View File

@ -0,0 +1,515 @@
<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="materialCode">
<el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="物料大类" prop="materialCategoryId">-->
<!-- <el-select v-model="queryParams.materialCategoryId" placeholder="请选择物料大类" clearable >-->
<!-- <el-option v-for="item in mategoryOptions"-->
<!-- :key="item.materialCategoryId"-->
<!-- :label="item.materialCategoryName"-->
<!-- :value="item.materialCategoryId"-->
<!-- />-->
<!-- </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-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<el-table v-loading="loading"
:data="baseMaterialInfoList"
ref="tableRef"
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
highlight-current-row
>
<!-- <el-table-column type="selection" width="55" align="center" />-->
<!-- <el-table-column label="主键标识" align="center" prop="materialId" v-if="columns[0].visible"/>-->
<!-- <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
<el-table-column label="ERP信息" align="center" prop="erpId" v-if="columns[0].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible" width="100"/>
<el-table-column label="旧物料编码" align="center" prop="oldMaterialCode" v-if="columns[2].visible" width="100"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[3].visible" width="150"/>
<el-table-column label="物料类型ID" align="center" prop="materialTypeId" v-if="columns[4].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategoryId" v-if="columns[5].visible">
</el-table-column>
<el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[6].visible"/>
<el-table-column label="批次标识" align="center" prop="batchFlag" v-if="columns[7].visible">
<template #default="scope">
<dict-tag :options="mes_batch_flag" :value="scope.row.batchFlag"/>
</template>
</el-table-column>
<el-table-column label="小批次数量" align="center" prop="batchAmount" v-if="columns[8].visible"/>
<el-table-column label="计量单位ID" align="center" prop="materialUnitId" v-if="columns[9].visible"/>
<el-table-column label="计量单位名称" align="center" prop="materialUnit" v-if="columns[10].visible" width="120"/>
<el-table-column label="物料组" align="center" prop="materialMatkl" v-if="columns[11].visible"/>
<el-table-column label="物料规格" align="center" prop="materialSpec" v-if="columns[12].visible"/>
<el-table-column label="净重" align="center" prop="netWeight" v-if="columns[13].visible"/>
<el-table-column label="毛重" align="center" prop="grossWeight" v-if="columns[14].visible"/>
<el-table-column label="绑定标识" align="center" prop="alwaysFlag" v-if="columns[15].visible">
<template #default="scope">
<dict-tag :options="always_flag" :value="scope.row.alwaysFlag"/>
</template>
</el-table-column>
<el-table-column label="所属工厂" align="center" prop="factoryName" v-if="columns[16].visible"/>
<el-table-column label="创建组织" align="center" prop="createOrgId" v-if="columns[17].visible"/>
<el-table-column label="使用组织" align="center" prop="useOrgId" v-if="columns[18].visible"/>
<el-table-column label="所属产线" align="center" prop="prodLineId" v-if="columns[19].visible"/>
<el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[20].visible">
<template #default="scope">
<dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
</template>
</el-table-column>
<el-table-column label="删除标识" align="center" prop="deletedFlag" v-if="columns[21].visible">
<template #default="scope">
<dict-tag :options="deleted_flag" :value="scope.row.deletedFlag"/>
</template>
</el-table-column>
<el-table-column label="采购计价单位" align="center" prop="purchasePriceUnitId" v-if="columns[22].visible"/>
<el-table-column label="审核日期" align="center" prop="approveDate" width="180" v-if="columns[23].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.approveDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="erp最后更新日期" align="center" prop="erpModifyDate" width="180" v-if="columns[24].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.erpModifyDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="最大库存数量" align="center" prop="maxStockAmount" v-if="columns[25].visible"/>
<el-table-column label="最小库存数量" align="center" prop="minStockAmount" v-if="columns[26].visible"/>
<el-table-column label="安全库存数量" align="center" prop="safeStockAmount" v-if="columns[27].visible"/>
<el-table-column label="申请标识" align="center" prop="applyFlag" v-if="columns[28].visible">
<template #default="scope">
<dict-tag :options="apply_flag" :value="scope.row.applyFlag"/>
</template>
</el-table-column>
<el-table-column label="物料分类" align="center" prop="materialClassfication" v-if="columns[29].visible">
<template #default="scope">
<dict-tag :options="material_classfication" :value="scope.row.materialClassfication"/>
</template>
</el-table-column>
<el-table-column label="自动出库标识" align="center" prop="autoOutstockFlag" v-if="columns[30].visible">
<template #default="scope">
<dict-tag :options="auto_outstock_flag" :value="scope.row.autoOutstockFlag"/>
</template>
</el-table-column>
<el-table-column label="辅料标识" align="center" prop="accessoriesFlag" v-if="columns[31].visible">
<template #default="scope">
<dict-tag :options="mes_accessories_flag" :value="scope.row.accessoriesFlag"/>
</template>
</el-table-column>
<el-table-column label="低值易耗品标识(1是 0否)" align="center" prop="lowValueConsumableFlag" v-if="columns[32].visible">
<template #default="scope">
<dict-tag :options="mes_low_value_consumable_flag" :value="scope.row.lowValueConsumableFlag"/>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" v-if="columns[33].visible"/>
<el-table-column label="层级" align="center" prop="plyrating" v-if="columns[34].visible"/>
<el-table-column label="花纹" align="center" prop="pattern" v-if="columns[35].visible"/>
<el-table-column label="速度级别" align="center" prop="speedLevel" v-if="columns[36].visible"/>
<el-table-column label="负荷载重" align="center" prop="load" v-if="columns[37].visible"/>
<el-table-column label="轮胎标记" align="center" prop="tireMarkings" v-if="columns[38].visible">
<template #default="scope">
<dict-tag :options="tire_markings" :value="scope.row.tireMarkings"/>
</template>
</el-table-column>
<el-table-column label="最小停放时间" align="center" prop="minParkingTime" v-if="columns[39].visible"/>
<el-table-column label="最大停放时间" align="center" prop="maxParkingTime" v-if="columns[40].visible"/>
<el-table-column label="标准重量" align="center" prop="standardWeight" v-if="columns[41].visible"/>
<el-table-column label="标准重量上限" align="center" prop="weightUpperLimit" v-if="columns[42].visible"/>
<el-table-column label="标准重量下限" align="center" prop="weightLowerLimit" v-if="columns[43].visible"/>
<el-table-column label="内胎标记" align="center" prop="innerTubeFlag" v-if="columns[44].visible">
<template #default="scope">
<dict-tag :options="inner_tube_flag" :value="scope.row.innerTubeFlag"/>
</template>
</el-table-column>
<el-table-column label="销售类型" align="center" prop="saleType" v-if="columns[45].visible">
<template #default="scope">
<dict-tag :options="sale_type" :value="scope.row.saleType"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[46].visible"/>
<!-- <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[49].visible"/>
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[50].visible"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[51].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[52].visible"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[53].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</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>
</div>
</template>
<script setup name="BaseMaterialInfo" lang="ts">
import {
listBaseMaterialInfo,
getBaseMaterialInfo,
delBaseMaterialInfo,
addBaseMaterialInfo,
updateBaseMaterialInfo,
} from '@/api/qms/baseMaterialInfo';
import { BaseMaterialInfoVO, BaseMaterialInfoQuery, BaseMaterialInfoForm } from '@/api/qms/baseMaterialInfo/types';
// import { getBaseMaterialCategoryListIn } from '@/api/qms/baseMaterialCategory';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { apply_flag, inner_tube_flag,
mes_material_categories, always_flag, mes_accessories_flag,
auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings,
material_classfication, mes_low_value_consumable_flag } = toRefs<any>(proxy?.useDict('apply_flag', 'inner_tube_flag', 'mes_material_categories', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag'));
const baseMaterialInfoList = ref<BaseMaterialInfoVO[]>([]);
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 dateRangeApproveDate = ref<[DateModelType, DateModelType]>(['', '']);
const queryFormRef = ref<ElFormInstance>();
const baseMaterialInfoFormRef = ref<ElFormInstance>();
const selectedRow = ref({});
const tableRef = ref()
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
// 列显隐信息
const columns = ref<FieldOption[]>([
/* { key: 0, label: `主键标识`, visible: true },
{ key: 1, label: `租户编号`, visible: true },*/
{ key: 0, label: `ERP信息`, visible: false },
{ key: 1, label: `物料编码`, visible: true },
{ key: 2, label: `旧物料编码`, visible: true },
{ key: 3, label: `物料名称`, visible: true },
{ key: 4, label: `物料类型ID`, visible: false },
{ key: 5, label: `物料大类`, visible: true },
{ key: 6, label: `物料小类`, visible: true },
{ key: 7, label: `批次标识`, visible: false },
{ key: 8, label: `小批次数量`, visible: false },
{ key: 9, label: `计量单位ID`, visible: false },
{ key: 10, label: `计量单位名称`, visible: true },
{ key: 11, label: `物料组`, visible: false },
{ key: 12, label: `物料规格`, visible: true },
{ key: 13, label: `净重`, visible: false },
{ key: 14, label: `毛重`, visible: false },
{ key: 15, label: `绑定标识`, visible: false },
{ key: 16, label: `所属工厂`, visible: false },
{ key: 17, label: `创建组织`, visible: false },
{ key: 18, label: `使用组织`, visible: false },
{ key: 19, label: `所属产线`, visible: false },
{ key: 20, label: `激活标识`, visible: false },
{ key: 21, label: `删除标识`, visible: false },
{ key: 22, label: `采购计价单位`, visible: false },
{ key: 23, label: `审核日期`, visible: false },
{ key: 24, label: `erp最后更新日期`, visible: false },
{ key: 25, label: `最大库存数量`, visible: false },
{ key: 26, label: `最小库存数量`, visible: false },
{ key: 27, label: `安全库存数量`, visible: false },
{ key: 28, label: `申请标识`, visible: false },
{ key: 29, label: `物料分类`, visible: false },
{ key: 30, label: `自动出库标识`, visible: false },
{ key: 31, label: `辅料标识`, visible: false },
{ key: 32, label: `低值易耗品标识`, visible: false },
{ key: 33, label: `品牌`, visible: true },
{ key: 34, label: `层级`, visible: true },
{ key: 35, label: `花纹`, visible: true },
{ key: 36, label: `速度级别`, visible: true },
{ key: 37, label: `负荷载重`, visible: true },
{ key: 38, label: `轮胎标记`, visible: true },
{ key: 39, label: `最小停放时间`, visible: false },
{ key: 40, label: `最大停放时间`, visible: false },
{ key: 41, label: `标准重量`, visible: false },
{ key: 42, label: `标准重量上限`, visible: false },
{ key: 43, label: `标准重量下限`, visible: false },
{ key: 44, label: `内胎标记`, visible: false },
{ key: 45, label: `销售类型`, visible: false },
{ key: 46, label: `备注`, visible: false },
/* { key: 49, label: `创建部门`, visible: true },
{ key: 50, label: `创建人`, visible: true },
{ key: 51, label: `创建时间`, visible: true },
{ key: 52, label: `更新人`, visible: true },
{ key: 53, label: `更新时间`, visible: true },*/
]);
const initFormData: BaseMaterialInfoForm = {
materialId: undefined,
erpId: undefined,
materialCode: undefined,
oldMaterialCode: undefined,
materialName: undefined,
materialTypeId: undefined,
materialCategoryId: undefined,
materialCategoryName: undefined,
materialSubclass: undefined,
batchFlag: undefined,
batchAmount: undefined,
materialUnitId: undefined,
materialUnit: undefined,
materialMatkl: undefined,
materialSpec: undefined,
netWeight: undefined,
grossWeight: undefined,
alwaysFlag: undefined,
factoryId: undefined,
createOrgId: undefined,
useOrgId: undefined,
prodLineId: undefined,
activeFlag: '1',
deletedFlag: undefined,
purchasePriceUnitId: undefined,
approveDate: undefined,
erpModifyDate: undefined,
maxStockAmount: undefined,
minStockAmount: undefined,
safeStockAmount: undefined,
applyFlag: undefined,
materialClassfication: undefined,
autoOutstockFlag: undefined,
accessoriesFlag: undefined,
lowValueConsumableFlag: undefined,
brand: undefined,
plyrating: undefined,
pattern: undefined,
speedLevel: undefined,
load: undefined,
tireMarkings: undefined,
minParkingTime: undefined,
maxParkingTime: undefined,
standardWeight: undefined,
weightUpperLimit: undefined,
weightLowerLimit: undefined,
innerTubeFlag: undefined,
saleType: undefined,
remark: undefined,
}
const data = reactive<PageData<BaseMaterialInfoForm, BaseMaterialInfoQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
materialId: undefined,
erpId: undefined,
materialCode: undefined,
oldMaterialCode: undefined,
materialName: undefined,
materialTypeId: undefined,
materialCategoryId: undefined,
materialCategoryName: undefined,
materialSubclass: undefined,
batchFlag: undefined,
batchAmount: undefined,
materialUnitId: undefined,
materialUnit: undefined,
materialMatkl: undefined,
materialSpec: undefined,
netWeight: undefined,
grossWeight: undefined,
alwaysFlag: undefined,
factoryId: undefined,
createOrgId: undefined,
useOrgId: undefined,
prodLineId: undefined,
activeFlag: undefined,
deletedFlag: undefined,
purchasePriceUnitId: undefined,
erpModifyDate: undefined,
maxStockAmount: undefined,
minStockAmount: undefined,
safeStockAmount: undefined,
applyFlag: undefined,
materialClassfication: undefined,
autoOutstockFlag: undefined,
accessoriesFlag: undefined,
lowValueConsumableFlag: undefined,
brand: undefined,
plyrating: undefined,
pattern: undefined,
speedLevel: undefined,
load: undefined,
tireMarkings: undefined,
minParkingTime: undefined,
maxParkingTime: undefined,
standardWeight: undefined,
weightUpperLimit: undefined,
weightLowerLimit: undefined,
innerTubeFlag: undefined,
saleType: undefined,
params: {
approveDate: undefined,
}
},
rules: {
erpId: [
{ required: true, message: "ERP信息不能为空", trigger: "blur" }
],
materialCode: [
{ required: true, message: "物料编码不能为空", trigger: "blur" }
],
materialName: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
],
}
});
const { queryParams, form, rules } = toRefs(data);
const props = defineProps({
materialTypeId: String ,
materialCategoryId: String,// 新增接收物料大类参数
});
const { materialTypeId, materialCategoryId } = toRefs(props);
const emits = defineEmits(['selection']); // 定义事件
/** 查询物料信息列表 */
const getList = async () => {
loading.value = true;
queryParams.value.params = {};
queryParams.value.materialTypeId = materialTypeId.value;
// 如果传入了物料大类，则设置查询参数并禁用修改
if (materialCategoryId.value) {
queryParams.value.materialCategoryId = materialCategoryId.value;
}
proxy?.addDateRange(queryParams.value, dateRangeApproveDate.value, 'ApproveDate');
const res = await listBaseMaterialInfo(queryParams.value);
baseMaterialInfoList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
baseMaterialInfoFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
dateRangeApproveDate.value = ['', ''];
queryFormRef.value?.resetFields();
handleQuery();
}
// /** 多选框选中数据 */
// const handleSelectionChange = (selection: BaseMaterialInfoVO[]) => {
// ids.value = selection.map(item => item.materialId);
// single.value = selection.length != 1;
// multiple.value = !selection.length;
// }
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加物料信息";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: BaseMaterialInfoVO) => {
reset();
const _materialId = row?.materialId || ids.value[0]
const res = await getBaseMaterialInfo(_materialId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改物料信息";
}
/** 提交按钮 */
const submitForm = () => {
baseMaterialInfoFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.materialId) {
await updateBaseMaterialInfo(form.value).finally(() => buttonLoading.value = false);
} else {
await addBaseMaterialInfo(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: BaseMaterialInfoVO) => {
const _materialIds = row?.materialId || ids.value;
await proxy?.$modal.confirm('是否确认删除物料信息编号为"' + _materialIds + '"的数据项？').finally(() => loading.value = false);
await delBaseMaterialInfo(_materialIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('wms/baseMaterialInfo/export', {
...queryParams.value
}, `baseMaterialInfo_${new Date().getTime()}.xlsx`)
}
/** 选中列赋值 */
const handleRowClick = (row) => {
selectedRow.value = row;
// 触发选择事件，将完整的行数据传递给父组件
emits('selection', row);
};
//获取物料大类下拉框
let mategoryOptions = ref([]);
// const getMaterialCategorySelect = async () => {
// const res = await getBaseMaterialCategoryListIn(null);
// mategoryOptions.value = res.data;
// };
defineExpose({tableRef})
onMounted(() => {
// getMaterialCategorySelect();
getList();
});
</script>

19
src/views/mes/baseProcessInfo/index.vue
Unescape Escape View File

@ -437,6 +437,18 @@
<el-table-column type='selection' width='50' align='center' />
<el-table-column label='序号' align='center' prop='index' />
<el-table-column label='name' align='center' prop='userName' v-if='false' />
<el-table-column label='类型' align='center' prop='userType' >
<template #default='scope'>
<el-radio-group v-model='scope.row.userType'>
<el-radio
v-for='dict in mes_user_type'
:key='dict.value'
:value='dict.value'
>{{ dict.label }}
</el-radio>
</el-radio-group>
</template>
</el-table-column>
<el-table-column label='关联人员' align='center' prop='userId'>
<template #default='scope'>
<el-select v-model='scope.row.userId' filterable placeholder='请选择关联人员' clearable
@ -569,6 +581,7 @@ const {
mes_selection_mode,
tooling_type_code,
mes_required_flag,
mes_user_type,
mes_requires_preparation
} = toRefs<any>(proxy?.useDict(
'active_flag',
@ -582,6 +595,7 @@ const {
'mes_selection_mode',
'tooling_type_code',
'mes_required_flag',
'mes_user_type',
'mes_requires_preparation'
));
@ -906,7 +920,7 @@ const handleProdLineUpdate = async (row?: BaseProcessInfoVO) => {
reset();
const _processId = row?.processId || ids.value[0];
prodBaseProcessProdlineBoList.value = [];
const res = await getBaseProcessInfo(_processId);
form.value = res.data;
@ -928,7 +942,7 @@ const handleUserUpdate = async (row?: BaseProcessInfoVO) => {
reset();
const _processId = row?.processId || ids.value[0];
prodBaseProcessUserBoList.value = [];
const res = await getBaseProcessInfo(_processId);
form.value = res.data;
userOpen.value = true;
@ -978,6 +992,7 @@ const handleAddUser = () => {
prodBaseProcessUserBoList.value.push({
userId: null,
processId: form.value.processId, // 确保 processId 被正确赋值
userType: '1',
index: prodBaseProcessUserBoList.value.length + 1,
userName: null
});

669
src/views/qms/QcInspectionMain/index.vue
View File

File diff suppressed because it is too large Load Diff

40
src/views/qms/qcInspectionItem/index.vue
Unescape Escape View File

@ -107,11 +107,11 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="检测项主键" align="center" prop="itemId" v-if="columns[0].visible"/> -->
<el-table-column label="序号" type="index" width="50" align="center" v-if="columns[0].visible"/>
<el-table-column label="检测项编码" align="center" prop="itemCode" v-if="columns[1].visible"/>
<el-table-column label="检测项名称" align="center" prop="itemName" v-if="columns[2].visible"/>
<el-table-column label="检测项编码" align="center" width="100" prop="itemCode" v-if="columns[1].visible"/>
<el-table-column label="检测项名称" align="center" width="100" prop="itemName" v-if="columns[2].visible"/>
<el-table-column label="检测位置" align="center" prop="inspectionPosition" v-if="columns[3].visible"/>
<el-table-column label="检测类型" align="center" prop="typeName" v-if="columns[4].visible"/>
<el-table-column label="检测项类别" align="center" prop="categoryName" v-if="columns[5].visible"/>
<el-table-column label="检测项类别" align="center" width="100" prop="categoryName" v-if="columns[5].visible"/>
<el-table-column label="检测方法" align="center" prop="method" v-if="columns[6].visible">
<template #default="scope">
<dict-tag :options="qc_methond" :value="scope.row.method"/>
@ -133,10 +133,10 @@
<el-table-column label="规格名称" align="center" prop="specName" v-if="columns[12].visible"/>
<el-table-column label="规格上限" align="center" prop="specUpper" v-if="columns[13].visible"/>
<el-table-column label="规格下限" align="center" prop="specLower" v-if="columns[14].visible"/>
<el-table-column label="检测项说明" align="center" prop="description" v-if="columns[15].visible"/>
<el-table-column label="检测选项编码" align="center" prop="optionCode" v-if="columns[16].visible"/>
<el-table-column label="检测选项名称" align="center" prop="optionName" v-if="columns[17].visible"/>
<el-table-column label="是否默认选项" align="center" prop="isDefault" v-if="columns[18].visible">
<el-table-column label="说明" align="center" prop="description" v-if="columns[15].visible"/>
<!-- <el-table-column label="检测选项编码" align="center" prop="optionCode" v-if="columns[16].visible"/>-->
<!-- <el-table-column label="检测选项名称" align="center" prop="optionName" v-if="columns[17].visible"/>-->
<el-table-column label="是否默认选项" align="center" width="120" prop="isDefault" v-if="columns[16].visible">
<template #default="scope">
<dict-tag :options="is_default" :value="scope.row.isDefault"/>
</template>
@ -266,16 +266,16 @@
</el-row>
<el-row span="24">
<el-col :span="6">
<el-form-item label="检测选项编码" prop="optionCode">
<el-input v-model="form.optionCode" placeholder="请输入检测选项编码" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检测选项名称" prop="optionName">
<el-input v-model="form.optionName" placeholder="请输入检测选项名称" />
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item label="检测选项编码" prop="optionCode">-->
<!-- <el-input v-model="form.optionCode" placeholder="请输入检测选项编码" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="检测选项名称" prop="optionName">-->
<!-- <el-input v-model="form.optionName" placeholder="请输入检测选项名称" />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item label="是否默认选项" prop="isDefault">
<el-select v-model="form.isDefault" placeholder="请选择是否默认选项">
@ -345,9 +345,9 @@ const columns = ref<FieldOption[]>([
{ key: 13, label: `规格上限`, visible: true },
{ key: 14, label: `规格下限`, visible: true },
{ key: 15, label: `检测项说明`, visible: true },
{ key: 16, label: `检测选项编码`, visible: true },
{ key: 17, label: `检测选项名称`, visible: true },
{ key: 18, label: `是否默认选项`, visible: true },
// { key: 16, label: `检测选项编码`, visible: true },
// { key: 17, label: `检测选项名称`, visible: true },
{ key: 16, label: `是否默认选项`, visible: true },
// { key: 20, label: `创建人`, visible: true },
// { key: 21, label: `创建部门`, visible: true },
// { key: 22, label: `创建时间`, visible: true },

66
src/views/qms/qcInspectionItemCategory/index.vue
Unescape Escape View File

@ -32,9 +32,9 @@
<!-- <el-form-item label="祖级列表" prop="ancestors">-->
<!-- <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="检测项类别编码" prop="categoryCode" label-width="120px">
<el-input v-model="queryParams.categoryCode" placeholder="请输入检测项类别编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<!-- <el-form-item label="检测项类别编码" prop="categoryCode" label-width="120px">-->
<!-- <el-input v-model="queryParams.categoryCode" placeholder="请输入检测项类别编码" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label="检测项类别名称" prop="categoryName" label-width="120px">
<el-input v-model="queryParams.categoryName" placeholder="请输入检测项类别名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -62,9 +62,9 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['qms:qcInspectionItemCategory:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button type="primary" plain icon="Import" @click="handleImport">导入</el-button>
</el-col>
@ -75,10 +75,10 @@
ref="qcInspectionItemCategoryTableRef"
v-loading="loading"
:data="qcInspectionItemCategoryList"
row-key="categoryId"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<!-- row-key="categoryId"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"-->
<!-- <el-table-column label="检测项类别主键" align="center" prop="categoryId" />-->
<!-- <el-table-column label="父级ID" align="center" prop="parentId" />-->
<!-- <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
@ -91,9 +91,9 @@
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['qms:qcInspectionItemCategory:edit']" />
</el-tooltip>
<el-tooltip content="新增" placement="top">
<el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['qms:qcInspectionItemCategory:add']" />
</el-tooltip>
<!-- <el-tooltip content="新增" placement="top">-->
<!-- <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['qms:qcInspectionItemCategory:add']" />-->
<!-- </el-tooltip>-->
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['qms:qcInspectionItemCategory:remove']" />
</el-tooltip>
@ -108,16 +108,16 @@
<!-- <el-form-item label="检测项类别主键" prop="categoryId">-->
<!-- <el-input v-model="form.categoryId" placeholder="请输入检测项类别主键" />-->
<!-- </el-form-item>-->
<el-form-item label="父级" prop="parentId">
<el-tree-select
v-model="form.parentId"
:data="qcInspectionItemCategoryOptions"
:props="{ value: 'categoryId', label: 'categoryName', children: 'children' }"
value-key="categoryId"
placeholder="请选择父级"
check-strictly
/>
</el-form-item>
<!-- <el-form-item label="父级" prop="parentId">-->
<!-- <el-tree-select-->
<!-- v-model="form.parentId"-->
<!-- :data="qcInspectionItemCategoryOptions"-->
<!-- :props="{ value: 'categoryId', label: 'categoryName', children: 'children' }"-->
<!-- value-key="categoryId"-->
<!-- placeholder="请选择父级"-->
<!-- check-strictly-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="祖级列表" prop="ancestors">-->
<!-- <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />-->
<!-- </el-form-item>-->
@ -204,6 +204,8 @@ const initFormData: QcInspectionItemCategoryForm = {
const data = reactive<PageData<QcInspectionItemCategoryForm, QcInspectionItemCategoryQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
categoryId: undefined,
parentId: undefined,
ancestors: undefined,
@ -218,8 +220,8 @@ const data = reactive<PageData<QcInspectionItemCategoryForm, QcInspectionItemCat
// categoryId: [
// { required: true, message: "检测项类别主键不能为空", trigger: "blur" }
// ],
parentId: [
{ required: true, message: "父级不能为空", trigger: "blur" }
typeId: [
{ required: true, message: "检测类型不能为空", trigger: "blur" }
],
categoryCode: [
{ required: true, message: "检测项类别编码不能为空", trigger: "blur" }
@ -236,11 +238,13 @@ const { queryParams, form, rules } = toRefs(data);
const getList = async () => {
loading.value = true;
const res = await listQcInspectionItemCategory(queryParams.value);
const data = proxy?.handleTree<QcInspectionItemCategoryVO>(res.data, "categoryId", "parentId");
if (data) {
qcInspectionItemCategoryList.value = data;
loading.value = false;
}
// const data = proxy?.handleTree<QcInspectionItemCategoryVO>(res.data, "categoryId", "parentId");
// if (data) {
// qcInspectionItemCategoryList.value = data;
// loading.value = false;
// }
qcInspectionItemCategoryList.value = res.rows;
loading.value = false;
}
/** 查询检测项类别下拉树结构 */
@ -278,7 +282,7 @@ const resetQuery = () => {
/** 新增按钮操作 */
const handleAdd = (row?: QcInspectionItemCategoryVO) => {
reset();
getTreeselect();
// getTreeselect();
if (row != null && row.categoryId) {
form.value.parentId = row.categoryId;
} else {
@ -305,7 +309,7 @@ const toggleExpandAll = (data: QcInspectionItemCategoryVO[], status: boolean) =>
/** 修改按钮操作 */
const handleUpdate = async (row: QcInspectionItemCategoryVO) => {
reset();
await getTreeselect();
// await getTreeselect();
if (row != null) {
form.value.parentId = row.parentId;
}

247
src/views/qms/qcInspectionResult/index.vue
Unescape Escape View File

@ -3,7 +3,7 @@
<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" label-width='100px'>
<el-form ref="queryFormRef" :model="queryParams" :inline="true" >
<!-- <el-form-item label="结果主键" prop="resultId">
<el-input v-model="queryParams.resultId" placeholder="请输入结果主键" clearable @keyup.enter="handleQuery" />
</el-form-item>
@ -12,13 +12,13 @@
</el-form-item>
<el-form-item label="关联检测项ID" prop="itemId">
<el-input v-model="queryParams.itemId" placeholder="请输入关联检测项ID" clearable @keyup.enter="handleQuery" />
</el-form-item>
</el-form-item> -->
<el-form-item label="检测结果" prop="detectResult">
<el-select v-model="queryParams.detectResult" placeholder="请选择检测结果" clearable >
<el-option v-for="dict in qc_result" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="定量检测值" prop="detectValue">
<!-- <el-form-item label="定量检测值" prop="detectValue">
<el-input v-model="queryParams.detectValue" placeholder="请输入定量检测值" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格质检值" prop="specInspection">
@ -26,6 +26,52 @@
</el-form-item>
<el-form-item label="定性不合格明细" prop="problemDetail">
<el-input v-model="queryParams.problemDetail" placeholder="请输入定性不合格明细" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项编码" prop="itemCode">
<el-input v-model="queryParams.itemCode" placeholder="请输入检测项编码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项名称" prop="itemName">
<el-input v-model="queryParams.itemName" placeholder="请输入检测项名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测位置" prop="inspectionPosition">
<el-input v-model="queryParams.inspectionPosition" placeholder="请输入检测位置" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项目类别" prop="categoryName">
<el-input v-model="queryParams.categoryName" placeholder="请输入检测项目类别" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="关联检测类型表" prop="typeId">
<el-input v-model="queryParams.typeId" placeholder="请输入关联检测类型表" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item label="检测方式" prop="detectType">
<el-select v-model="queryParams.detectType" placeholder="请选择检测方式" clearable >
<el-option v-for="dict in detect_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="控制类型(0手动,1自动)" prop="controlType">
<el-select v-model="queryParams.controlType" placeholder="请选择控制类型(0手动,1自动)" clearable >
<el-option v-for="dict in control_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<!-- <el-form-item label="标准值" prop="standardValue">
<el-input v-model="queryParams.standardValue" placeholder="请输入标准值" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="控制上限" prop="upperLimit">
<el-input v-model="queryParams.upperLimit" placeholder="请输入控制上限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="控制下限" prop="lowerLimit">
<el-input v-model="queryParams.lowerLimit" placeholder="请输入控制下限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格名称" prop="specName">
<el-input v-model="queryParams.specName" placeholder="请输入规格名称" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格上限" prop="specUpper">
<el-input v-model="queryParams.specUpper" placeholder="请输入规格上限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="规格下限" prop="specLower">
<el-input v-model="queryParams.specLower" placeholder="请输入规格下限" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="检测项说明" prop="description">
<el-input v-model="queryParams.description" placeholder="请输入检测项说明" clearable @keyup.enter="handleQuery" />
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@ -57,9 +103,11 @@
<el-table v-loading="loading" :data="qcInspectionResultList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="resultId" v-if="columns[0].visible"/>
<el-table-column label="关联质检主表ID" align="center" prop="inspectionId" v-if="columns[1].visible"/>
<el-table-column label="关联检测项ID" align="center" prop="itemId" v-if="columns[2].visible"/>
<!-- <el-table-column label="结果主键" align="center" prop="resultId" v-if="columns[0].visible"/> -->
<!-- 自动序号 -->
<el-table-column label="序号" align="center" type="index" width="55" v-if="columns[0].visible"/>
<el-table-column label="关联质检主表" align="center" prop="inspectionId" v-if="columns[1].visible"/>
<el-table-column label="关联检测项" align="center" prop="itemName" v-if="columns[2].visible"/>
<el-table-column label="检测结果" align="center" prop="detectResult" v-if="columns[3].visible">
<template #default="scope">
<dict-tag :options="qc_result" :value="scope.row.detectResult"/>
@ -68,6 +116,28 @@
<el-table-column label="定量检测值" align="center" prop="detectValue" v-if="columns[4].visible"/>
<el-table-column label="规格质检值" align="center" prop="specInspection" v-if="columns[5].visible"/>
<el-table-column label="定性不合格明细" align="center" prop="problemDetail" v-if="columns[6].visible"/>
<el-table-column label="检测项编码" align="center" prop="itemCode" v-if="columns[7].visible"/>
<el-table-column label="检测项名称" align="center" prop="itemName" v-if="columns[8].visible"/>
<el-table-column label="检测位置" align="center" prop="inspectionPosition" v-if="columns[9].visible"/>
<el-table-column label="检测项目类别" align="center" prop="categoryName" v-if="columns[10].visible"/>
<el-table-column label="关联检测类型表" align="center" prop="typeId" v-if="columns[11].visible"/>
<el-table-column label="检测方式" align="center" prop="detectType" v-if="columns[12].visible">
<template #default="scope">
<dict-tag :options="detect_type" :value="scope.row.detectType"/>
</template>
</el-table-column>
<el-table-column label="控制类型(0手动,1自动)" align="center" prop="controlType" v-if="columns[13].visible">
<template #default="scope">
<dict-tag :options="control_type" :value="scope.row.controlType"/>
</template>
</el-table-column>
<el-table-column label="标准值" align="center" prop="standardValue" v-if="columns[14].visible"/>
<el-table-column label="控制上限" align="center" prop="upperLimit" v-if="columns[15].visible"/>
<el-table-column label="控制下限" align="center" prop="lowerLimit" v-if="columns[16].visible"/>
<el-table-column label="规格名称" align="center" prop="specName" v-if="columns[17].visible"/>
<el-table-column label="规格上限" align="center" prop="specUpper" v-if="columns[18].visible"/>
<el-table-column label="规格下限" align="center" prop="specLower" v-if="columns[19].visible"/>
<el-table-column label="检测项说明" align="center" prop="description" v-if="columns[20].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -82,17 +152,32 @@
<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="qcInspectionResultFormRef" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="结果主键" prop="resultId">
<el-input v-model="form.resultId" placeholder="请输入结果主键" />
</el-form-item> -->
<el-form-item label="关联质检主表ID" prop="inspectionId">
<el-input v-model="form.inspectionId" placeholder="请输入关联质检主表ID" />
<el-form-item label="关联质检主表" prop="inspectionId">
<el-select v-model="form.inspectionId" placeholder="请选择关联质检主表">
<el-option
v-for="item in inspectionMainList"
:key="item.inspectionId"
:label="item.inspectionNo"
:value="item.inspectionId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联检测项ID" prop="itemId">
<el-input v-model="form.itemId" placeholder="请输入关联检测项ID" />
<el-form-item label="关联检测项" prop="itemId">
<el-select v-model="form.itemId" placeholder="请选择关联检测项">
<el-option
v-for="item in inspectionItemList"
:key="item.itemId"
:label="item.itemName"
:value="item.itemId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="检测结果" prop="detectResult">
<el-radio-group v-model="form.detectResult">
@ -112,6 +197,62 @@
<el-form-item label="定性不合格明细" prop="problemDetail">
<el-input v-model="form.problemDetail" placeholder="请输入定性不合格明细" />
</el-form-item>
<el-form-item label="检测项编码" prop="itemCode">
<el-input v-model="form.itemCode" placeholder="请输入检测项编码" />
</el-form-item>
<el-form-item label="检测项名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入检测项名称" />
</el-form-item>
<el-form-item label="检测位置" prop="inspectionPosition">
<el-input v-model="form.inspectionPosition" placeholder="请输入检测位置" />
</el-form-item>
<el-form-item label="检测项目类别" prop="categoryName">
<el-input v-model="form.categoryName" placeholder="请输入检测项目类别" />
</el-form-item>
<el-form-item label="关联检测类型表" prop="typeId">
<el-input v-model="form.typeId" placeholder="请输入关联检测类型表" />
</el-form-item>
<el-form-item label="检测方式" prop="detectType">
<el-select v-model="form.detectType" placeholder="请选择检测方式">
<el-option
v-for="dict in detect_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="控制类型(0手动,1自动)" prop="controlType">
<el-select v-model="form.controlType" placeholder="请选择控制类型(0手动,1自动)">
<el-option
v-for="dict in control_type"
:key="dict.value"
:label="dict.label"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准值" prop="standardValue">
<el-input v-model="form.standardValue" placeholder="请输入标准值" />
</el-form-item>
<el-form-item label="控制上限" prop="upperLimit">
<el-input v-model="form.upperLimit" placeholder="请输入控制上限" />
</el-form-item>
<el-form-item label="控制下限" prop="lowerLimit">
<el-input v-model="form.lowerLimit" placeholder="请输入控制下限" />
</el-form-item>
<el-form-item label="规格名称" prop="specName">
<el-input v-model="form.specName" placeholder="请输入规格名称" />
</el-form-item>
<el-form-item label="规格上限" prop="specUpper">
<el-input v-model="form.specUpper" placeholder="请输入规格上限" />
</el-form-item>
<el-form-item label="规格下限" prop="specLower">
<el-input v-model="form.specLower" placeholder="请输入规格下限" />
</el-form-item>
<el-form-item label="检测项说明" prop="description">
<el-input v-model="form.description" placeholder="请输入检测项说明" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -126,9 +267,11 @@
<script setup name="QcInspectionResult" lang="ts">
import { listQcInspectionResult, getQcInspectionResult, delQcInspectionResult, addQcInspectionResult, updateQcInspectionResult } from '@/api/qms/qcInspectionResult';
import { QcInspectionResultVO, QcInspectionResultQuery, QcInspectionResultForm } from '@/api/qms/qcInspectionResult/types';
import { getQcInspectionMainList } from '@/api/qms/qcInspectionMain';
import { getQcInspectionItemList } from '@/api/qms/qcInspectionItem';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { qc_result } = toRefs<any>(proxy?.useDict('qc_result'));
const { detect_type, qc_result, control_type } = toRefs<any>(proxy?.useDict('detect_type', 'qc_result', 'control_type'));
const qcInspectionResultList = ref<QcInspectionResultVO[]>([]);
const buttonLoading = ref(false);
@ -150,19 +293,26 @@ const dialog = reactive<DialogOption>({
// 列显隐信息
const columns = ref<FieldOption[]>([
{ key: 0, label: `序号`, visible: true },
{ key: 1, label: `检测单号/卡号`, visible: true },
{ key: 2, label: `关联质检主表ID`, visible: true },
{ key: 3, label: `关联检测项ID`, visible: true },
{ key: 4, label: `检测结果`, visible: true },
{ key: 5, label: `定量检测值`, visible: true },
{ key: 6, label: `规格质检值`, visible: true },
{ key: 7, label: `定性不合格明细`, visible: true },
// { key: 8, label: `创建部门`, visible: true },
// { key: 9, label: `创建人`, visible: true },
// { key: 10, label: `创建时间`, visible: true },
// { key: 11, label: `修改人`, visible: true },
// { key: 12, label: `修改时间`, visible: true },
// { key: 13, label: `是否删除`, visible: true },
{ key: 1, label: `关联质检主表`, visible: true },
{ key: 2, label: `关联检测项`, visible: true },
{ key: 3, label: `检测结果`, visible: true },
{ key: 4, label: `定量检测值`, visible: true },
{ key: 5, label: `规格质检值`, visible: true },
{ key: 6, label: `定性不合格明细`, visible: true },
{ key: 7, label: `检测项编码`, visible: true },
{ key: 8, label: `检测项名称`, visible: true },
{ key: 9, label: `检测位置`, visible: true },
{ key: 10, label: `检测项目类别`, visible: true },
{ key: 11, label: `关联检测类型表`, visible: true },
{ key: 12, label: `检测方式`, visible: true },
{ key: 13, label: `控制类型(0手动,1自动)`, visible: true },
{ key: 14, label: `标准值`, visible: true },
{ key: 15, label: `控制上限`, visible: true },
{ key: 16, label: `控制下限`, visible: true },
{ key: 17, label: `规格名称`, visible: true },
{ key: 18, label: `规格上限`, visible: true },
{ key: 19, label: `规格下限`, visible: true },
{ key: 20, label: `检测项说明`, visible: true },
]);
const initFormData: QcInspectionResultForm = {
@ -173,6 +323,20 @@ const initFormData: QcInspectionResultForm = {
detectValue: undefined,
specInspection: undefined,
problemDetail: undefined,
itemCode: undefined,
itemName: undefined,
inspectionPosition: undefined,
categoryName: undefined,
typeId: undefined,
detectType: undefined,
controlType: undefined,
standardValue: undefined,
upperLimit: undefined,
lowerLimit: undefined,
specName: undefined,
specUpper: undefined,
specLower: undefined,
description: undefined,
}
const data = reactive<PageData<QcInspectionResultForm, QcInspectionResultQuery>>({
form: {...initFormData},
@ -186,13 +350,24 @@ const data = reactive<PageData<QcInspectionResultForm, QcInspectionResultQuery>>
detectValue: undefined,
specInspection: undefined,
problemDetail: undefined,
itemCode: undefined,
itemName: undefined,
inspectionPosition: undefined,
categoryName: undefined,
typeId: undefined,
detectType: undefined,
controlType: undefined,
standardValue: undefined,
upperLimit: undefined,
lowerLimit: undefined,
specName: undefined,
specUpper: undefined,
specLower: undefined,
description: undefined,
params: {
}
},
rules: {
resultId: [
{ required: true, message: "结果主键不能为空", trigger: "blur" }
],
}
});
@ -288,7 +463,25 @@ const handleExport = () => {
}, `qcInspectionResult_${new Date().getTime()}.xlsx`)
}
// 获取关联质检主表
let inspectionMainList = ref([]);
const getInspectionMain = async () => {
const res = await getQcInspectionMainList(null);
inspectionMainList.value = res.data;
}
// 获取关联检测项
let inspectionItemList = ref([]);
const getInspectionItem = async () => {
const res = await getQcInspectionItemList(null);
inspectionItemList.value = res.data;
}
onMounted(() => {
getList();
getInspectionMain();
getInspectionItem();
});
</script>

60
src/views/qms/qcInspectionTemplate/index.vue
Unescape Escape View File

@ -58,7 +58,7 @@
<el-table-column label="模板名称" align="center" prop="templateName" v-if="columns[2].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[3].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[4].visible"/>
<el-table-column label="关联检测类型表" align="center" prop="typeName" v-if="columns[5].visible"/>
<el-table-column label="关联类型" align="center" prop="typeName" v-if="columns[5].visible"/>
<el-table-column label="工位编码" align="center" prop="stationCode" v-if="columns[6].visible"/>
<el-table-column label="工位名称" align="center" prop="stationName" v-if="columns[7].visible"/>
<el-table-column label="工序编码" align="center" prop="processCode" v-if="columns[8].visible"/>
@ -137,7 +137,7 @@
<el-table-column label="规格名称" align="center" prop="specName" />
<el-table-column label="规格上限" align="center" prop="specUpper" />
<el-table-column label="规格下限" align="center" prop="specLower" />
<el-table-column label="检测项说明" align="center" prop="description" />
<el-table-column label="说明" align="center" prop="description" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -163,12 +163,16 @@
<el-input v-model="form.templateName" placeholder="请输入模板名称" />
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-select v-model="selectedMaterialId" placeholder="请选择物料" filterable clearable @change="handleMaterialChange" style="width: 100%;">
<el-option v-for="item in materialList" :key="item.materialId" :label="item.materialName" :value="item.materialName" />
</el-select>
<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-form-item label="关联检测类型表" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择关联检测类型表">
<el-form-item label="关联检测类型" prop="typeId">
<el-select v-model="form.typeId" placeholder="请选择关联检测类型">
<el-option v-for="item in qcInspectionTypeList" :key="item.typeId" :label="item.typeName" :value="item.typeId" />
</el-select>
</el-form-item>
@ -180,7 +184,7 @@
</el-form-item> -->
<el-form-item label="工位名称" prop="stationName">
<el-select v-model="selectedStaionId" placeholder="请选择工位" filterable clearable @change="handleBaseStationInfoChange" style="width: 100%;">
<el-option v-for="item in baseStationInfoList" :key="item.stationId" :label="item.stationName" :value="item.stationName" />
<el-option v-for="item in baseStationInfoList" :key="item.stationId" :label="item.stationName" :value="item.stationId" />
</el-select>
</el-form-item>
<!-- <el-form-item label="工序编码" prop="processCode">
@ -191,7 +195,7 @@
</el-form-item> -->
<el-form-item label="工序名称" prop="processName">
<el-select v-model="selectedProcessId" placeholder="请选择工序" filterable clearable @change="handleBaseProcessInfoChange" style="width: 100%;">
<el-option v-for="item in baseProcessInfoList" :key="item.processId" :label="item.processName" :value="item.processName" />
<el-option v-for="item in baseProcessInfoList" :key="item.processId" :label="item.processName" :value="item.processId" />
</el-select>
</el-form-item>
<!-- <el-form-item label="供应商编码" prop="supplierCode">
@ -202,7 +206,7 @@
</el-form-item> -->
<el-form-item label="供应商名称" prop="supplierName">
<el-select v-model="selectedSupplierId" placeholder="请选择供应商" filterable clearable @change="handleBaseSupplierInfoChange" style="width: 100%;">
<el-option v-for="item in baseSupplierInfoList" :key="item.supplierId" :label="item.supplierName" :value="item.supplierName" />
<el-option v-for="item in baseSupplierInfoList" :key="item.supplierId" :label="item.supplierName" :value="item.supplierId" />
</el-select>
</el-form-item>
<el-form-item label="模板说明" prop="description">
@ -359,12 +363,23 @@
</div>
</template>
</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>
</div>
</el-dialog>
<input ref="fileInput" type="file" accept=".xlsx, .xls" style="display: none" @change="onFileChange" />
</div>
</template>
<script setup name="QcInspectionTemplate" lang="ts">
import { listQcInspectionTemplate, getQcInspectionTemplate, delQcInspectionTemplate, addQcInspectionTemplate, updateQcInspectionTemplate, getQcTemplateItemList, importData } from '@/api/qms/qcInspectionTemplate';
import { listQcInspectionTemplate, getQcInspectionTemplate, delQcInspectionTemplate, addQcInspectionTemplate, updateQcInspectionTemplate, getQcInspectionTemplateList, importData } from '@/api/qms/qcInspectionTemplate';
import { QcInspectionTemplateVO, QcInspectionTemplateQuery, QcInspectionTemplateForm } from '@/api/qms/qcInspectionTemplate/types';
import { listQcTemplateItem, getQcTemplateItem, delQcTemplateItem, addQcTemplateItem, updateQcTemplateItem } from '@/api/qms/qcTemplateItem';
import { QcTemplateItemVO, QcTemplateItemQuery, QcTemplateItemForm } from '@/api/qms/qcTemplateItem/types';
@ -377,6 +392,9 @@ import { getProcessInfoList } from '@/api/qms/baseProcessInfo';
import { getBaseSupplierInfoList } from '@/api/qms/baseSupplierInfo';
import { getQcInspectionItemCategoryList } from '@/api/qms/qcInspectionItemCategory';
import MaterialSelect from "@/views/mes/baseMaterialInfo/addMaterialInQMS.vue";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { detect_type, control_type } = toRefs<any>(proxy?.useDict('detect_type', 'control_type'));
@ -660,7 +678,7 @@ const handleRowClick = (row: QcInspectionTemplateVO) => {
/** 新增按钮操作 */
const handleAdd = () => {
reset();
getMaterialList();
// getMaterialList();
getBaseProcessList();
getBaseStationList();
getBaseSupplierList();
@ -671,7 +689,7 @@ const handleAdd = () => {
/** 修改按钮操作 */
const handleUpdate = async (row?: QcInspectionTemplateVO) => {
reset();
await getMaterialList();
// await getMaterialList();
await getBaseProcessList();
await getBaseStationList();
await getBaseSupplierList();
@ -945,6 +963,22 @@ const getBaseSupplierList = async () => {
baseSupplierInfoList.value = res.data;
}
/** 物料选择弹窗 */
const materialOpen = ref(false);
const materialSelectRef = ref();
const handleMaterialAdd = () => {
materialOpen.value = true;
};
const submitMaterialForm = () => {
const selected = materialSelectRef.value.tableRef.store.states.currentRow.value;
if (selected) {
selectedMaterialId.value = selected.materialId;
form.value.materialName = selected.materialName;
form.value.materialCode = selected.materialCode;
}
materialOpen.value = false;
};
onMounted(() => {
getList();

Write Preview
Loading…
Cancel
Save