From ffb5e5206a6631c1344618f88324ca369b26eef8 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 24 Jul 2025 09:41:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?update=20qms=E6=A3=80=E6=B5=8B=E9=A1=B9?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/qcInspectionItemCategory/types.ts | 41 +----------- .../qms/qcInspectionItemCategory/index.vue | 66 ++++++++++--------- 2 files changed, 38 insertions(+), 69 deletions(-) diff --git a/src/api/qms/qcInspectionItemCategory/types.ts b/src/api/qms/qcInspectionItemCategory/types.ts index 501fd68..345843d 100644 --- a/src/api/qms/qcInspectionItemCategory/types.ts +++ b/src/api/qms/qcInspectionItemCategory/types.ts @@ -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; } diff --git a/src/views/qms/qcInspectionItemCategory/index.vue b/src/views/qms/qcInspectionItemCategory/index.vue index f8e29a8..8abd8a0 100644 --- a/src/views/qms/qcInspectionItemCategory/index.vue +++ b/src/views/qms/qcInspectionItemCategory/index.vue @@ -32,9 +32,9 @@ - - - + + + @@ -62,9 +62,9 @@ 新增 - - 展开/折叠 - + + + 导入 @@ -75,10 +75,10 @@ ref="qcInspectionItemCategoryTableRef" v-loading="loading" :data="qcInspectionItemCategoryList" - row-key="categoryId" - :default-expand-all="isExpandAll" - :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > + @@ -91,9 +91,9 @@ - - - + + + @@ -108,16 +108,16 @@ - - - + + + + + + + + + + @@ -204,6 +204,8 @@ const initFormData: QcInspectionItemCategoryForm = { const data = reactive>({ form: {...initFormData}, queryParams: { + pageNum: 1, + pageSize: 10, categoryId: undefined, parentId: undefined, ancestors: undefined, @@ -218,8 +220,8 @@ const data = reactive { loading.value = true; const res = await listQcInspectionItemCategory(queryParams.value); - const data = proxy?.handleTree(res.data, "categoryId", "parentId"); - if (data) { - qcInspectionItemCategoryList.value = data; - loading.value = false; - } + // const data = proxy?.handleTree(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; } From a95decd1e579064d6eb51ba8162a20fd63ca2125 Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 24 Jul 2025 10:47:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?refactor(qms):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E5=AE=9A=E4=B9=89=E5=92=8C?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整检测项编码、名称等列的宽度 - 修改宽度 - 优化模板页面的物料、工位、工序等选择框 --- src/views/qms/qcInspectionItem/index.vue | 40 ++++++++++---------- src/views/qms/qcInspectionTemplate/index.vue | 10 ++--- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/views/qms/qcInspectionItem/index.vue b/src/views/qms/qcInspectionItem/index.vue index cfe35d9..39131b8 100644 --- a/src/views/qms/qcInspectionItem/index.vue +++ b/src/views/qms/qcInspectionItem/index.vue @@ -107,11 +107,11 @@ - - + + - + @@ -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(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(); From cb51648a514239352f63d36b0e5cdb47c0e9dfa0 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 24 Jul 2025 13:31:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?update=20mes=E5=B7=A5=E5=BA=8F=E5=85=B3?= =?UTF-8?q?=E8=81=94=E4=BA=BA=E5=91=98=E5=8A=A0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mes/baseProcessInfo/index.vue | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/views/mes/baseProcessInfo/index.vue b/src/views/mes/baseProcessInfo/index.vue index 6903fd3..2be9de9 100644 --- a/src/views/mes/baseProcessInfo/index.vue +++ b/src/views/mes/baseProcessInfo/index.vue @@ -437,6 +437,18 @@ + + + diff --git a/src/views/qms/qcInspectionResult/index.vue b/src/views/qms/qcInspectionResult/index.vue index 430c848..aea80c8 100644 --- a/src/views/qms/qcInspectionResult/index.vue +++ b/src/views/qms/qcInspectionResult/index.vue @@ -3,7 +3,7 @@
- + - + + + + + + + + + + + + 搜索 @@ -57,9 +103,11 @@ - - - + + + + +