diff --git a/README.md b/README.md index 871612b43..648fbf09c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ -## dev发布2024-06-01-001 +## dev发布2024-06-01-002 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { labelMessage: '信息提示说明！！！', componentProps: { + value:'undefined',//默认值，设置为'undefined'-->实际是undefined(解决SelectV2不显示占位符placeholder) enterSearch: true, //可输入回车 对应绑定事件：@onEnter="onEnter" isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 diff --git a/index.html b/index.html index 847a1533b..e322068ed 100644 --- a/index.html +++ b/index.html @@ -6,14 +6,8 @@ - - + + %VITE_APP_TITLE% diff --git a/src/api/eam/basicSpotCheckOption/index.ts b/src/api/eam/basicSpotCheckOption/index.ts new file mode 100644 index 000000000..5b7d2d409 --- /dev/null +++ b/src/api/eam/basicSpotCheckOption/index.ts @@ -0,0 +1,63 @@ +import request from '@/config/axios' + +export interface BasicSpotCheckOptionVO { + id: number + code: string + name: string + selectId: number + describing: string + isUpdated: boolean + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询点检方案列表 +export const getBasicSpotCheckOptionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic-spotCheck-option/senior', data }) + } else { + return await request.get({ url: `/eam/basic-spotCheck-option/page`, params }) + } +} + +// 查询点检方案详情 +export const getBasicSpotCheckOption = async (id: number) => { + return await request.get({ url: `/eam/basic-spotCheck-option/get?id=` + id }) +} + +// 新增点检方案 +export const createBasicSpotCheckOption = async (data: BasicSpotCheckOptionVO) => { + return await request.post({ url: `/eam/basic-spotCheck-option/create`, data }) +} + +// 修改点检方案 +export const updateBasicSpotCheckOption = async (data: BasicSpotCheckOptionVO) => { + return await request.put({ url: `/eam/basic-spotCheck-option/update`, data }) +} + +// 删除点检方案 +export const deleteBasicSpotCheckOption = async (id: number) => { + return await request.delete({ url: `/eam/basic-spotCheck-option/delete?id=` + id }) +} + +// 导出点检方案 Excel +export const exportBasicSpotCheckOption = async (params) => { + return await request.download({ url: `/eam/basic-spotCheck-option/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic-spotCheck-option/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: BasicSpotCheckOptionVO) => { + return await request.post({ url: `/eam/basic-spotCheck-option/ables` , data }) +} diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts index 0d19f793a..e06982c20 100644 --- a/src/api/eam/equipmentRepairJobMain/index.ts +++ b/src/api/eam/equipmentRepairJobMain/index.ts @@ -79,6 +79,7 @@ export const updateEquipmentRepairMain = async (data: EquipmentRepairJobMainVO) return await request.post({ url: `/eam/equipment-repair-job-main/updateRepair`, data }) } + // 完成维修工单主 export const executeEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => { return await request.post({ url: `/eam/equipment-repair-job-main/execute`, data }) @@ -104,8 +105,13 @@ export const updateEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) return await request.post({ url: `/eam/equipment-repair-job-main/updateOrder`, data }) } -//验证不通过,打回维修工单 +//维修验证不通过,打回维修工单 export const backEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) => { return await request.post({ url: `/eam/equipment-repair-job-main/fallback`, data }) } +//报修验证不通过,生成新工单 +export const createEquipmentRepairNewOrder = async (data: EquipmentRepairJobMainVO) => { + return await request.post({ url: `/eam/equipment-repair-job-main/createNew`, data }) +} + diff --git a/src/api/eam/equipmentReportRepairRequest/index.ts b/src/api/eam/equipmentReportRepairRequest/index.ts index 1eeec7e86..10542bbf9 100644 --- a/src/api/eam/equipmentReportRepairRequest/index.ts +++ b/src/api/eam/equipmentReportRepairRequest/index.ts @@ -81,3 +81,8 @@ export const updateEquipmentReportRepairOrder = async (data: EquipmentReportRepa export const createEquipmentWeixiuOrder = async (data: EquipmentReportRepairRequestVO) => { return await request.post({ url: `/eam/equipment-report-repair-request/updateCreateOrder`, data }) } + +// 查询报修工单文件附件 +export const getEquipmentReportFileInfo = async (data) => { + return await request.post({ url: `/eam/equipment-report-repair-request/fileListInfo`, data }) +} diff --git a/src/api/eam/inspectionItem/index.ts b/src/api/eam/inspectionItem/index.ts index 86b606728..ddf8cf80f 100644 --- a/src/api/eam/inspectionItem/index.ts +++ b/src/api/eam/inspectionItem/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import {InspectionItemSelectSetVO} from "@/api/eam/inspectionItemSelectSet"; export interface InspectionItemVO { id: number @@ -59,4 +60,10 @@ export const exportInspectionItem = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/basic/inspection-item/get-import-template' }) -} \ No newline at end of file +} + + +// 启用 / 禁用 +export const updateEnableCode = async (data: InspectionItemVO) => { + return await request.post({ url: `/eam/basic/inspection-item/ables` , data }) +} diff --git a/src/api/eam/planInspection/index.ts b/src/api/eam/planInspection/index.ts new file mode 100644 index 000000000..10b3fbf24 --- /dev/null +++ b/src/api/eam/planInspection/index.ts @@ -0,0 +1,91 @@ +import request from '@/config/axios' +import {MaintenanceVO} from "@/api/eam/maintenance"; + +export interface PlanInspectionVO { + id: number + number: string + name: string + equipmentCode: string + type: string + optionCode: string + cycle: string + startTime: Date + endTime: Date + status: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + factoryAreaCode: string + workshopCode: string + lineCode: string + processCode: string + workstationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检计划列表 +export const getPlanInspectionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/plan-inspection/senior', data }) + } else { + return await request.get({ url: `/eam/plan-inspection/page`, params }) + } +} + +// 查询巡检计划详情 +export const getPlanInspection = async (id: number) => { + return await request.get({ url: `/eam/plan-inspection/get?id=` + id }) +} + +// 新增巡检计划 +export const createPlanInspection = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/create`, data }) +} + +// 修改巡检计划 +export const updatePlanInspection = async (data: PlanInspectionVO) => { + return await request.put({ url: `/eam/plan-inspection/update`, data }) +} + +// 修改巡检计划-审核 +export const updateInspectionPlanAudi = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/updateAudi`, data }) +} + +// 删除巡检计划 +export const deletePlanInspection = async (id: number) => { + return await request.delete({ url: `/eam/plan-inspection/delete?id=` + id }) +} + +// 导出巡检计划 Excel +export const exportPlanInspection = async (params) => { + return await request.download({ url: `/eam/plan-inspection/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/plan-inspection/get-import-template' }) +} + + +// 启用 / 禁用 +export const updateEnableCode = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/ables` , data }) +} + + +// 修改计划状态 +export const updateInspectionPlan = async (data: PlanInspectionVO) => { + return await request.post({ url: `/eam/plan-inspection/updatePlan`, data }) +} diff --git a/src/api/eam/planSpotCheck/index.ts b/src/api/eam/planSpotCheck/index.ts new file mode 100644 index 000000000..9ed72a1cb --- /dev/null +++ b/src/api/eam/planSpotCheck/index.ts @@ -0,0 +1,91 @@ +import request from '@/config/axios' +import {PlanInspectionVO} from "@/api/eam/planInspection"; + +export interface PlanSpotCheckVO { + id: number + number: string + name: string + equipmentCode: string + type: string + optionCode: string + cycle: string + startTime: Date + endTime: Date + status: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + factoryAreaCode: string + workshopCode: string + lineCode: string + processCode: string + workstationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询点检计划列表 +export const getPlanSpotCheckPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/plan-spot-check/senior', data }) + } else { + return await request.get({ url: `/eam/plan-spot-check/page`, params }) + } +} + +// 查询点检计划详情 +export const getPlanSpotCheck = async (id: number) => { + return await request.get({ url: `/eam/plan-spot-check/get?id=` + id }) +} + +// 新增点检计划 +export const createPlanSpotCheck = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/create`, data }) +} + +// 修改点检计划 +export const updatePlanSpotCheck = async (data: PlanSpotCheckVO) => { + return await request.put({ url: `/eam/plan-spot-check/update`, data }) +} + +// 修改巡检计划-审核 +export const updateSpotCheckPlanAudi = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/updateAudi`, data }) +} + +// 删除点检计划 +export const deletePlanSpotCheck = async (id: number) => { + return await request.delete({ url: `/eam/plan-spot-check/delete?id=` + id }) +} + +// 导出点检计划 Excel +export const exportPlanSpotCheck = async (params) => { + return await request.download({ url: `/eam/plan-spot-check/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/plan-spot-check/get-import-template' }) +} + + +// 启用 / 禁用 +export const updateEnableCode = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/ables` , data }) +} + + +// 修改计划状态 +export const updateSpotCheckPlan = async (data: PlanSpotCheckVO) => { + return await request.post({ url: `/eam/plan-spot-check/updatePlan`, data }) +} diff --git a/src/api/eam/sparePartsInLocationDetail/index.ts b/src/api/eam/sparePartsInLocationDetail/index.ts new file mode 100644 index 000000000..827687a36 --- /dev/null +++ b/src/api/eam/sparePartsInLocationDetail/index.ts @@ -0,0 +1,58 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationDetailVO { + id: number + number: string + masterId: number + sparePartsCode: string + isRadeIn: string + applyQty: number + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询备件入库记录子列表 +export const getSparePartsInLocationDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/spare-parts-in-location-detail/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-detail/page`, params }) + } +} + +// 查询备件入库记录子详情 +export const getSparePartsInLocationDetail = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-detail/get?id=` + id }) +} + +// 新增备件入库记录子 +export const createSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => { + return await request.post({ url: `/eam/spare-parts-in-location-detail/create`, data }) +} + +// 修改备件入库记录子 +export const updateSparePartsInLocationDetail = async (data: SparePartsInLocationDetailVO) => { + return await request.put({ url: `/eam/spare-parts-in-location-detail/update`, data }) +} + +// 删除备件入库记录子 +export const deleteSparePartsInLocationDetail = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-detail/delete?id=` + id }) +} + +// 导出备件入库记录子 Excel +export const exportSparePartsInLocationDetail = async (params) => { + return await request.download({ url: `/eam/spare-parts-in-location-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationMain/index.ts b/src/api/eam/sparePartsInLocationMain/index.ts new file mode 100644 index 000000000..2365b84e3 --- /dev/null +++ b/src/api/eam/sparePartsInLocationMain/index.ts @@ -0,0 +1,87 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationMainVO { + id: number + number: string + theme: string + status: string + applyer: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + areaCode: string + locationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询备件入库记录主列表 +export const getSparePartsInLocationMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/spare-parts-in-location-main/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-main/page`, params }) + } +} + +// 查询备件入库记录主详情 +export const getSparePartsInLocationMain = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-main/get?id=` + id }) +} + +// 新增备件入库记录主 +export const createSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => { + return await request.post({ url: `/eam/spare-parts-in-location-main/create`, data }) +} + +// 修改备件入库记录主 +export const updateSparePartsInLocationMain = async (data: SparePartsInLocationMainVO) => { + return await request.put({ url: `/eam/spare-parts-in-location-main/update`, data }) +} + +// 删除备件入库记录主 +export const deleteSparePartsInLocationMain = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-main/delete?id=` + id }) +} + +// 导出备件入库记录主 Excel +export const exportSparePartsInLocationMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/spare-parts-in-location-main/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/eam/spare-parts-in-location-main/export-excel`, params }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-main/get-import-template' }) +} + +// 撤回 +export const cancelSparePartsInLocation = async (id) => { + return await request.get({ url: `/eam/spare-parts-in-location-main/cancel?id=` + id }) +} +// 审核 +export const submitExamineSparePartsInLocation = async (id) => { + return await request.get({ url: `/eam/spare-parts-in-location-main/submitExamine?id=` + id }) +} +// 审核驳回 +export const rejectSparePartsInLocation = async (id) => { + return await request.get({ url: `/eam/spare-parts-in-location-main/reject?id=` + id }) +} +// 审核通过 +export const approveSparePartsInLocation = async (data) => { + return await request.post({ url: `/eam/spare-parts-in-location-main/approve`,data }) +} diff --git a/src/api/eam/sparePartsInLocationRecordDetail/index.ts b/src/api/eam/sparePartsInLocationRecordDetail/index.ts new file mode 100644 index 000000000..55c8eba4a --- /dev/null +++ b/src/api/eam/sparePartsInLocationRecordDetail/index.ts @@ -0,0 +1,58 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationDetailRecordVO { + id: number + number: string + masterId: number + sparePartsCode: string + isRadeIn: string + applyQty: number + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询备件入库记录子列表 +export const getSparePartsInLocationDetailRecordPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/spare-parts-in-location-detail-record/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-detail-record/page`, params }) + } +} + +// 查询备件入库记录子详情 +export const getSparePartsInLocationDetailRecord = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-detail-record/get?id=` + id }) +} + +// 新增备件入库记录子 +export const createSparePartsInLocationDetailRecord = async (data: SparePartsInLocationDetailRecordVO) => { + return await request.post({ url: `/eam/spare-parts-in-location-detail-record/create`, data }) +} + +// 修改备件入库记录子 +export const updateSparePartsInLocationDetailRecord = async (data: SparePartsInLocationDetailRecordVO) => { + return await request.put({ url: `/eam/spare-parts-in-location-detail-record/update`, data }) +} + +// 删除备件入库记录子 +export const deleteSparePartsInLocationDetailRecord = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-detail-record/delete?id=` + id }) +} + +// 导出备件入库记录子 Excel +export const exportSparePartsInLocationDetailRecord = async (params) => { + return await request.download({ url: `/eam/spare-parts-in-location-detail-record/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-detail-record/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/sparePartsInLocationRecordMain/index.ts b/src/api/eam/sparePartsInLocationRecordMain/index.ts new file mode 100644 index 000000000..27ce7fb95 --- /dev/null +++ b/src/api/eam/sparePartsInLocationRecordMain/index.ts @@ -0,0 +1,72 @@ +import request from '@/config/axios' + +export interface SparePartsInLocationMainRecordVO { + id: number + number: string + theme: string + status: string + applyer: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + areaCode: string + locationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询备件入库记录主列表 +export const getSparePartsInLocationMainRecordPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/spare-parts-in-location-main-record/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-in-location-main-record/page`, params }) + } +} + +// 查询备件入库记录主详情 +export const getSparePartsInLocationMainRecord = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-in-location-main-record/get?id=` + id }) +} + +// 新增备件入库记录主 +export const createSparePartsInLocationMainRecord = async ( + data: SparePartsInLocationMainRecordVO +) => { + return await request.post({ url: `/eam/spare-parts-in-location-main-record/create`, data }) +} + +// 修改备件入库记录主 +export const updateSparePartsInLocationMainRecord = async ( + data: SparePartsInLocationMainRecordVO +) => { + return await request.put({ url: `/eam/spare-parts-in-location-main-record/update`, data }) +} + +// 删除备件入库记录主 +export const deleteSparePartsInLocationMainRecord = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-in-location-main-record/delete?id=` + id }) +} + +// 导出备件入库记录主 Excel +export const exportSparePartsInLocationMainRecord = async (params) => { + return await request.download({ + url: `/eam/spare-parts-in-location-main-record/export-excel`, + params + }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-in-location-main-record/get-import-template' }) +} diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js new file mode 100644 index 000000000..680825ba5 --- /dev/null +++ b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js @@ -0,0 +1,54 @@ +import request from '@/utils/request' + +// 创建领用出库记录子 +export function createSparePartsOutLocationRecordDetail(data) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/create', + method: 'post', + data: data + }) +} + +// 更新领用出库记录子 +export function updateSparePartsOutLocationRecordDetail(data) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/update', + method: 'put', + data: data + }) +} + +// 删除领用出库记录子 +export function deleteSparePartsOutLocationRecordDetail(id) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/delete?id=' + id, + method: 'delete' + }) +} + +// 获得领用出库记录子 +export function getSparePartsOutLocationRecordDetail(id) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/get?id=' + id, + method: 'get' + }) +} + +// 获得领用出库记录子分页 +export function getSparePartsOutLocationRecordDetailPage(query) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/page', + method: 'get', + params: query + }) +} + +// 导出领用出库记录子 Excel +export function exportSparePartsOutLocationRecordDetailExcel(query) { + return request({ + url: '/eam/spare-parts-out-location-detail-record/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/eam/sparePartsOutLocationRecordMain/index.ts b/src/api/eam/sparePartsOutLocationRecordMain/index.ts new file mode 100644 index 000000000..4f075cce1 --- /dev/null +++ b/src/api/eam/sparePartsOutLocationRecordMain/index.ts @@ -0,0 +1,71 @@ +import request from '@/config/axios' + +export interface SparePartsOutLocationRecordMainVO { + id: number + number: string + theme: string + applyer: string + approver: number + approveContent: string + approveTime: Date + autoExamine: string + autoAgree: string + directCreateRecord: string + areaCode: string + locationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询领用出库记录主列表 +export const getSparePartsOutLocationRecordMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/spare-parts-out-location-main-record/senior', data }) + } else { + return await request.get({ url: `/eam/spare-parts-out-location-main-record/page`, params }) + } +} + +// 查询领用出库记录主详情 +export const getSparePartsOutLocationRecordMain = async (id: number) => { + return await request.get({ url: `/eam/spare-parts-out-location-main-record/get?id=` + id }) +} + +// 新增领用出库记录主 +export const createSparePartsOutLocationRecordMain = async ( + data: SparePartsOutLocationRecordMainVO +) => { + return await request.post({ url: `/eam/spare-parts-out-location-main-record/create`, data }) +} + +// 修改领用出库记录主 +export const updateSparePartsOutLocationRecordMain = async ( + data: SparePartsOutLocationRecordMainVO +) => { + return await request.put({ url: `/eam/spare-parts-out-location-main-record/update`, data }) +} + +// 删除领用出库记录主 +export const deleteSparePartsOutLocationRecordMain = async (id: number) => { + return await request.delete({ url: `/eam/spare-parts-out-location-main-record/delete?id=` + id }) +} + +// 导出领用出库记录主 Excel +export const exportSparePartsOutLocationRecordMain = async (params) => { + return await request.download({ + url: `/eam/spare-parts-out-location-main-record/export-excel`, + params + }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/spare-parts-out-location-main-record/get-import-template' }) +} diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts index b0e97fffb..1295c4629 100644 --- a/src/api/wms/areabasic/index.ts +++ b/src/api/wms/areabasic/index.ts @@ -23,6 +23,11 @@ export const getAreaPage = async (params) => { return await request.get({ url: `/wms/areabasic/page`, params }) } } + +// 查询库区列表 +export const selectAreabasicDOByCode = async (locationCode: String) => { + return await request.get({ url: `/wms/areabasic/getArea?locationCode=`+locationCode }) +} // 查询库区列表 export const getAreaList = async (params) => { return await request.get({ url: `/wms/areabasic/list`, params }) diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index 2f685a8cf..c5f532bd9 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -76,7 +76,7 @@ export const exportCountJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-job-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-job-main/export-excel`, params }) } @@ -98,4 +98,4 @@ export const handleExportCountJob = async (id: number) => { masterId:id } return await request.download({ url: `/wms/count-job-main/export-excel-single`, params }) -} \ No newline at end of file +} diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts index 0e3bc85fb..69cc8d502 100644 --- a/src/api/wms/countPlanMain/index.ts +++ b/src/api/wms/countPlanMain/index.ts @@ -63,7 +63,7 @@ export const exportCountPlanMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-plan-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-plan-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-plan-main/export-excel`, params }) } @@ -107,4 +107,4 @@ export const publish = (id) => { // 重置 export const resetting = (id) => { return request.put({ url: '/wms/count-plan-main/resetting?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/countRecordMain/index.ts b/src/api/wms/countRecordMain/index.ts index 35d2ef3db..71012a8e2 100644 --- a/src/api/wms/countRecordMain/index.ts +++ b/src/api/wms/countRecordMain/index.ts @@ -59,7 +59,7 @@ export const exportCountRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-record-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-record-main/export-excel`, params }) } @@ -73,4 +73,4 @@ export const importTemplate = () => { // 生成盘点调整 export const generateCountRecordMain = async (id) => { return await request.put({ url: `/wms/count-record-main/generate?id=` + id}) -} \ No newline at end of file +} diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts index b353bf0f9..77ff0c03d 100644 --- a/src/api/wms/countRequestMain/index.ts +++ b/src/api/wms/countRequestMain/index.ts @@ -58,7 +58,7 @@ export const exportCountRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-request-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-request-main/export-excel`, params }) } @@ -115,4 +115,4 @@ export const generateCountadjustRequest = async (id) => { //解冻 export const thaw = async (id) => { return await request.put({ url: `/wms/count-request-main/thaw?id=` + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/countadjustRecordMain/index.ts b/src/api/wms/countadjustRecordMain/index.ts index 02dc4ed60..8cb6da3f7 100644 --- a/src/api/wms/countadjustRecordMain/index.ts +++ b/src/api/wms/countadjustRecordMain/index.ts @@ -57,7 +57,7 @@ export const exportCountadjustRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/countadjust-record-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/countadjust-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params }) } @@ -66,4 +66,4 @@ export const exportCountadjustRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/countadjust-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts index 4cc19ee4d..d1612bd5e 100644 --- a/src/api/wms/countadjustRequestMain/index.ts +++ b/src/api/wms/countadjustRequestMain/index.ts @@ -57,7 +57,7 @@ export const exportCountadjustRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/countadjust-request-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/countadjust-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params }) } diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index a92781ac3..25f3566ec 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -108,4 +108,9 @@ export const selectConfigToItembasic = async (params) => { } else { return await request.get({ url: `/wms/itembasic/pageConfigToItembasic`, params }) } +} + +// 根据物料代码查计量单位 +export const getQueryItemCodeInfo = async (data) => { + return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data }) } \ No newline at end of file diff --git a/src/api/wms/preparetoissueDetail/index.ts b/src/api/wms/preparetoissueDetail/index.ts index 44655ff0f..c9b0fddc5 100644 --- a/src/api/wms/preparetoissueDetail/index.ts +++ b/src/api/wms/preparetoissueDetail/index.ts @@ -18,7 +18,14 @@ export interface PreparetoissueDetailVO { // 查询备料计划子列表 export const getPreparetoissueDetailPage = async (params) => { - return await request.get({ url: `/wms/preparetoissue-detail/page`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/preparetoissue-detail/senior', data }) + } else { + return await request.get({ url: `/wms/preparetoissue-detail/page`, params }) + } + } // 查询备料计划子详情 diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts index 0b1b75cf3..7b21ba14b 100644 --- a/src/api/wms/productreceiptRequestDetail/index.ts +++ b/src/api/wms/productreceiptRequestDetail/index.ts @@ -66,6 +66,7 @@ export const getProductreceiptRequestDetailPageScrap = async (params) => { } } + // 查询制品收货申请子详情 export const getProductreceiptRequestDetail = async (id: number) => { return await request.get({ url: `/wms/productreceipt-request-detail/get?id=` + id }) diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts index 1b35d8ec9..3da2f8973 100644 --- a/src/api/wms/purchasePlanDetail/index.ts +++ b/src/api/wms/purchasePlanDetail/index.ts @@ -56,3 +56,14 @@ export const deletePurchasePlanDetail = async (id: number) => { export const exportPurchasePlanDetail = async (params) => { return await request.download({ url: `/wms/purchase-plan-detail/export-excel`, params }) } + +// WMS查询要货计划子列表 +export const getPurchasePlanDetailPagewms = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchase-plan-detail/seniorWMS', data }) + } else { + return await request.get({ url: `/wms/purchase-plan-detail/pageWMS`, params }) + } +} diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 6db386db5..25f05c601 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -100,6 +100,16 @@ export const exportPurchasereceiptJobMain = async (params) => { } } + +// 导出备件收货任务 +export const exportSparereceiptJobMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-job-main/export-excel-spare-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-job-main/export-excel-spare`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-job-main/get-import-template' }) diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index 5f1ad8101..684984333 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -89,6 +89,16 @@ export const exportPurchasereceiptRecordMain = async (params) => { } } +// 导出备件收货记录 +export const exportSparereceiptRecordMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-spare-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel-spare`, params }) + } +} + // 导出采购收货记录主 Excel export const exportPurchasereceiptRecordMainSCP = async (params) => { if (params.isSearch) { @@ -112,4 +122,4 @@ export const createPutawayRequest = async (number:string) => { // 创建检验申请 export const createInspectRequest = async (number:string) => { return await request.post({ url: `/wms/purchasereceipt-record-main/createInspectRequest?number=`+number }) -} \ No newline at end of file +} diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index ba9f8a8a0..fa910cb1b 100644 --- a/src/api/wms/purchasereceiptRequestMain/index.ts +++ b/src/api/wms/purchasereceiptRequestMain/index.ts @@ -88,6 +88,16 @@ export const exportPurchasereceiptRequestMain = async (params) => { } } +// 导出备件收货申请 +export const exportSparereceiptRequestMain = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-spare-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel-spare`, params }) + } +} + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-request-main/get-import-template' }) diff --git a/src/api/wms/saleDetail/index.ts b/src/api/wms/saleDetail/index.ts index 79c182062..5c928c170 100644 --- a/src/api/wms/saleDetail/index.ts +++ b/src/api/wms/saleDetail/index.ts @@ -27,7 +27,13 @@ export interface SaleDetailVO { // 查询销售订单子列表 export const getSaleDetailPage = async (params) => { - return await request.get({ url: `/wms/sale-detail/page`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/sale-detail/senior', data }) + } else { + return await request.get({ url: `/wms/sale-detail/page`, params }) + } } // 查询销售订单子详情 diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts index 7cbc9a250..0dd4c5343 100644 --- a/src/api/wms/supplierinvoiceRequestDetail/index.ts +++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts @@ -51,7 +51,7 @@ export const getSupplierinvoiceRequestDetail = async (id: number) => { } // 新增供应商发票申请子 -export const createSupplierinvoiceRequestDetail = async (data: SupplierinvoiceRequestDetailVO) => { +export const createSupplierinvoiceRequestDetail = async (data) => { return await request.post({ url: `/wms/supplierinvoice-request-detail/create`, data }) } diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts index 882fac24e..96e64a813 100644 --- a/src/api/wms/warehouse/index.ts +++ b/src/api/wms/warehouse/index.ts @@ -58,4 +58,15 @@ export const exportWarehouse = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/warehouse/get-import-template' }) +} + +// 查询仓库列表 +export const pageBusinessTypeToWarehouse = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/warehouse/pageBusinessTypeToWarehouseSenior', data }) + } else { + return await request.get({ url: `/wms/warehouse/pageBusinessTypeToWarehouse`, params }) + } } \ No newline at end of file diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index c34237694..07ef4a755 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -566,9 +566,15 @@ const buttonBaseClick = (val) => { } // 保存 else if (val == 'save') { - debounce(() => { + let timer = null + if(!timer){ submitForm() - }, 2000)() + timer = setTimeout(()=>{ + if(timer){ + clearTimeout(timer) + } + },2000) + } } // 关闭 else if (val == 'close') { diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 77ba581a2..1477668af 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -359,6 +359,12 @@ const props = defineProps({ type: Boolean, required: false, default: true + }, + // 子列表 哪个状态下展示新增修改隐藏 列表 + detailButtonIsShowAddStatusArray:{ + type: Array, + required: false, + default: () => ['1'] }, // 子列表 编辑 展示与隐藏 ，默认展示 detailButtonIsShowEdit:{ @@ -378,12 +384,23 @@ const props = defineProps({ required: false, default: false }, + fieldTableColumn:{ + type: String, + required: false, + default: '' + }, //扩展其他按钮 otherHeadButttonData:{ type:Array, required: false, default: () => [] - } + }, + //主表单独操作--明细左上角新增按钮 + mainSubmitCreateApi:{ + type: Boolean, + required: false, + default: false + }, }) const isShowDrawer = ref(false) const detailLoading = ref(false) @@ -627,7 +644,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: // 新增 detailButtonAdd = [ defaultButtons.defaultAddBtn({ - hide: isShowMainButton(row, ['1']) + hide: isShowMainButton(row, props.detailButtonIsShowAddStatusArray) }) ] } @@ -646,7 +663,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: // 编辑 detailButtonEdit = [ defaultButtons.mainListEditBtn({ - hide: isShowMainButton(row, ['1']) + hide: isShowMainButton(row,props.detailButtonIsShowAddStatusArray) }) ] } @@ -654,7 +671,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: // 删除 detailButtonDelete = [ defaultButtons.mainListDeleteBtn({ - hide: isShowMainButton(row, ['1']) + hide: isShowMainButton(row,props.detailButtonIsShowAddStatusArray) }) ] } @@ -665,7 +682,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: } } } -defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗 +const updateList = ()=>{ + getList() +} +defineExpose({ openDetail, formRef ,updateList}) // 提供 open 方法，用于打开弹窗 // 获取备注列表 const getRemarkList = async () => { @@ -722,16 +742,19 @@ const buttonBaseClick = (val, item) => { masterId: masterParmas.value.masterId, number: masterParmas.value.number }) - const item = props.detailAllSchemas.formSchema[0] - opensearchTable( - item.field, item?.componentProps?.searchField, - item?.componentProps?.searchTitle, - item?.componentProps?.searchAllSchemas, - item?.componentProps?.searchPage, - item?.componentProps?.searchCondition, - item?.componentProps?.multiple, - undefined,undefined - ) + if(props.fieldTableColumn!=''){ + const item = props.detailAllSchemas.formSchema.find(item=>item.field == props.fieldTableColumn) + opensearchTable( + item.field, item?.componentProps?.searchField, + item?.componentProps?.searchTitle, + item?.componentProps?.searchAllSchemas, + item?.componentProps?.searchPage, + item?.componentProps?.searchCondition, + item?.componentProps?.multiple, + undefined,undefined + ) + } + }else{ openForm('create') } @@ -861,13 +884,19 @@ const submitForm = async (formType, data) => { const searchTableSuccess1 = (formField, searchField, val, formRef) => { searchTableFormModel.value[formField] = val.map(item=>item[searchField]).join(',') console.log('searchTableSuccess1',searchTableFormModel) - submitForm(searchTableFormType.value,searchTableFormModel.value) - emit('searchTableSuccessDetail', formField, searchField, val, formRef) + if(props.mainSubmitCreateApi){ + emit('searchTableSuccessDetail', formField, searchField, val, formRef,searchTableFormModel.value) + }else{ + submitForm(searchTableFormType.value,searchTableFormModel.value) + emit('searchTableSuccessDetail', formField, searchField, val, formRef) + + } } // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { emit('searchTableSuccessDetail', formField, searchField, val, formRef) } + // 传递给父类 const emit = defineEmits([ 'searchTableSuccessDetail', @@ -879,7 +908,7 @@ const emit = defineEmits([ 'onBlur', 'detailBasicFormOnChange', 'formFormDateChange', - 'buttonBaseClick' + 'buttonBaseClick', ]) /** 删除按钮操作 */ const handleDelete = async (id: number) => { diff --git a/src/components/DetailTable/src/DetailTable.vue b/src/components/DetailTable/src/DetailTable.vue index b09facbf3..ad5a4a890 100644 --- a/src/components/DetailTable/src/DetailTable.vue +++ b/src/components/DetailTable/src/DetailTable.vue @@ -58,7 +58,7 @@ const countScopeType = ref(props.countScopeType) const allList = ref(props.allList) const forrmatter = (val) => { if(val){ - return countScopeType.value.find((cur) => cur.value == val).label + return countScopeType.value.find((cur) => cur.value == val)?.label || '' }else{ return '' } diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index f55aed8cc..aa85fc5f5 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -55,7 +55,7 @@ export default defineComponent({ vLoading: propTypes.bool.def(false), labelPosition: propTypes.string.def('left'), }, - emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton','changeDialogWidth'], + emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onEnter','hiddenFilterButton','changeDialogWidth','onInput'], setup(props, { slots, expose, emit }) { // element form 实例 const elFormRef = ref>() @@ -204,6 +204,9 @@ export default defineComponent({ const onBlur = (field, e) => { emit('onBlur', field, e) } + const onInput = (field,value) => { + emit('onInput', field,value) + } // 渲染formItem const renderFormItem = (item: FormSchema) => { // 单独给只有options属性的组件做判断 @@ -382,6 +385,7 @@ export default defineComponent({ style={item.componentProps?.style} onChange={(e)=>{onChange(item.field, e)}} onBlur={(e)=>{onBlur(item.field, e)}} + onInput={(value)=>{onInput(item.field,value)}} {...(notRenderOptions.includes(item?.component as string) && item?.componentProps?.options ? { options: item?.componentProps?.options || [] } @@ -460,4 +464,7 @@ export default defineComponent({ margin-right: 0 !important; margin-left: 0 !important; } +::v-deep(.el-select-v2 .el-icon) { + display: inline-flex; +} diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts index 6f0ddafc5..ac3540f4d 100644 --- a/src/components/Form/src/helper.ts +++ b/src/components/Form/src/helper.ts @@ -127,7 +127,7 @@ export const initModel = (schema: FormSchema[], formModel: Recordable) => { } else if (v.component && v.component !== 'Divider') { const hasField = Reflect.has(model, v.field) // 如果先前已经有值存在，则不进行重新赋值，而是采用现有的值 - model[v.field] = hasField ? model[v.field] : v.value !== void 0 ? v.value : '' + model[v.field] = hasField ? model[v.field] : v.value === 'undefined' ? undefined : v.value !== void 0 ? v.value : '' } }) return model diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 3dd5b5ff3..8ac7e2a60 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -43,7 +43,7 @@ const props = defineProps({ } }) -const emit = defineEmits(['search', 'reset']) +const emit = defineEmits(['search', 'reset','onInput']) const visible = ref(true) @@ -88,6 +88,14 @@ const { register, elFormRef, methods } = useForm({ model: props.model || {} }) +const onInput = (field,value) => { + emit('onInput', field,value) +} + +const formRef = ref() +const setFormValues = (formData)=>{ + formRef.value.setValues(formData) +} const search = async () => { await unref(elFormRef)?.validate(async (isValid) => { if (isValid) { @@ -118,12 +126,14 @@ const setVisible = () => { } const Search = ref() onMounted(() => {}) +defineExpose({setFormValues}) // 提供 open 方法，用于打开弹窗 +