From 09cb2e267eea5ec220967aec10abd17c44c6954e Mon Sep 17 00:00:00 2001 From: kkk-ops <1050738955@qq.com> Date: Thu, 18 Dec 2025 11:45:29 +0800 Subject: [PATCH] commit --- .env.local | 2 +- .env.prod | 4 +- package.json | 1 + src/api/erp/product/product/index.ts | 2 + src/api/erp/product/unit/index.ts | 10 +- src/api/iot/device/index.ts | 6 + src/api/iot/deviceattributetype/index.ts | 47 +++ src/api/iot/devicemodel/index.ts | 48 +++ src/api/iot/devicemodelattribute/index.ts | 48 +++ src/api/mes/energydevice/index.ts | 6 +- src/api/mes/energytype/index.ts | 49 +++ src/api/mes/moldget/index.ts | 49 +++ src/api/mes/moldrecorditem/index.ts | 43 +++ src/api/mes/moldreturn/index.ts | 47 +++ src/api/mes/zjitem/index.ts | 47 +++ src/api/mes/zjschema/index.ts | 44 +++ src/api/mes/zjtype/index.ts | 47 +++ src/utils/dict.ts | 5 + src/views/erp/autocode/AutocodeIndex.vue | 2 +- src/views/erp/autocode/index.vue | 2 +- src/views/erp/mold/MoldBrandForm.vue | 14 +- src/views/erp/mold/components/MoldForm.vue | 12 +- src/views/erp/mold/components/MoldList.vue | 13 +- src/views/erp/mold/index.vue | 18 +- src/views/erp/product/category/index.vue | 4 +- src/views/erp/product/product/ProductForm.vue | 10 +- src/views/erp/product/product/index.vue | 6 +- .../erp/product/unit/ProductUnitForm.vue | 54 +++- src/views/erp/product/unit/index.vue | 11 +- src/views/iot/device/DeviceForm.vue | 61 +++- src/views/iot/device/index.vue | 34 +- .../DeviceAttributeTypeForm.vue | 103 ++++++ src/views/iot/deviceattributetype/index.vue | 208 +++++++++++++ src/views/iot/devicemodel/DeviceModelForm.vue | 117 +++++++ .../components/DeviceModelAttributeForm.vue | 162 ++++++++++ .../components/ModelAttributeList.vue | 269 ++++++++++++++++ src/views/iot/devicemodel/index.vue | 244 +++++++++++++++ src/views/mes/bom/BomForm.vue | 2 +- src/views/mes/bom/index.vue | 14 +- .../mes/energydevice/EnergyDeviceForm.vue | 79 +++-- src/views/mes/energydevice/index.vue | 34 +- src/views/mes/energydevicecheck/index.vue | 118 +++++-- src/views/mes/energytype/EnergyTypeForm.vue | 124 ++++++++ src/views/mes/energytype/index.vue | 218 +++++++++++++ src/views/mes/moldget/MoldGetForm.vue | 145 +++++++++ src/views/mes/moldget/index.vue | 294 ++++++++++++++++++ .../mes/moldrecorditem/MoldRecordItemForm.vue | 110 +++++++ src/views/mes/moldrecorditem/index.vue | 221 +++++++++++++ src/views/mes/moldreturn/MoldReturnForm.vue | 135 ++++++++ src/views/mes/moldreturn/index.vue | 272 ++++++++++++++++ .../mes/organization/OrganizationForm.vue | 37 ++- src/views/mes/organization/WorkerIndex.vue | 15 +- src/views/mes/organization/index.vue | 34 +- src/views/mes/plan/index.vue | 3 +- src/views/mes/workteam/WorkTeamForm.vue | 10 +- .../components/WorkTeamDetailForm.vue | 10 +- .../components/WorkTeamDetailList.vue | 2 +- src/views/mes/workteam/index.vue | 8 +- src/views/mes/zjitem/ZjItemForm.vue | 156 ++++++++++ src/views/mes/zjitem/index.vue | 231 ++++++++++++++ src/views/mes/zjschema/ZjSchemaForm.vue | 117 +++++++ src/views/mes/zjschema/index.vue | 242 ++++++++++++++ src/views/mes/zjtype/ZjTypeForm.vue | 103 ++++++ src/views/mes/zjtype/index.vue | 209 +++++++++++++ src/views/system/post/PostForm.vue | 6 +- src/views/system/post/index.vue | 3 +- src/views/system/role/RoleForm.vue | 6 +- src/views/system/role/index.vue | 19 +- src/views/system/user/UserForm.vue | 40 +-- src/views/system/user/index.vue | 28 +- 70 files changed, 4646 insertions(+), 248 deletions(-) create mode 100644 src/api/iot/deviceattributetype/index.ts create mode 100644 src/api/iot/devicemodel/index.ts create mode 100644 src/api/iot/devicemodelattribute/index.ts create mode 100644 src/api/mes/energytype/index.ts create mode 100644 src/api/mes/moldget/index.ts create mode 100644 src/api/mes/moldrecorditem/index.ts create mode 100644 src/api/mes/moldreturn/index.ts create mode 100644 src/api/mes/zjitem/index.ts create mode 100644 src/api/mes/zjschema/index.ts create mode 100644 src/api/mes/zjtype/index.ts create mode 100644 src/views/iot/deviceattributetype/DeviceAttributeTypeForm.vue create mode 100644 src/views/iot/deviceattributetype/index.vue create mode 100644 src/views/iot/devicemodel/DeviceModelForm.vue create mode 100644 src/views/iot/devicemodel/components/DeviceModelAttributeForm.vue create mode 100644 src/views/iot/devicemodel/components/ModelAttributeList.vue create mode 100644 src/views/iot/devicemodel/index.vue create mode 100644 src/views/mes/energytype/EnergyTypeForm.vue create mode 100644 src/views/mes/energytype/index.vue create mode 100644 src/views/mes/moldget/MoldGetForm.vue create mode 100644 src/views/mes/moldget/index.vue create mode 100644 src/views/mes/moldrecorditem/MoldRecordItemForm.vue create mode 100644 src/views/mes/moldrecorditem/index.vue create mode 100644 src/views/mes/moldreturn/MoldReturnForm.vue create mode 100644 src/views/mes/moldreturn/index.vue create mode 100644 src/views/mes/zjitem/ZjItemForm.vue create mode 100644 src/views/mes/zjitem/index.vue create mode 100644 src/views/mes/zjschema/ZjSchemaForm.vue create mode 100644 src/views/mes/zjschema/index.vue create mode 100644 src/views/mes/zjtype/ZjTypeForm.vue create mode 100644 src/views/mes/zjtype/index.vue diff --git a/.env.local b/.env.local index ad084700..0509fc09 100644 --- a/.env.local +++ b/.env.local @@ -4,7 +4,7 @@ NODE_ENV=development VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://localhost:48081' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务 VITE_UPLOAD_TYPE=server diff --git a/.env.prod b/.env.prod index fc0d00bc..1a6841b0 100644 --- a/.env.prod +++ b/.env.prod @@ -4,12 +4,12 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://47.106.185.127:48080' +VITE_BASE_URL='http://192.168.5.119:48081' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://47.106.185.127:48080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://192.168.5.119:48081/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api diff --git a/package.json b/package.json index d2d8b31d..e80173fc 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "scripts": { "i": "pnpm install", "dev": "vite --mode env.local", + "pro": "vite --mode env.prod", "dev-server": "vite --mode dev", "ts:check": "vue-tsc --noEmit", "build:local": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build", diff --git a/src/api/erp/product/product/index.ts b/src/api/erp/product/product/index.ts index b2fbf6e5..6726d1d3 100644 --- a/src/api/erp/product/product/index.ts +++ b/src/api/erp/product/product/index.ts @@ -6,6 +6,8 @@ export interface ProductVO { name: string // 产品名称 barCode: string // 产品条码 categoryId: number // 产品类型编号 + subCategoryId: number // 产品类型子类编号 + subCategoryName: string // 产品类型子类名称 unitId: number // 单位编号 unitName?: string // 单位名字 status: number // 产品状态 diff --git a/src/api/erp/product/unit/index.ts b/src/api/erp/product/unit/index.ts index 1e1c8ac3..bb414680 100644 --- a/src/api/erp/product/unit/index.ts +++ b/src/api/erp/product/unit/index.ts @@ -4,6 +4,9 @@ import request from '@/config/axios' export interface ProductUnitVO { id: number // 单位编号 name: string // 单位名字 + primaryFlag: string // 是否主单位 + primaryId: number // 关联主单位id + changeRate: number // 换算比例 status: number // 单位状态 } @@ -42,5 +45,10 @@ export const ProductUnitApi = { // 导出产品单位 Excel exportProductUnit: async (params) => { return await request.download({ url: `/erp/product-unit/export-excel`, params }) - } + }, + + // 获得产品单位列表 + getProductUnitList: async () => { + return await request.get({ url: `/erp/product-unit/list`}) + }, } diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts index 34ecbf1b..bd475450 100644 --- a/src/api/iot/device/index.ts +++ b/src/api/iot/device/index.ts @@ -15,6 +15,12 @@ export interface DeviceVO { lastOnlineTime: Date // 最后上线时间 remark: string // 备注 isEnable: boolean // 是否启用 + deviceModelId: number // 关联设备模型 + protocol: string // 通讯协议 + sampleCycle: number // 采集周期 + url: string // 端点url + username: string // 用户名 + password: string // 密码 } // 物联设备 API diff --git a/src/api/iot/deviceattributetype/index.ts b/src/api/iot/deviceattributetype/index.ts new file mode 100644 index 00000000..9fd62b9b --- /dev/null +++ b/src/api/iot/deviceattributetype/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +// 采集点分类 VO +export interface DeviceAttributeTypeVO { + id: number // ID + code: string // 分类编码 + name: string // 分类名称 + remark: string // 备注 +} + +// 采集点分类 API +export const DeviceAttributeTypeApi = { + // 查询采集点分类分页 + getDeviceAttributeTypePage: async (params: any) => { + return await request.get({ url: `/iot/device-attribute-type/page`, params }) + }, + + // 查询采集点分类详情 + getDeviceAttributeType: async (id: number) => { + return await request.get({ url: `/iot/device-attribute-type/get?id=` + id }) + }, + + // 新增采集点分类 + createDeviceAttributeType: async (data: DeviceAttributeTypeVO) => { + return await request.post({ url: `/iot/device-attribute-type/create`, data }) + }, + + // 修改采集点分类 + updateDeviceAttributeType: async (data: DeviceAttributeTypeVO) => { + return await request.put({ url: `/iot/device-attribute-type/update`, data }) + }, + + // 删除采集点分类 + deleteDeviceAttributeType: async (id: number) => { + return await request.delete({ url: `/iot/device-attribute-type/delete?id=` + id }) + }, + + // 导出采集点分类 Excel + exportDeviceAttributeType: async (params) => { + return await request.download({ url: `/iot/device-attribute-type/export-excel`, params }) + }, + + // 获得采集点分类列表 + getDeviceAttributeTypeList: async () => { + return await request.get({ url: `/iot/device-attribute-type/list`}) + }, +} diff --git a/src/api/iot/devicemodel/index.ts b/src/api/iot/devicemodel/index.ts new file mode 100644 index 00000000..e49cc52a --- /dev/null +++ b/src/api/iot/devicemodel/index.ts @@ -0,0 +1,48 @@ +import request from '@/config/axios' + +// 采集设备模型 VO +export interface DeviceModelVO { + id: number // ID + code: string // 分类编码 + name: string // 分类名称 + protocol: string // 通讯协议 + remark: string // 备注 +} + +// 采集设备模型 API +export const DeviceModelApi = { + // 查询采集设备模型分页 + getDeviceModelPage: async (params: any) => { + return await request.get({ url: `/iot/device-model/page`, params }) + }, + + // 查询采集设备模型详情 + getDeviceModel: async (id: number) => { + return await request.get({ url: `/iot/device-model/get?id=` + id }) + }, + + // 新增采集设备模型 + createDeviceModel: async (data: DeviceModelVO) => { + return await request.post({ url: `/iot/device-model/create`, data }) + }, + + // 修改采集设备模型 + updateDeviceModel: async (data: DeviceModelVO) => { + return await request.put({ url: `/iot/device-model/update`, data }) + }, + + // 删除采集设备模型 + deleteDeviceModel: async (id: number) => { + return await request.delete({ url: `/iot/device-model/delete?id=` + id }) + }, + + // 导出采集设备模型 Excel + exportDeviceModel: async (params) => { + return await request.download({ url: `/iot/device-model/export-excel`, params }) + }, + + // 获得采集设备模型列表 + getDeviceModelList: async () => { + return await request.get({ url: `/iot/device-model/list`}) + }, +} diff --git a/src/api/iot/devicemodelattribute/index.ts b/src/api/iot/devicemodelattribute/index.ts new file mode 100644 index 00000000..cbfee946 --- /dev/null +++ b/src/api/iot/devicemodelattribute/index.ts @@ -0,0 +1,48 @@ +import request from '@/config/axios' + +// 采集设备模型-点位管理 VO +export interface DeviceModelAttributeVO { + id: number // ID + attributeCode: string // 点位编码 + attributeName: string // 点位名称 + attributeType: string // 点位类型 + dataType: string // 数据类型 + address: string // 寄存器地址 + dataUnit: string // 单位 + ratio: number // 倍率 + remark: string // 备注 + deviceModelId: number // 采集设备模型id +} + +// 采集设备模型-点位管理 API +export const DeviceModelAttributeApi = { + // 查询采集设备模型-点位管理分页 + getDeviceModelAttributePage: async (params: any) => { + return await request.get({ url: `/iot/device-model-attribute/page`, params }) + }, + + // 查询采集设备模型-点位管理详情 + getDeviceModelAttribute: async (id: number) => { + return await request.get({ url: `/iot/device-model-attribute/get?id=` + id }) + }, + + // 新增采集设备模型-点位管理 + createDeviceModelAttribute: async (data) => { + return await request.post({ url: `/iot/device-model-attribute/create`, data }) + }, + + // 修改采集设备模型-点位管理 + updateDeviceModelAttribute: async (data) => { + return await request.put({ url: `/iot/device-model-attribute/update`, data }) + }, + + // 删除采集设备模型-点位管理 + deleteDeviceModelAttribute: async (id: number) => { + return await request.delete({ url: `/iot/device-model-attribute/delete?id=` + id }) + }, + + // 导出采集设备模型-点位管理 Excel + exportDeviceModelAttribute: async (params) => { + return await request.download({ url: `/iot/device-model-attribute/export-excel`, params }) + }, +} diff --git a/src/api/mes/energydevice/index.ts b/src/api/mes/energydevice/index.ts index 9e2460da..3094d114 100644 --- a/src/api/mes/energydevice/index.ts +++ b/src/api/mes/energydevice/index.ts @@ -5,13 +5,17 @@ export interface EnergyDeviceVO { id: number // ID name: string // 名称 code: string // 编码 - deviceType: string // 设备类型 + deviceTypeId: number // 设备类型id + deviceTypeName: string // 设备类型名称 info: string // 信息资料 checkCron: string // 抄表周期cron lastCheckTime: Date // 最后抄表时间 lastCheckValue: number // 最后抄表值 unitName: string // 单位 isEnable: boolean // 是否启用 + orgId: number // 所属区域id + orgName: string // 所属区域名称 + rules: string // 计算规则 } // 能源设备 API diff --git a/src/api/mes/energytype/index.ts b/src/api/mes/energytype/index.ts new file mode 100644 index 00000000..62677641 --- /dev/null +++ b/src/api/mes/energytype/index.ts @@ -0,0 +1,49 @@ +import request from '@/config/axios' + +// 能耗类型 VO +export interface EnergyTypeVO { + id: number // ID + code: string // 能耗类型编码 + name: string // 能耗类型名称 + unit: string // 单位 + isEnable: boolean // 是否启用 + remark: string // 备注 +} + +// 能耗类型 API +export const EnergyTypeApi = { + // 查询能耗类型分页 + getEnergyTypePage: async (params: any) => { + return await request.get({ url: `/mes/energy-type/page`, params }) + }, + + // 查询能耗类型详情 + getEnergyType: async (id: number) => { + return await request.get({ url: `/mes/energy-type/get?id=` + id }) + }, + + // 新增能耗类型 + createEnergyType: async (data: EnergyTypeVO) => { + return await request.post({ url: `/mes/energy-type/create`, data }) + }, + + // 修改能耗类型 + updateEnergyType: async (data: EnergyTypeVO) => { + return await request.put({ url: `/mes/energy-type/update`, data }) + }, + + // 删除能耗类型 + deleteEnergyType: async (id: number) => { + return await request.delete({ url: `/mes/energy-type/delete?id=` + id }) + }, + + // 导出能耗类型 Excel + exportEnergyType: async (params) => { + return await request.download({ url: `/mes/energy-type/export-excel`, params }) + }, + + // 获得能耗类型列表 + getEnergyTypeList: async () => { + return await request.get({ url: `/mes/energy-type/list`}) + }, +} diff --git a/src/api/mes/moldget/index.ts b/src/api/mes/moldget/index.ts new file mode 100644 index 00000000..679539bc --- /dev/null +++ b/src/api/mes/moldget/index.ts @@ -0,0 +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 diff --git a/src/api/mes/moldrecorditem/index.ts b/src/api/mes/moldrecorditem/index.ts new file mode 100644 index 00000000..730b56bb --- /dev/null +++ b/src/api/mes/moldrecorditem/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +// 维保方案 VO +export interface MoldRecordItemVO { + id: number // ID + name: string // 名称 + type: string // 类型 + subjectId: string // 关联项目id + remark: string // 备注 +} + +// 维保方案 API +export const MoldRecordItemApi = { + // 查询维保方案分页 + getMoldRecordItemPage: async (params: any) => { + return await request.get({ url: `/mes/mold-record-item/page`, params }) + }, + + // 查询维保方案详情 + getMoldRecordItem: async (id: number) => { + return await request.get({ url: `/mes/mold-record-item/get?id=` + id }) + }, + + // 新增维保方案 + createMoldRecordItem: async (data: MoldRecordItemVO) => { + return await request.post({ url: `/mes/mold-record-item/create`, data }) + }, + + // 修改维保方案 + updateMoldRecordItem: async (data: MoldRecordItemVO) => { + return await request.put({ url: `/mes/mold-record-item/update`, data }) + }, + + // 删除维保方案 + deleteMoldRecordItem: async (id: number) => { + return await request.delete({ url: `/mes/mold-record-item/delete?id=` + id }) + }, + + // 导出维保方案 Excel + exportMoldRecordItem: async (params) => { + return await request.download({ url: `/mes/mold-record-item/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/src/api/mes/moldreturn/index.ts b/src/api/mes/moldreturn/index.ts new file mode 100644 index 00000000..7b10ee5f --- /dev/null +++ b/src/api/mes/moldreturn/index.ts @@ -0,0 +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 diff --git a/src/api/mes/zjitem/index.ts b/src/api/mes/zjitem/index.ts new file mode 100644 index 00000000..64a8363f --- /dev/null +++ b/src/api/mes/zjitem/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +// 质量管理-检验项目 VO +export interface ZjItemVO { + id: number // ID + zjType: number // 检验类型 + name: string // 名称 + remark: string // 备注 + tool: string // 作业方式 + standardVal: number // 标准值 + unit: string // 单位 + upperVal: number // 上限值 + lowerVal: number // 下限值 +} + +// 质量管理-检验项目 API +export const ZjItemApi = { + // 查询质量管理-检验项目分页 + getZjItemPage: async (params: any) => { + return await request.get({ url: `/mes/zj-item/page`, params }) + }, + + // 查询质量管理-检验项目详情 + getZjItem: async (id: number) => { + return await request.get({ url: `/mes/zj-item/get?id=` + id }) + }, + + // 新增质量管理-检验项目 + createZjItem: async (data: ZjItemVO) => { + return await request.post({ url: `/mes/zj-item/create`, data }) + }, + + // 修改质量管理-检验项目 + updateZjItem: async (data: ZjItemVO) => { + return await request.put({ url: `/mes/zj-item/update`, data }) + }, + + // 删除质量管理-检验项目 + deleteZjItem: async (id: number) => { + return await request.delete({ url: `/mes/zj-item/delete?id=` + id }) + }, + + // 导出质量管理-检验项目 Excel + exportZjItem: async (params) => { + return await request.download({ url: `/mes/zj-item/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/src/api/mes/zjschema/index.ts b/src/api/mes/zjschema/index.ts new file mode 100644 index 00000000..f166c33f --- /dev/null +++ b/src/api/mes/zjschema/index.ts @@ -0,0 +1,44 @@ +import request from '@/config/axios' + +// 检验方案 VO +export interface ZjSchemaVO { + type: string // 类型 + name: string // 名称 + remark: string // 备注 + sampleMethod: string // 抽检方式 + val: number // 值 + item: string // 关联项目 +} + +// 检验方案 API +export const ZjSchemaApi = { + // 查询检验方案分页 + getZjSchemaPage: async (params: any) => { + return await request.get({ url: `/mes/zj-schema/page`, params }) + }, + + // 查询检验方案详情 + getZjSchema: async (id: number) => { + return await request.get({ url: `/mes/zj-schema/get?id=` + id }) + }, + + // 新增检验方案 + createZjSchema: async (data: ZjSchemaVO) => { + return await request.post({ url: `/mes/zj-schema/create`, data }) + }, + + // 修改检验方案 + updateZjSchema: async (data: ZjSchemaVO) => { + return await request.put({ url: `/mes/zj-schema/update`, data }) + }, + + // 删除检验方案 + deleteZjSchema: async (id: number) => { + return await request.delete({ url: `/mes/zj-schema/delete?id=` + id }) + }, + + // 导出检验方案 Excel + exportZjSchema: async (params) => { + return await request.download({ url: `/mes/zj-schema/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/src/api/mes/zjtype/index.ts b/src/api/mes/zjtype/index.ts new file mode 100644 index 00000000..c27c6ca7 --- /dev/null +++ b/src/api/mes/zjtype/index.ts @@ -0,0 +1,47 @@ +import request from '@/config/axios' + +// 质量管理-检验类型 VO +export interface ZjTypeVO { + id: number // ID + code: string // 编码 + name: string // 名称 + remark: string // 备注 +} + +// 质量管理-检验类型 API +export const ZjTypeApi = { + // 查询质量管理-检验类型分页 + getZjTypePage: async (params: any) => { + return await request.get({ url: `/mes/zj-type/page`, params }) + }, + + // 查询质量管理-检验类型详情 + getZjType: async (id: number) => { + return await request.get({ url: `/mes/zj-type/get?id=` + id }) + }, + + // 新增质量管理-检验类型 + createZjType: async (data: ZjTypeVO) => { + return await request.post({ url: `/mes/zj-type/create`, data }) + }, + + // 修改质量管理-检验类型 + updateZjType: async (data: ZjTypeVO) => { + return await request.put({ url: `/mes/zj-type/update`, data }) + }, + + // 删除质量管理-检验类型 + deleteZjType: async (id: number) => { + return await request.delete({ url: `/mes/zj-type/delete?id=` + id }) + }, + + // 导出质量管理-检验类型 Excel + exportZjType: async (params) => { + return await request.download({ url: `/mes/zj-type/export-excel`, params }) + }, + + // 获得检验类型列表 + getZjTypeList: async () => { + return await request.get({ url: `/mes/zj-type/list`}) + }, +} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index ea1f78f1..3522a338 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -224,6 +224,7 @@ export enum DICT_TYPE { ERP_AUTOCODE_CYCLEMETHOD = "erp_autocode_cyclemethod", ERP_AUTOCODE_PARTTYPE = "erp_autocode_parttype", + // ========== MES - 生产管理模块 ========== MES_ORG_TYPE = "mes_org_type", MES_ORG_CLASS = "mes_org_class", @@ -272,4 +273,8 @@ export enum DICT_TYPE { IOT_ATTRIBUTE_IO_TYPE = "iot_attribute_io_type", IOT_ALERT_TYPE = "iot_alert_type", IOT_ALERT_LEVEL = "iot_alert_level", + IOT_PROTOCOL = "iot_protocol", + IOT_DEVICE_ATTRIBUTE_UNIT = "iot_device_attribute_unit", + + PRIMARY_FLAG = "primary_flag" } diff --git a/src/views/erp/autocode/AutocodeIndex.vue b/src/views/erp/autocode/AutocodeIndex.vue index f80f1697..21767d5d 100644 --- a/src/views/erp/autocode/AutocodeIndex.vue +++ b/src/views/erp/autocode/AutocodeIndex.vue @@ -120,7 +120,7 @@ - +