diff --git a/.env b/.env index 74e66bb15..4eb2fc114 100644 --- a/.env +++ b/.env @@ -15,3 +15,6 @@ VITE_APP_CAPTCHA_ENABLE=true # 百度统计 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc + +# 查看质检报告环境 +VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400' diff --git a/.env.hella13 b/.env.hella13 index b60b2be7c..21d8a4bb0 100644 --- a/.env.hella13 +++ b/.env.hella13 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.21.32.13:90/magic/web/index.html' @@ -38,3 +38,6 @@ VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' # 租户配置 VITE_TENANT='["长春"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'https://scp.faway-hella.com' \ No newline at end of file diff --git a/.env.hella14 b/.env.hella14 index 4d29e7b41..9b5fca566 100644 --- a/.env.hella14 +++ b/.env.hella14 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.21.32.14:90/magic/web/index.html' @@ -38,3 +38,6 @@ VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' # 租户配置 VITE_TENANT='["长春"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'https://scptest.faway-hella.com' \ No newline at end of file diff --git a/.env.hella15 b/.env.hella15 index 5c668fcb1..122b9022e 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='https://scp.faway-hella.com/magic/web/index.html' diff --git a/.env.hella16 b/.env.hella16 index 8e4ffd6b2..e5f3cf2a6 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='https://scptest.faway-hella.com/magic/web/index.html' diff --git a/.env.hella8 b/.env.hella8 index d1d914dac..d022f0740 100644 --- a/.env.hella8 +++ b/.env.hella8 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.22.32.8:90/magic/web/index.html' @@ -38,4 +38,7 @@ VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' # 租户配置 -VITE_TENANT='["成都"]' \ No newline at end of file +VITE_TENANT='["成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'https://scp.faway-hella.com' \ No newline at end of file diff --git a/.env.hella9 b/.env.hella9 index 86853d4ef..baf753b61 100644 --- a/.env.hella9 +++ b/.env.hella9 @@ -28,7 +28,7 @@ VITE_SOURCEMAP=false VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=sfms3.0 +VITE_OUT_DIR=sfms3.0-ui # 自定义接口路径 VITE_INTERFACE_URL='http://172.22.32.9:90/magic/web/index.html' @@ -37,4 +37,7 @@ VITE_INTERFACE_URL='http://172.22.32.9:90/magic/web/index.html' VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' # 租户配置 -VITE_TENANT='["成都"]' \ No newline at end of file +VITE_TENANT='["成都"]' + +# 查看质检报告环境 +VITE_REPORT_URL = 'https://scptest.faway-hella.com' diff --git a/.gitignore b/.gitignore index 07f908d37..5e6e2f3ae 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ auto-*.d.ts .idea .history /sfms3.0 +/sfms3.0-ui diff --git a/README.md b/README.md index 7787e8e4a..1bb4abe15 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ -## dev发布2024-05-21-002 +## dev发布2024-05-23-001 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, //可输入回车 对应绑定事件：@onEnter="onEnter" isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 diff --git a/index.html b/index.html index b558105c9..847a1533b 100644 --- a/index.html +++ b/index.html @@ -138,7 +138,7 @@
-
%VITE_APP_TITLE%
+
%VITE_APP_TITLE%
diff --git a/src/api/eam/equipmentMaintenanceMain/index.ts b/src/api/eam/equipmentMaintenanceMain/index.ts new file mode 100644 index 000000000..835e6bff0 --- /dev/null +++ b/src/api/eam/equipmentMaintenanceMain/index.ts @@ -0,0 +1,74 @@ +import request from '@/config/axios' + +export interface EquipmentMaintenanceMainVO { + id: number + number: string + describing: string + equipmentCode: string + type: string + classes: string + planNumber: string + faultType: string + cycle: string + times: string + verifyer: number + verifyContent: string + verifyTime: Date + maintenancer: number + maintenancePhone: string + completeResult: string + completionTime: Date + maintenanceTime: Date + status: string + factoryAreaCode: string + workshopCode: string + workshopSectionCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询设备保养工单主列表 +export const getEquipmentMaintenanceMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/equipment-maintenance-main/senior', data }) + } else { + return await request.get({ url: `/eam/equipment-maintenance-main/page`, params }) + } +} + +// 查询设备保养工单主详情 +export const getEquipmentMaintenanceMain = async (id: number) => { + return await request.get({ url: `/eam/equipment-maintenance-main/get?id=` + id }) +} + +// 新增设备保养工单主 +export const createEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => { + return await request.post({ url: `/eam/equipment-maintenance-main/create`, data }) +} + +// 修改设备保养工单主 +export const updateEquipmentMaintenanceMain = async (data: EquipmentMaintenanceMainVO) => { + return await request.put({ url: `/eam/equipment-maintenance-main/update`, data }) +} + +// 删除设备保养工单主 +export const deleteEquipmentMaintenanceMain = async (id: number) => { + return await request.delete({ url: `/eam/equipment-maintenance-main/delete?id=` + id }) +} + +// 导出设备保养工单主 Excel +export const exportEquipmentMaintenanceMain = async (params) => { + return await request.download({ url: `/eam/equipment-maintenance-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/equipment-maintenance-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/maintenance/index.ts b/src/api/eam/maintenance/index.ts new file mode 100644 index 000000000..e0605fa0d --- /dev/null +++ b/src/api/eam/maintenance/index.ts @@ -0,0 +1,77 @@ +import request from '@/config/axios' +import {InspectionItemSelectSetVO} from "@/api/eam/inspectionItemSelectSet"; + +export interface MaintenanceVO { + 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 + workshopSectionCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询保养计划列表 +export const getMaintenancePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/maintenance/senior', data }) + } else { + return await request.get({ url: `/eam/maintenance/page`, params }) + } +} + +// 查询保养计划详情 +export const getMaintenance = async (id: number) => { + return await request.get({ url: `/eam/maintenance/get?id=` + id }) +} + +// 新增保养计划 +export const createMaintenance = async (data: MaintenanceVO) => { + return await request.post({ url: `/eam/maintenance/create`, data }) +} + +// 修改保养计划 +export const updateMaintenance = async (data: MaintenanceVO) => { + return await request.put({ url: `/eam/maintenance/update`, data }) +} + +// 删除保养计划 +export const deleteMaintenance = async (id: number) => { + return await request.delete({ url: `/eam/maintenance/delete?id=` + id }) +} + +// 导出保养计划 Excel +export const exportMaintenance = async (params) => { + return await request.download({ url: `/eam/maintenance/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/maintenance/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: MaintenanceVO) => { + return await request.post({ url: `/eam/maintenance/ables` , data }) +} diff --git a/src/api/eam/sparePart/index.ts b/src/api/eam/sparePart/index.ts index 58d103d49..2956ac0f0 100644 --- a/src/api/eam/sparePart/index.ts +++ b/src/api/eam/sparePart/index.ts @@ -7,23 +7,19 @@ export interface SparePartVO { brand: string specifications: string isOverall: string - isConstant: string subject: string subjectCode: string - category: string + type: string + images: string region: string classification: string uom: string singlePrice: number - stockAge: number - reprocurement: number - safetyStock: number - cost: string - purchaser: string - financer: string - purchaseTime: Date - isFramework: string - isRadeIn: string + manufacturer: string + minInventory: number + maxInventory: number + replacementCycle: number + storageLocation: string departmentCode: string remark: string siteId: string @@ -38,43 +34,43 @@ export const getSparePartPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/eam/sparepart/spare-part/senior', data }) + return await request.post({ url: '/eam/basic/spare-part/senior', data }) } else { - return await request.get({ url: `/eam/sparepart/spare-part/page`, params }) + return await request.get({ url: `/eam/basic/spare-part/page`, params }) } } // 查询备件基础详情 export const getSparePart = async (id: number) => { - return await request.get({ url: `/eam/sparepart/spare-part/get?id=` + id }) + return await request.get({ url: `/eam/basic/spare-part/get?id=` + id }) } // 新增备件基础 export const createSparePart = async (data: SparePartVO) => { - return await request.post({ url: `/eam/sparepart/spare-part/create`, data }) + return await request.post({ url: `/eam/basic/spare-part/create`, data }) } // 修改备件基础 export const updateSparePart = async (data: SparePartVO) => { - return await request.put({ url: `/eam/sparepart/spare-part/update`, data }) + return await request.put({ url: `/eam/basic/spare-part/update`, data }) } // 删除备件基础 export const deleteSparePart = async (id: number) => { - return await request.delete({ url: `/eam/sparepart/spare-part/delete?id=` + id }) + return await request.delete({ url: `/eam/basic/spare-part/delete?id=` + id }) } // 导出备件基础 Excel export const exportSparePart = async (params) => { - return await request.download({ url: `/eam/sparepart/spare-part/export-excel`, params }) + return await request.download({ url: `/eam/basic/spare-part/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { - return request.download({ url: '/eam/sparepart/spare-part/get-import-template' }) + return request.download({ url: '/eam/basic/spare-part/get-import-template' }) } // 查询备件基础列表 export const getSparePartNoPage = async (params) => { - return await request.get({ url: `/eam/sparepart/spare-part/noPage`, params }) -} \ No newline at end of file + return await request.get({ url: `/eam/basic/spare-part/noPage`, params }) +} diff --git a/src/api/mes/processroute/index.ts b/src/api/mes/processroute/index.ts index c889e2dff..f6f5f1726 100644 --- a/src/api/mes/processroute/index.ts +++ b/src/api/mes/processroute/index.ts @@ -87,6 +87,11 @@ export const getProcessBomList = async (params) => { return await request.get({ url: `/mes/common/getBomListByProductAndProcess`,params}) } +// 查询产品bom的工序物料列表 +export const getBomListByProductBomAndProcess = async (params) => { + return await request.get({ url: `/mes/common/getBomListByProductBomAndProcess`,params}) +} + export const getWorkstationPage = async (code:String) => { return await request.get({ url: `/mes/workstation/page?pageSize=25&processCode=`+code}) } diff --git a/src/api/qms/inspectionScheme/index.ts b/src/api/qms/inspectionScheme/index.ts index 358acd359..3c5f30e93 100644 --- a/src/api/qms/inspectionScheme/index.ts +++ b/src/api/qms/inspectionScheme/index.ts @@ -30,3 +30,8 @@ export const enableInspectionScheme = async (id: number) => { export const disableInspectionScheme = async (id: number) => { return await request.disable({ url: `/qms/inspection-scheme/disable?id=` + id }) } + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/qms/inspection-scheme/get-import-template' }) +} diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts index 176c37579..1e11e2dd1 100644 --- a/src/api/system/tenant/index.ts +++ b/src/api/system/tenant/index.ts @@ -33,7 +33,15 @@ export interface TenantExportReqVO { // 查询租户列表 export const getTenantPage = (params: TenantPageReqVO) => { - return request.get({ url: '/system/tenant/page', params }) + console.log(params) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return request.post({ url: '/system/tenant/senior', data }) + } else { + return request.get({ url: '/system/tenant/page', params }) + } + // return request.get({ url: '/system/tenant/page', params }) } // 查询租户详情 diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 6ddf5473a..cb17a3200 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -83,7 +83,7 @@ export const getBalancePageByBusinessType = async (params) => { } -// 查询库存余额列表根据业务类型 +// 查询库存余额列表根据业务类型的物料类型 export const getBalancePageByBusinessTypeByItemType = async (params) => { if (params.isSearch) { delete params.isSearch diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index 3d9c2a5e8..2f685a8cf 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -89,5 +89,13 @@ export const importTemplate = () => { // 关闭盘点任务主 export const closeCountJobMain = (id: number) => { - return request.download({ url: '/wms/count-job-main/close?id=' + id }) + return request.put({ url: '/wms/count-job-main/close?id=' + id }) } + +// 关闭盘点任务主 +export const handleExportCountJob = async (id: number) => { + let params = { + 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/customeritem/index.ts b/src/api/wms/customeritem/index.ts index d4b636c5b..c4c27e8a7 100644 --- a/src/api/wms/customeritem/index.ts +++ b/src/api/wms/customeritem/index.ts @@ -61,4 +61,15 @@ export const exportCustomeritem = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customeritem/get-import-template' }) +} + +// 获得业务类型筛选出的物料分页 +export const getPageBusinessTypeToItemCode = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/customeritem/pageBusinessTypeToLocationSenior', data }) + } else { + return await request.get({ url: `/wms/customeritem/pageBusinessTypeToItemCode`, params }) + } } \ No newline at end of file diff --git a/src/api/wms/deliverPlanDetail/index.ts b/src/api/wms/deliverPlanDetail/index.ts index 33aeffdb9..ea6887451 100644 --- a/src/api/wms/deliverPlanDetail/index.ts +++ b/src/api/wms/deliverPlanDetail/index.ts @@ -24,6 +24,17 @@ export const selectDetailByMasterID = async (id: number) => { // 查询发货计划子列表 export const getDeliverPlanDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/deliver-plan-detail/senior', data }) + } else { + return await request.get({ url: `/wms/deliver-plan-detail/page`, params }) + } +} + +// 查询发货计划子列表 +export const getDeliverPlanDetailPage1 = async (params) => { return await request.get({ url: `/wms/deliver-plan-detail/page`, params }) } diff --git a/src/api/wms/deliverPlanMain/index.ts b/src/api/wms/deliverPlanMain/index.ts index 46277041e..83363172a 100644 --- a/src/api/wms/deliverPlanMain/index.ts +++ b/src/api/wms/deliverPlanMain/index.ts @@ -49,6 +49,19 @@ export const deleteDeliverPlanMain = async (id: number) => { // 导出发货计划主 Excel export const exportDeliverPlanMain = async (params) => { + params.businessType = 'Deliver' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params }) + } +} + +// 导出发货计划主 Excela +export const exportZZBJDeliverPlanMain = async (params) => { + params.businessType = 'ZZBJDeliver' if (params.isSearch) { delete params.isSearch const data = {...params} diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts index 03f544ed9..714df74e3 100644 --- a/src/api/wms/deliverRequestMain/index.ts +++ b/src/api/wms/deliverRequestMain/index.ts @@ -65,6 +65,19 @@ export const deleteDeliverRequestMain = async (id: number) => { // 导出发货申请主 Excel export const exportDeliverRequestMain = async (params) => { + params.businessType = 'Deliver' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) + } +} + +// 导出发货申请主 Excel +export const exportZZBJDeliverRequestMain = async (params) => { + params.businessType = 'ZZBJDeliver' if (params.isSearch) { delete params.isSearch const data = {...params} diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index ff0a8435c..231f14ed8 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -85,6 +85,16 @@ export const selectBusinessTypeToLocation = async (params) => { } } +export const selectBusinessTypeOutLocation = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/location/pageBusinessTypeOutLocationSenior', data }) + } else { + return request.get({ url: `/wms/location/pageBusinessTypeOutLocation`, params }) + } +} + export const selectPageItemAreaToLocation = async (params) => { if (params.isSearch) { diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index dc47bf030..11531274d 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -115,4 +115,9 @@ export const getLabelDetailPage = async (params) => { // 根据库存余额获取包装信息进行打印标签 export const getBalanceToPackage = async (packingNumber: String) => { return await request.get({ url: `/wms/package/getBalanceToPackage?packingNumber=` + packingNumber}) +} + +// 根据库存余额获取包装信息进行打印标签--批量打印 +export const getBalanceToPackageSelection = async (data: any) => { + return await request.post({ url: `/wms/balance/batchPrintLabel` ,data}) } \ No newline at end of file diff --git a/src/api/wms/purchasereceiptJobMain/index.ts b/src/api/wms/purchasereceiptJobMain/index.ts index 9e3463fb0..6db386db5 100644 --- a/src/api/wms/purchasereceiptJobMain/index.ts +++ b/src/api/wms/purchasereceiptJobMain/index.ts @@ -123,4 +123,9 @@ export const abandonPurchasereceiptJobMainSpare = (id: number) => { // 承接采购收货任务主 export const acceptPurchasereceiptJobMain = (id: number) => { return request.put({ url: '/wms/purchasereceipt-job-main/accept?id=' + id }) -} \ No newline at end of file +} + +// 拒收采购收货任务主 +export const refusalPurchasereceiptJobMain = (id: number) => { + return request.put({ url: '/wms/purchasereceipt-job-main/refusal?id=' + id }) +} diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index 352eeb112..41b7aa7b7 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -73,6 +73,17 @@ export const getPurchasereceiptRecordDetailPageSpare = async (params) => { } +// 查询采购收货记录--退货筛选列表 +export const getPurchasereceiptRecordDetailPageReturn = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorReturn', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-record-detail/pageReturn`, params }) + } +} + export const getPurchasereceiptRecordDetailPageSCP = async (params) => { if (params.isSearch) { delete params.isSearch @@ -152,4 +163,4 @@ export const queryPurchaseceiptChildPackingNumber = async (params) => { // 查询采购收货缺货记录子包装数据 export const queryPurchaseshortageChildPackingNumber = async (params) => { return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params }) -} \ No newline at end of file +} diff --git a/src/api/wms/qadCostcentre/index.ts b/src/api/wms/qadCostcentre/index.ts new file mode 100644 index 000000000..02fe9df8e --- /dev/null +++ b/src/api/wms/qadCostcentre/index.ts @@ -0,0 +1,60 @@ +import request from '@/config/axios' + +export interface QadCostcentreVO { + id: number + code: string + usageDescription: string + costcentreId: string + costcentreCode: string + costcentreDescription: string + costcentreActive: string + costcentreType: string + available: string + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询QAD成品中心列表 +export const getQadCostcentrePage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/qad-costcentre/senior', data }) + } else { + return await request.get({ url: `/wms/qad-costcentre/page`, params }) + } +} + +// 查询QAD成品中心详情 +export const getQadCostcentre = async (id: number) => { + return await request.get({ url: `/wms/qad-costcentre/get?id=` + id }) +} + +// 新增QAD成品中心 +export const createQadCostcentre = async (data: QadCostcentreVO) => { + return await request.post({ url: `/wms/qad-costcentre/create`, data }) +} + +// 修改QAD成品中心 +export const updateQadCostcentre = async (data: QadCostcentreVO) => { + return await request.put({ url: `/wms/qad-costcentre/update`, data }) +} + +// 删除QAD成品中心 +export const deleteQadCostcentre = async (id: number) => { + return await request.delete({ url: `/wms/qad-costcentre/delete?id=` + id }) +} + +// 导出QAD成品中心 Excel +export const exportQadCostcentre = async (params) => { + return await request.download({ url: `/wms/qad-costcentre/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/qad-costcentre/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/qadProject/index.ts b/src/api/wms/qadProject/index.ts new file mode 100644 index 000000000..ce9cd6e8e --- /dev/null +++ b/src/api/wms/qadProject/index.ts @@ -0,0 +1,59 @@ +import request from '@/config/axios' + +export interface QadProjectVO { + id: number + projectId: string + projectCode: string + projectDescription: string + projectStartDate: string + projectEndDate: string + statusCode: string + available: string + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询QAD项目信息列表 +export const getQadProjectPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/qad-project/senior', data }) + } else { + return await request.get({ url: `/wms/qad-project/page`, params }) + } +} + +// 查询QAD项目信息详情 +export const getQadProject = async (id: number) => { + return await request.get({ url: `/wms/qad-project/get?id=` + id }) +} + +// 新增QAD项目信息 +export const createQadProject = async (data: QadProjectVO) => { + return await request.post({ url: `/wms/qad-project/create`, data }) +} + +// 修改QAD项目信息 +export const updateQadProject = async (data: QadProjectVO) => { + return await request.put({ url: `/wms/qad-project/update`, data }) +} + +// 删除QAD项目信息 +export const deleteQadProject = async (id: number) => { + return await request.delete({ url: `/wms/qad-project/delete?id=` + id }) +} + +// 导出QAD项目信息 Excel +export const exportQadProject = async (params) => { + return await request.download({ url: `/wms/qad-project/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/qad-project/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/subjectAccount/index.ts b/src/api/wms/subjectAccount/index.ts new file mode 100644 index 000000000..351203c3c --- /dev/null +++ b/src/api/wms/subjectAccount/index.ts @@ -0,0 +1,66 @@ +import request from '@/config/axios' + +export interface SubjectAccountVO { + id: number + code: string + usageDescription: string + costecentreId: string + costecentreCode: string + costecentreType: string + projectId: string + projectCode: string + address: string + available: string + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询科目账户配置列表 +export const getSubjectAccountPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/subject-account/senior', data }) + } else { + return await request.get({ url: `/wms/subject-account/page`, params }) + } +} + +// 查询科目账户配置详情 +export const getSubjectAccount = async (id: number) => { + return await request.get({ url: `/wms/subject-account/get?id=` + id }) +} + +// 新增科目账户配置 +export const createSubjectAccount = async (data: SubjectAccountVO) => { + return await request.post({ url: `/wms/subject-account/create`, data }) +} + +// 修改科目账户配置 +export const updateSubjectAccount = async (data: SubjectAccountVO) => { + return await request.put({ url: `/wms/subject-account/update`, data }) +} + +// 删除科目账户配置 +export const deleteSubjectAccount = async (id: number) => { + return await request.delete({ url: `/wms/subject-account/delete?id=` + id }) +} + +// 导出科目账户配置 Excel +export const exportSubjectAccount = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/subject-account/export-excel-senior`, data }) + }else{ + return await request.download({ url: `/wms/subject-account/export-excel`, params }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/subject-account/get-import-template' }) +} \ No newline at end of file diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 9fbf4a233..f55aed8cc 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -175,10 +175,7 @@ export default defineComponent({ const Com = componentMap['Divider'] as ReturnType let labelName = item?.label || '' if(item?.label){ - labelName = t(`ts.${item?.label}`) - if(labelName === 'ts.' + item?.label){ - labelName = item?.label - } + labelName = t(`ts.${item?.label}`).replace('ts.','') } return isDivider ? ( {labelName} @@ -227,18 +224,12 @@ export default defineComponent({ if (item?.labelMessage) { let labelName = item.label || '' if(item.label){ - labelName = t(`ts.${item.label}`) - if(labelName === 'ts.' + item.label){ - labelName = item.label - } + labelName = t(`ts.${item.label}`).replace('ts.','') } let labelMessage = item.labelMessage || '' if(item.labelMessage){ - labelMessage = t(`ts.${item.labelMessage}`) - if(labelMessage === 'ts.' + item.labelMessage){ - labelMessage = item.labelMessage - } + labelMessage = t(`ts.${item.labelMessage}`).replace('ts.','') } formItemSlots.label = () => { return ( @@ -367,10 +358,7 @@ export default defineComponent({ } let labelName = item.label || '' if(item.label){ - labelName = t(`ts.${item.label}`) - if(labelName === 'ts.' + item.label){ - labelName = item.label - } + labelName = t(`ts.${item.label}`).replace('ts.','') } return ( diff --git a/src/components/Form/src/components/useRenderSelect.tsx b/src/components/Form/src/components/useRenderSelect.tsx index 4a8a18a79..30f6d73d6 100644 --- a/src/components/Form/src/components/useRenderSelect.tsx +++ b/src/components/Form/src/components/useRenderSelect.tsx @@ -35,10 +35,7 @@ export const useRenderSelect = (slots: Slots) => { const { label, value, ...other } = option const zhName = labelAlias ? option[labelAlias] : label;//中文名称 - let labelName = t(`ts.${zhName}`) - if(labelName === 'ts.' + zhName){ - labelName = zhName - } + let labelName = t(`ts.${zhName}`).replace('ts.','') return ( { let labelName = schema.label || '' if(schema.label){ - labelName = t(`ts.${schema.label}`) - if(labelName === 'ts.' + schema.label){ - labelName = ' '+schema.label - }else{ - labelName = ' ' + labelName - } + labelName = ' '+t(`ts.${schema.label}`).replace('ts.','') } if (textMap.includes(schema?.component as string)) { diff --git a/src/components/ImportForm/src/ImportDetailForm.vue b/src/components/ImportForm/src/ImportDetailForm.vue new file mode 100644 index 000000000..bda6ffdfe --- /dev/null +++ b/src/components/ImportForm/src/ImportDetailForm.vue @@ -0,0 +1,339 @@ + + + + + diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 3046e83bf..10f19206b 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -289,10 +289,7 @@ export default defineComponent({ return [...[renderTableExpand()], ...[renderTableSelection()]].concat( (columnsChildren || columns).map((v) => { const zhName = v.label || '';//中文名称 - let labelName = t(`ts.${v.label}`) - if(labelName === 'ts.' + zhName){ - labelName = zhName - } + let labelName = t(`ts.${v.label}`).replace('ts.','') // 自定生成序号 if (v.type === 'index') { return ( diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 2ac2fb922..df2adca3f 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -64,7 +64,7 @@ v-model="row[headerItem.field]" clearable :type="headerItem?.tableForm?.inputType" - :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label" + :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`).replace('ts.','')" :disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false" style="flex:1" @blur="inputStringBlur(headerItem.field, row[headerItem.field], row)" @@ -534,7 +534,10 @@ defineExpose({ padding: 2px 0px; border: none; } - +::v-deep(.el-form-item--default) { + margin-bottom: 5px; + margin-top: 5px; +} ::v-deep(.el-table td.el-table__cell .el-form-item__content) { display: flex !important; align-items: center !important; diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index 4b5201ba0..f338c591e 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -23,10 +23,10 @@ {{ title }}