diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts index d00cc959..e9b16e1a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts @@ -2,23 +2,18 @@ import request from '@/config/axios' export interface StorageVO { id: number - stockType: boolean + stockType: number + stockInType: number + stockOutType: number stockNo: string headerNo: number - materialId: number - lotNo: string - whId: number - rgId: number - pnId: number - storageOkQty: number - storageNgQty: number - storageSpQty: number description: string - status: boolean + status: number + whId: number keeper: number keeperTime: Date - outer: number - outerTime: Date + outbound: number + outboundTime: Date cancel: number cancelTime: Date } diff --git a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts index 16764302..98f5233a 100644 --- a/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts +++ b/mes-ui/mes-ui-admin-vue3/src/utils/dict.ts @@ -217,6 +217,10 @@ export enum DICT_TYPE { HELI_MATERIAL_ORIGINAL = 'heli_material_original', // 物料主要来源 HELI_COMMON_IS_OR_NOT = 'heli_common_is_or_not', // 是否数字类型 - HELI_PROCEDURE_TYPE = 'heli_procedure_type' // 工序类型 + HELI_PROCEDURE_TYPE = 'heli_procedure_type', // 工序类型 + + HELI_STORAGE_IN_TYPE = 'heli_storage_in_type', // 入库类型 + HELI_STORAGE_OUT_TYPE = 'heli_storage_out_type',//出库类型 + HELI_STORAGE_STATUS = 'heli_storage_status',//入库出库状态 } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue index 974e408f..ad9e6b88 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/PnForm.vue @@ -96,7 +96,8 @@ const open = async (type: string, id?: number) => { const queryParamsWh = reactive({ pageNo: 1, - pageSize: 99 + pageSize: 99, + whStatus : 1 }) const dataWh = await WarehouseApi.getWarehousePage(queryParamsWh) @@ -107,7 +108,13 @@ const open = async (type: string, id?: number) => { whList.value = dataWh.list - const dataRg = await RgApi.getRgPage(queryParamsWh) + + const queryParamsRg = reactive({ + pageNo: 1, + pageSize: 99, + rgStatus : 1 + }) + const dataRg = await RgApi.getRgPage(queryParamsRg) dataRg.list.forEach(element => { element.label = element.rgName diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/index.vue index 277080be..365767dd 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pn/index.vue @@ -199,7 +199,8 @@ onMounted(async () => { const queryParamsWh = reactive({ pageNo: 1, - pageSize: 99 + pageSize: 99, + whStatus: 1 }) const dataWh = await WarehouseApi.getWarehousePage(queryParamsWh) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue index 93e186d5..ad280287 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/RgForm.vue @@ -69,7 +69,8 @@ const open = async (type: string, id?: number) => { const queryParamsWarehouse = reactive({ pageNo: 1, - pageSize: 99 + pageSize: 99, + whStatus : 1 }) const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/index.vue index 2606c7ab..59b9f006 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/rg/index.vue @@ -177,7 +177,8 @@ onMounted(async () => { const queryParamsWarehouse = reactive({ pageNo: 1, - pageSize: 99 + pageSize: 99, + whStatus :1 }) const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue index 79ab2a1a..a4497f7e 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue @@ -1,5 +1,8 @@ \ No newline at end of file + +const onAddItem = () => { + const newData = { + // 新数据的属性 + projectName: '', + name: '', + productStatus: '', + spec: '', + inventoryUnitId: '', + inventoryType: '', + barCode: '', + productTypeId: '', + unit: [], + editable: true, + productBomItemValueDOList: [] + } + formData.value.productBomItemDOList.push(newData) +} + +// 复制数据 +const handlefuke = (index, item) => { + const data: any = formData.value.productBomItemDOList[index] + + // 复制数据 + const newData: any = { + ...data, + projectName: item.projectName, + name: item.name, + productStatus: item.productStatus, + spec: item.spec, + inventoryUnitId: item.inventoryUnitId, + inventoryType: item.spec, + barCode: item.spec, + productTypeId: item.spec, + unit: [], + editable: true, + productBomItemValueDOList: [] + } + // 添加新数据 + formData.value.productBomItemDOList.splice(index + 1, 0, newData) +} + +//点击编辑 / 保存 input框是否可输入 +const handleEdit = (index) => { + formData.value.productBomItemDOList[index].editable = true +} + +const handleSave = (index) => { + formData.value.productBomItemDOList[index].editable = false +} + +const handleCellClick = (row, column, event) => { + if (row.editable) { + column.el.querySelector('input').focus() + } +} + +const handleCellBlur = (row, column, event) => { + if (row.editable) { + column.el.querySelector('input').blur() + } +} + +//删除新增物料信息 +const handleDelete2 = (index: number) => { + formData.value.productBomItemDOList.splice(index, 1) +} + +//上传的附件信息 + +const fileList = ref([ + { + name: 'element-plus-logo.svg', + url: 'https://element-plus.org/images/element-plus-logo.svg', + uploadTimestamp: '2024-1-12 16：06' + }, + { + name: 'element-plus-logo2.svg', + url: 'https://element-plus.org/images/element-plus-logo.svg', + uploadTimestamp: '2024-1-12 16：06' + } +]) + +const handleRemove: UploadProps['onRemove'] = (file, uploadFiles) => { + console.log(file, uploadFiles, '11') +} + +const handlePreview: UploadProps['onPreview'] = (uploadFile) => { + console.log(uploadFile, '222') +} + +const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => { + ElMessage.warning( + `The limit is 3, you selected ${files.length} files this time, add up to ${ + files.length + uploadFiles.length + } totally` + ) + console.log('333') +} + +let uploadTimestamp: any = null +const handleBeforeUpload = (file: File) => { + uploadTimestamp = new Date().toISOString() // 获取并保存当前时间戳 + // 如果需要阻止默认上传行为，可以返回 false + // return false; + + // 创建新的文件对象并添加到 filelist 中 + const newFile: any = { + name: '', + url: '', // 这里可以是实际上传后的URL，根据实际情况填写 + uploadTimestamp: uploadTimestamp!, + }; + + fileList.value.push(newFile); +} + +const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => { + console.log('444', uploadFile, uploadFiles) + + return ElMessageBox.confirm(`Cancel the transfer of ${uploadFile.name} ?`).then( + () => true, + () => false + ) +} + +// 删除上传的附件信息 +const handleDelete = (index: number) => { + fileList.value.splice(index, 1) +} + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue index 07bb4b0f..c779b491 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/index.vue @@ -8,20 +8,10 @@ :inline="true" label-width="68px" > - - - - - - - + - - - - - - - - - - - - - + - + - - + + > + + - - + + > + + - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 搜索 重置 新增 - 导出 - + --> @@ -245,20 +117,21 @@ - - - + + + + + - - - - - - - - + + + - + - + - + @@ -290,24 +163,34 @@ :formatter="dateFormatter" width="180px" /> + + + @@ -320,20 +203,20 @@ /> - - \ No newline at end of file