From 6a06c0f694ad6f60c5964125ebc98fd04d5b500f Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 18 Oct 2024 14:40:13 +0800 Subject: [PATCH] =?UTF-8?q?YT-448:=E5=BA=93=E5=8C=BA=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=9A=94=E7=A6=BB=E5=8C=BA=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=B2=BE=E5=BA=A6=E6=B2=A1=E6=9C=89=E6=8C=89=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/areabasic/index.vue | 14 ++++---- .../itemManage/itemarea/index.vue | 17 ++++++---- .../inventorymoveRequestMain/index.vue | 33 ++++++++++++++++--- .../inventorymoveRequestMain.data.ts | 8 +++-- 4 files changed, 53 insertions(+), 19 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 1d5168097..7f96ca3aa 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -200,11 +200,12 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = true item.componentProps.isSearchList = false } else if (item.field == 'manageMode') { - if (row.type == 'WIP') { - item.componentProps.options = manageModeOptions.value - } else { - item.componentProps.options =manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') - } + // if (row.type == 'WIP') { + // item.componentProps.options = manageModeOptions.value + // } else { + // item.componentProps.options =manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + // } + item.componentProps.options = manageModeOptions.value } }) }else { @@ -215,7 +216,8 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = false item.componentProps.isSearchList = true }else if (item.field == 'manageMode') { - item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + item.componentProps.options = manageModeOptions.value + //item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') basicFormRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value } }) diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index b69d0aafe..8e5cd1eb4 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -158,7 +158,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { Itemarea.allSchemas.formSchema.forEach((item) => { if (item.field == 'manageMode') { - item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + item.componentProps.options = manageModeOptions.value + // item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') setV['manageMode'] = item.componentProps.options[0].value } }) @@ -332,11 +333,12 @@ const openForm =async (type: string, row?: number) => { item.componentProps.isSearchList = false, item.componentProps.disabled = true } else if (item.field == 'manageMode') { - if (row.areaType == 'WIP') { - item.componentProps.options = manageModeOptions.value - } else { - item.componentProps.options =manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') - } + // if (row.areaType == 'WIP') { + // item.componentProps.options = manageModeOptions.value + // } else { + // item.componentProps.options =manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + // } + item.componentProps.options = manageModeOptions.value } }) }else { @@ -346,7 +348,8 @@ const openForm =async (type: string, row?: number) => { }else if (item.field == 'itemCode') { item.componentProps.isSearchList = true }else if (item.field == 'manageMode') { - item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') + item.componentProps.options = manageModeOptions.value + //item.componentProps.options = manageModeOptions.value?.filter(item=>item.value!='BY_QUANTITY') formRef.value.formRef.formModel.manageMode = item.componentProps.options[0].value } }) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index c36666030..06793898d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -91,6 +91,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import {importTemplateHoldOk} from "@/api/wms/inventorymoveRequestMain"; +import * as ruleApi from '@/api/wms/rule/index' const { loadStart, loadDone } = usePageLoading() // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -348,20 +349,37 @@ console.log('tableFormColumns',InventorymoveRequestDetail.allSchemas.tableFormCo const updataTableColumns = (val) => { tableColumns.value = val } - +const fromManagementPrecision = ref('') // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { - nextTick(() => { + nextTick(async() => { if (type == 'tableForm') { if(formField == 'fromPackingNumber'){ val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['fromInventoryStatus']==item['inventoryStatus'])) if(val.length==0) return - val.forEach(item=>{ + val.forEach(async item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) newRow['fromPackingNumber'] = item['packingNumber'] newRow['fromContainerNumber'] = item['containerNumber'] newRow['itemCode'] = item['itemCode'] - newRow['fromBatch'] = item['batch'] + if (item['batch'] != '') { + newRow['fromBatch'] = item['batch'] + }else{ + newRow['fromBatch'] = getFormattedDate(); // 获取 YYYYMMDD 格式的日期 + } + await ruleApi.getManagementPrecision({ + itemCodes: [row['itemCode']], + locationCode:val[0]['locationCode'] + }).then((res) => { + fromManagementPrecision.value = res[0].ManagementPrecision + }) + if (fromManagementPrecision.value == 'BY_QUANTITY') { + newRow['fromBatchFormItemType'] = 'FormDate' + newRow['disabled_fromBatch'] = false + } else { + newRow['fromBatchFormItemType'] = '' + newRow['disabled_fromBatch'] = true + } newRow['fromInventoryStatus'] = item['inventoryStatus'] newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] @@ -824,4 +842,11 @@ onMounted(async () => { importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove() } }) +const getFormattedDate = () =>{ + const a = new Date(); + const year = a.getFullYear(); + const month = String(a.getMonth() + 1).padStart(2, '0'); + const day = String(a.getDate()).padStart(2, '0'); + return `${year}${month}${day}`; + } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index e9a81cc5d..aeb533c0b 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -558,11 +558,15 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { - disabled: true + disabled: true, + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', }, form: { componentProps: { - disabled: true + disabled: true, + valueFormat: 'YYYYMMDD', } } },