From 152838e14b33e7e81d8a7bb584d4627cedf2d6e6 Mon Sep 17 00:00:00 2001 From: hwj Date: Mon, 8 Jun 2026 18:36:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=EF=BC=9A=E6=A8=A1=E5=85=B7=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/moldget/index.ts | 98 ++++++++++----------- src/api/mes/moldreturn/index.ts | 94 ++++++++++---------- src/views/mes/moldget/MoldGetForm.vue | 79 +++++++++++++++-- src/views/mes/moldreturn/MoldReturnForm.vue | 79 +++++++++++++++-- 4 files changed, 244 insertions(+), 106 deletions(-) diff --git a/src/api/mes/moldget/index.ts b/src/api/mes/moldget/index.ts index 679539bc..4c902b16 100644 --- a/src/api/mes/moldget/index.ts +++ b/src/api/mes/moldget/index.ts @@ -1,49 +1,49 @@ -import request from '@/config/axios' - -// 模具管理-领模申请 VO -export interface MoldGetVO { - id: number // ID - orderId: number // 领模单号 - code: string // 模具编码 - name: string // 模具名称 - state: string // 状态 - person: string // 领模人 - deviceId: number // 设备id - deviceName: string // 设备名称 - getTime: Date // 领取时间 - principal: string // 库管员 - remark: string // 备注 -} - -// 模具管理-领模申请 API -export const MoldGetApi = { - // 查询模具管理-领模申请分页 - getMoldGetPage: async (params: any) => { - return await request.get({ url: `/mes/mold-get/page`, params }) - }, - - // 查询模具管理-领模申请详情 - getMoldGet: async (id: number) => { - return await request.get({ url: `/mes/mold-get/get?id=` + id }) - }, - - // 新增模具管理-领模申请 - createMoldGet: async (data: MoldGetVO) => { - return await request.post({ url: `/mes/mold-get/create`, data }) - }, - - // 修改模具管理-领模申请 - updateMoldGet: async (data: MoldGetVO) => { - return await request.put({ url: `/mes/mold-get/update`, data }) - }, - - // 删除模具管理-领模申请 - deleteMoldGet: async (id: number) => { - return await request.delete({ url: `/mes/mold-get/delete?id=` + id }) - }, - - // 导出模具管理-领模申请 Excel - exportMoldGet: async (params) => { - return await request.download({ url: `/mes/mold-get/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 模具管理-领模申请 VO +export interface MoldGetVO { + id: number // ID + orderId: number // 领模单号 + code: string // 模具编码 + name: string // 模具名称 + state: string // 状态 + person: string // 领模人 + deviceId: number // 设备id + deviceName: string // 设备名称 + getTime: Date // 领取时间 + principal: string // 库管员 + remark: string // 备注 +} + +// 模具管理-领模申请 API +export const MoldGetApi = { + // 查询模具管理-领模申请分页 + getMoldGetPage: async (params: any) => { + return await request.get({ url: `/mes/mold-get/page`, params }) + }, + + // 查询模具管理-领模申请详情 + getMoldGet: async (id: number) => { + return await request.get({ url: `/mes/mold-get/get?id=` + id }) + }, + + // 新增模具管理-领模申请 + createMoldGet: async (data: MoldGetVO) => { + return await request.post({ url: `/mes/mold-get/create`, data }) + }, + + // 修改模具管理-领模申请 + updateMoldGet: async (data: MoldGetVO) => { + return await request.put({ url: `/mes/mold-get/update`, data }) + }, + + // 删除模具管理-领模申请 + deleteMoldGet: async (id: number) => { + return await request.delete({ url: `/mes/mold-get/delete?id=` + id }) + }, + + // 导出模具管理-领模申请 Excel + exportMoldGet: async (params) => { + return await request.download({ url: `/mes/mold-get/export-excel`, params }) + }, +} diff --git a/src/api/mes/moldreturn/index.ts b/src/api/mes/moldreturn/index.ts index 7b10ee5f..d3330299 100644 --- a/src/api/mes/moldreturn/index.ts +++ b/src/api/mes/moldreturn/index.ts @@ -1,47 +1,47 @@ -import request from '@/config/axios' - -// 模具管理-模具入库 VO -export interface MoldReturnVO { - id: number // ID - orderId: number // 领模单号 - code: string // 模具编码 - name: string // 模具名称 - state: string // 状态 - person: string // 归还人 - returnTime: Date // 入库时间 - principal: string // 库管员 - remark: string // 备注 -} - -// 模具管理-模具入库 API -export const MoldReturnApi = { - // 查询模具管理-模具入库分页 - getMoldReturnPage: async (params: any) => { - return await request.get({ url: `/mes/mold-return/page`, params }) - }, - - // 查询模具管理-模具入库详情 - getMoldReturn: async (id: number) => { - return await request.get({ url: `/mes/mold-return/get?id=` + id }) - }, - - // 新增模具管理-模具入库 - createMoldReturn: async (data: MoldReturnVO) => { - return await request.post({ url: `/mes/mold-return/create`, data }) - }, - - // 修改模具管理-模具入库 - updateMoldReturn: async (data: MoldReturnVO) => { - return await request.put({ url: `/mes/mold-return/update`, data }) - }, - - // 删除模具管理-模具入库 - deleteMoldReturn: async (id: number) => { - return await request.delete({ url: `/mes/mold-return/delete?id=` + id }) - }, - - // 导出模具管理-模具入库 Excel - exportMoldReturn: async (params) => { - return await request.download({ url: `/mes/mold-return/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 模具管理-模具入库 VO +export interface MoldReturnVO { + id: number // ID + orderId: number // 领模单号 + code: string // 模具编码 + name: string // 模具名称 + state: string // 状态 + person: string // 归还人 + returnTime: Date // 入库时间 + principal: string // 库管员 + remark: string // 备注 +} + +// 模具管理-模具入库 API +export const MoldReturnApi = { + // 查询模具管理-模具入库分页 + getMoldReturnPage: async (params: any) => { + return await request.get({ url: `/mes/mold-return/page`, params }) + }, + + // 查询模具管理-模具入库详情 + getMoldReturn: async (id: number) => { + return await request.get({ url: `/mes/mold-return/get?id=` + id }) + }, + + // 新增模具管理-模具入库 + createMoldReturn: async (data: MoldReturnVO) => { + return await request.post({ url: `/mes/mold-return/create`, data }) + }, + + // 修改模具管理-模具入库 + updateMoldReturn: async (data: MoldReturnVO) => { + return await request.put({ url: `/mes/mold-return/update`, data }) + }, + + // 删除模具管理-模具入库 + deleteMoldReturn: async (id: number) => { + return await request.delete({ url: `/mes/mold-return/delete?id=` + id }) + }, + + // 导出模具管理-模具入库 Excel + exportMoldReturn: async (params) => { + return await request.download({ url: `/mes/mold-return/export-excel`, params }) + }, +} diff --git a/src/views/mes/moldget/MoldGetForm.vue b/src/views/mes/moldget/MoldGetForm.vue index 26021713..d15ba7cc 100644 --- a/src/views/mes/moldget/MoldGetForm.vue +++ b/src/views/mes/moldget/MoldGetForm.vue @@ -93,7 +93,13 @@ - + + diff --git a/src/views/erp/stock/packagingSolution/index.vue b/src/views/erp/stock/packagingSolution/index.vue new file mode 100644 index 00000000..121a067f --- /dev/null +++ b/src/views/erp/stock/packagingSolution/index.vue @@ -0,0 +1,189 @@ + + + + From 4f16b2a8472583f18042df610e76caa5113371f2 Mon Sep 17 00:00:00 2001 From: hwj Date: Tue, 9 Jun 2026 16:43:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat=EF=BC=9A=E4=BA=A7=E5=93=81=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF-=E6=96=B0=E5=A2=9E/=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en.ts | 24 + src/locales/zh-CN.ts | 24 + src/utils/dict.ts | 1 + src/views/erp/product/product/ProductForm.vue | 420 +++++++++++++++++- 4 files changed, 465 insertions(+), 4 deletions(-) diff --git a/src/locales/en.ts b/src/locales/en.ts index 3c3bafa7..95bc39b1 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -565,6 +565,16 @@ export default { validatorStatusRequired: 'Status is required' } }, + ErpPurchase: { + Supplier: { + name: 'Supplier Name', + contact: 'Contact', + mobile: 'Mobile', + telephone: 'Telephone', + placeholderName: 'Please enter supplier name', + placeholderMobile: 'Please enter mobile' + } + }, lock: { lockScreen: 'Lock screen', lock: 'Lock', @@ -2082,6 +2092,20 @@ export default { validatorCategoryTypeRequired: 'Type can not be empty', validatorUnitRequired: 'Unit id can not be empty', validatorStatusRequired: 'Product status can not be empty', + dialogPackagingSchemeLabel: 'Packaging Scheme', + dialogPackagingSchemeTitle: 'Select Packaging Scheme', + dialogPackagingSchemePlaceholder: 'Please select packaging scheme', + dialogDefaultStatusLabel: 'Default Scheme', + validatorPackagingSchemeRequired: 'Packaging scheme is required', + dialogSupplierLabel: 'Supplier', + dialogSupplierTitle: 'Select Supplier', + dialogSupplierPlaceholder: 'Please select supplier', + validatorSupplierRequired: 'Supplier is required', + dialogFragileFlagLabel: 'Fragile', + dialogSparePartLevelLabel: 'Spare Part Level', + dialogPurchaseCycleLabel: 'Purchase Cycle (Days)', + dialogBrandLabel: 'Brand', + dialogBrandPlaceholder: 'Please enter brand', categoryTree: 'Category Tree', addCategory: 'Add Category', refreshTree: 'Refresh' diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index f4833ac4..c4819fa3 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -565,6 +565,16 @@ export default { validatorStatusRequired: '状态不能为空' } }, + ErpPurchase: { + Supplier: { + name: '供应商名称', + contact: '联系人', + mobile: '手机号码', + telephone: '联系电话', + placeholderName: '请输入供应商名称', + placeholderMobile: '请输入手机号码' + } + }, lock: { lockScreen: '锁定屏幕', lock: '锁定', @@ -3235,6 +3245,20 @@ export default { validatorCategoryTypeRequired: '类型不能为空', validatorUnitRequired: '单位编号不能为空', validatorStatusRequired: '产品状态不能为空', + dialogPackagingSchemeLabel: '包装方案', + dialogPackagingSchemeTitle: '选择包装方案', + dialogPackagingSchemePlaceholder: '请选择包装方案', + dialogDefaultStatusLabel: '是否默认方案', + validatorPackagingSchemeRequired: '包装方案不能为空', + dialogSupplierLabel: '供应商', + dialogSupplierTitle: '选择供应商', + dialogSupplierPlaceholder: '请选择供应商', + validatorSupplierRequired: '供应商不能为空', + dialogFragileFlagLabel: '是否易损件', + dialogSparePartLevelLabel: '备件等级', + dialogPurchaseCycleLabel: '采购周期（天）', + dialogBrandLabel: '品牌', + dialogBrandPlaceholder: '请输入品牌', categoryTree: '产品分类树', addCategory: '新增分类', refreshTree: '刷新' diff --git a/src/utils/dict.ts b/src/utils/dict.ts index ec3bbc45..6d70292c 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -236,6 +236,7 @@ export enum DICT_TYPE { ERP_AUTOCODE_CYCLEMETHOD = "erp_autocode_cyclemethod", ERP_AUTOCODE_PARTTYPE = "erp_autocode_parttype", MATERIAL_CLASSIFICATION_TYPE = 'material_classification_type', + SPARE_PARTS_LEVEL = 'spare_parts_level', // ========== MES - 生产管理模块 ========== diff --git a/src/views/erp/product/product/ProductForm.vue b/src/views/erp/product/product/ProductForm.vue index f397106c..4488191a 100644 --- a/src/views/erp/product/product/ProductForm.vue +++ b/src/views/erp/product/product/ProductForm.vue @@ -110,6 +110,61 @@ /> + + + + + + + + + + + + + + + {{ dict.label }} + + + + + + + + {{ t('common.yes') }} + {{ t('common.no') }} + + + + + + + + + + + + + @@ -204,6 +259,99 @@ + + + + + + + + + + {{ t('FactoryModeling.ProductInformation.searchButtonText') }} + {{ t('FactoryModeling.ProductInformation.resetButtonText') }} + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + {{ t('FactoryModeling.ProductInformation.searchButtonText') }} + {{ t('FactoryModeling.ProductInformation.resetButtonText') }} + + + + + + + + + + + + +
+ +
+ +