From 717b7c9f4848e9b94c7bb2816726431240f7cf90 Mon Sep 17 00:00:00 2001 From: zch Date: Wed, 19 Feb 2025 18:44:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?change(mes/materialBom):=20=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E6=8E=89=E6=96=B0=E5=A2=9E=20BOM=E4=BF=AE=E6=94=B9sub?= =?UTF-8?q?mitMaterialForm=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 注释掉了新增 BOM 按钮和物料 BOM 信息对话框的 HTML 结构 - 修改了 submitMaterialForm 方法中的条件判断，使用 materialBomDialog.visible 替代 materialOpen.value --- src/views/mes/materialBom/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/mes/materialBom/index.vue b/src/views/mes/materialBom/index.vue index b2c066c..79a51f8 100644 --- a/src/views/mes/materialBom/index.vue +++ b/src/views/mes/materialBom/index.vue @@ -37,11 +37,11 @@ - + 展开/折叠 @@ -216,7 +216,7 @@ - 取 消 - + --> @@ -527,7 +527,7 @@ const handleMaterialAdd = () => { // 提交物料选择 const submitMaterialForm = () => { const selectedRow = materialSelectRef.value.tableRef.store.states.currentRow.value; - if (materialOpen.value) { + if (materialBomDialog.visible) { if (currentRow.value && selectedRow) { currentRow.value.materialId = selectedRow.materialId; currentRow.value.materialName = selectedRow.materialName; From adeca7f1a6ad7f9a2201aa9deb93d58ffe3fcc63 Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 20 Feb 2025 18:03:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E4=BF=A1=E6=81=AF=E3=80=81=E6=A8=A1=E5=85=B7=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=BD=AE=E8=83=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/baseMouldInfo/index.ts | 77 +++++ src/api/mes/baseMouldInfo/types.ts | 87 ++++++ src/views/mes/baseMouldInfo/index.vue | 406 ++++++++++++++++++++++++++ 3 files changed, 570 insertions(+) create mode 100644 src/api/mes/baseMouldInfo/index.ts create mode 100644 src/api/mes/baseMouldInfo/types.ts create mode 100644 src/views/mes/baseMouldInfo/index.vue diff --git a/src/api/mes/baseMouldInfo/index.ts b/src/api/mes/baseMouldInfo/index.ts new file mode 100644 index 0000000..40c6673 --- /dev/null +++ b/src/api/mes/baseMouldInfo/index.ts @@ -0,0 +1,77 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { BaseMouldInfoVO, BaseMouldInfoForm, BaseMouldInfoQuery } from '@/api/mes/baseMouldInfo/types'; + +/** + * 查询模具信息列表 + * @param query + * @returns {*} + */ + +export const listBaseMouldInfo = (query?: BaseMouldInfoQuery): AxiosPromise => { + return request({ + url: '/mes/baseMouldInfo/list', + method: 'get', + params: query + }); +}; + +/** + * 查询模具信息详细 + * @param mouldId + */ +export const getBaseMouldInfo = (mouldId: string | number): AxiosPromise => { + return request({ + url: '/mes/baseMouldInfo/' + mouldId, + method: 'get' + }); +}; + +/** + * 新增模具信息 + * @param data + */ +export const addBaseMouldInfo = (data: BaseMouldInfoForm) => { + return request({ + url: '/mes/baseMouldInfo', + method: 'post', + data: data + }); +}; + +/** + * 修改模具信息 + * @param data + */ +export const updateBaseMouldInfo = (data: BaseMouldInfoForm) => { + return request({ + url: '/mes/baseMouldInfo', + method: 'put', + data: data + }); +}; + +/** + * 删除模具信息 + * @param mouldId + */ +export const delBaseMouldInfo = (mouldId: string | number | Array) => { + return request({ + url: '/mes/baseMouldInfo/' + mouldId, + method: 'delete' + }); +}; + + +/** + * 下拉框查询模具信息列表 + * @param query + * @returns {*} + */ +export function getProdBaseMouldInfoList (query) { + return request({ + url: '/mes/baseMouldInfo/getProdBaseMouldInfoList', + method: 'get', + params: query + }); +}; diff --git a/src/api/mes/baseMouldInfo/types.ts b/src/api/mes/baseMouldInfo/types.ts new file mode 100644 index 0000000..00f487f --- /dev/null +++ b/src/api/mes/baseMouldInfo/types.ts @@ -0,0 +1,87 @@ +export interface BaseMouldInfoVO { + /** + * 主键标识 + */ + mouldId: string | number; + + /** + * 模具名称 + */ + mouldName: string; + + /** + * 所在机台ID + */ + machineId: string | number; + + /** + * 使用次数 + */ + usedNum: number; + + /** + * 备注 + */ + remark: string; + +} + +export interface BaseMouldInfoForm extends BaseEntity { + /** + * 主键标识 + */ + mouldId?: string | number; + + /** + * 模具名称 + */ + mouldName?: string; + + /** + * 所在机台ID + */ + machineId?: string | number; + + /** + * 使用次数 + */ + usedNum?: number; + + /** + * 备注 + */ + remark?: string; + + baseMouldRelationList?: []; +} + +export interface BaseMouldInfoQuery extends PageQuery { + + /** + * 主键标识 + */ + mouldId?: string | number; + + /** + * 模具名称 + */ + mouldName?: string; + + /** + * 所在机台ID + */ + machineId?: string | number; + + /** + * 使用次数 + */ + usedNum?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/views/mes/baseMouldInfo/index.vue b/src/views/mes/baseMouldInfo/index.vue new file mode 100644 index 0000000..d171947 --- /dev/null +++ b/src/views/mes/baseMouldInfo/index.vue @@ -0,0 +1,406 @@ + + +