diff --git a/src/api/home/index.ts b/src/api/home/index.ts index aa8cb1388..dee170023 100644 --- a/src/api/home/index.ts +++ b/src/api/home/index.ts @@ -20,3 +20,40 @@ export const getProductData = async () => { return await request.get({ url: `/wms/index/indexProduct` }) } +// 超期库存预警 +export const getOverdueBalance = async (params) => { + return await request.get({ url: `/wms/index/pageOverdueBalance`,params }) +} + +// 呆滞库存预警 +export const getStagnantBalance = async (params) => { + return await request.get({ url: `/wms/index/pageStagnantBalance` ,params}) +} +// 高低储预警 +export const getWarningBalance = async (params) => { + return await request.get({ url: `/wms/index/pageWarningBalance` ,params}) +} + +// 本月退货明细 +export const getPurchasereturnRecordMonth = async (params) => { + return await request.get({ url: `/wms/index/pagePurchasereturnRecordMonth`,params }) +} + +// 本月索赔明细 +export const getPurchaseclaimRecordMonth = async (params) => { + return await request.get({ url: `/wms/index/pagePurchaseclaimRecordMonth`,params }) +} + +// 今日生产计划 +export const getProductionToday = async (params) => { + return await request.get({ url: `/wms/index/pageProductionToday`,params }) +} + +// 线边安全库存 +export const getSafeLocation = async (params) => { + return await request.get({ url: `/wms/index/pageSafeLocation`,params }) +} +// 待上架成品库存 +export const getProductputawayJobDetail = async (params) => { + return await request.get({ url: `/wms/index/pageProductputawayJobDetail`,params }) +} \ No newline at end of file diff --git a/src/api/wms/inventoryinitRecordDetail/index.ts b/src/api/wms/inventoryinitRecordDetail/index.ts index c789ca497..fe2d27f22 100644 --- a/src/api/wms/inventoryinitRecordDetail/index.ts +++ b/src/api/wms/inventoryinitRecordDetail/index.ts @@ -72,4 +72,9 @@ export const exportInventoryinitRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inventoryinit-record-detail/get-import-template' }) +} + +// 批量打印 +export const printLabelBatchByIdSelection = async (data: any) => { + return await request.post({ url: `/wms/inventoryinit-record-main/printLabelBatchById` ,data}) } \ No newline at end of file diff --git a/src/utils/dict.ts b/src/utils/dict.ts index d3f2f9de3..bee45f6c3 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -354,7 +354,8 @@ export enum DICT_TYPE { REPAIR_LEVEL = 'repair_level', //维修级别 IS_COMPLETED = 'is_completed', //是否完成 MAINTENANCE_CYCLE ='maintenance_cycle', // 保养周期 - EAM_ORDER_STATUS = 'eam_order_status', - EAM_PLAN_STATUS = 'eam_plan_status', + EAM_ORDER_STATUS = 'eam_order_status',// 保养工单状态 + EAM_PLAN_STATUS = 'eam_plan_status', // 保养计划状态 + EAM_REPAIR_STATUS = 'eam_repair_status', // 报修状态 OFF_BACK_STATUS = 'off_back_status' } diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts index 4c24acd0d..21b9f9dbb 100644 --- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts +++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts @@ -1,5 +1,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; +import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; +import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; +import * as WorkshopApi from "@/api/wms/workshop"; // 表单校验 export const EquipmentReportRepairRequestRules = reactive({ @@ -9,7 +13,9 @@ export const EquipmentReportRepairRequestRules = reactive({ urgency: [required], repairmaner: [required], status: [required], - concurrencyStamp: [required] + shutDown:[required], + repairPhone:[required], + available:[required], }) export const EquipmentReportRepairRequest = useCrudSchemas(reactive([ @@ -17,7 +23,9 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive @@ -65,6 +66,11 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import {Maintenance} from "@/views/eam/maintenance/maintenance.data"; +import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; +import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; +import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data"; +import * as ToolItemApi from "@/api/eam/toolAccounts"; defineOptions({ name: 'EquipmentReportRepairRequest' }) @@ -99,9 +105,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:equipmentReportRepairRequest:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:equipmentReportRepairRequest:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:equipmentReportRepairRequest:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'eam:equipmentReportRepairRequest:create'}), // 新增 + //defaultButtons.defaultImportBtn({hasPermi:'eam:equipmentReportRepairRequest:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'eam:equipmentReportRepairRequest:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -133,8 +139,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:equipmentReportRepairRequest:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:equipmentReportRepairRequest:delete'}), // 删除 + defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentReportRepairRequest:update'}), // 编辑 + defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentReportRepairRequest:delete'}), // 删除 ] // 列表-操作按钮事件 @@ -149,6 +155,17 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if(type == "create"){ + EquipmentReportRepairRequest.allSchemas.formSchema.forEach((item) => { + if(item.field == 'status'){ + } + }) + }else{ + EquipmentReportRepairRequest.allSchemas.formSchema.forEach((item) => { + if(item.field == 'status'){ + } + }) + } basicFormRef.value.open(type, row) } @@ -226,6 +243,34 @@ const importSuccess = () => { getList() } + +const onChange = (field, item) => { + //设备 + if(field == 'type' && item == 'DEVICE'){ + EquipmentReportRepairRequest.allSchemas.formSchema.forEach((items) => { + if (items.field == 'equipmentCode') { + basicFormRef.value.formRef.setValues({ + equipmentCode:'' + }) + items.componentProps.searchAllSchemas = EquipmentAccounts.allSchemas + items.componentProps.searchPage = EquipmentItemApi.getEquipmentAccountsPage + } + }) + } + //工装 + if(field == 'type' && item == 'EQUIPMENT'){ + EquipmentReportRepairRequest.allSchemas.formSchema.forEach((items) => { + if (items.field == 'equipmentCode') { + basicFormRef.value.formRef.setValues({ + equipmentCode:'' + }) + items.componentProps.searchAllSchemas = ToolAccounts.allSchemas + items.componentProps.searchPage = ToolItemApi.getToolAccountsPage + } + }) + } +} + // 筛选提交 const searchFormClick = (searchData) => { tableObject.params = { diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts index 3e4336b4b..dc7067c81 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts @@ -80,6 +80,7 @@ export const Dock = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择库位代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index c1b8ee9e8..4a806e1d0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -48,6 +48,7 @@ :apiCreate="DockApi.createDock" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @onEnter="onEnter" /> @@ -66,6 +67,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' defineOptions({ name: 'Dock' }) @@ -164,6 +167,26 @@ const openForm = (type: string, row?: any) => { } basicFormRef.value.open(type, row) } +const onEnter = async (field,value)=>{ + console.log('onEnter',field,value) + if('defaultLocationCode'==field){ + //物料代码 + basicFormRef.value.opensearchTable('itemCode', 'code', '库位信息', Location.allSchemas, LocationApi.getLocationPage,[{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + },{ + key: 'code', + value: value, + action: '==', + isSearch: true, + isMainValue: false + }]) + + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index a7125d120..96032625d 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -1,7 +1,7 @@