diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 4101909ad..9a5326394 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -48,6 +48,7 @@ :apiCreate="PackageApi.createPackageLabel" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @onBlur="onBlur" /> @@ -106,8 +107,8 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row setV['itemDesc1'] = val[0]['desc1'] setV['itemDesc2'] = val[0]['desc2'] setV['uom'] = val[0]['uom'] - setV['produceDate'] = val[0]['activeTime'] - setV['expireDate'] = val[0]['expireTime'] + setV['produceDate'] = '' + setV['expireDate'] = '' setV['validityDays'] = val[0]['validityDays'] await Itempackaging.getItempackagingPage({ itemCode: val[0]['code'] @@ -124,6 +125,24 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row }) } +const onBlur = async (field, e) => { + if (field === 'produceDate') { + const produceDate = new Date(e.target.value); + const validityDays = basicFormRef.value.formRef.formModel.validityDays; + let expireDate; + + if (!validityDays || validityDays === 0) { + expireDate = new Date("2099-12-31").getTime(); + } else { + const calculatedExpireDate = new Date(produceDate); + calculatedExpireDate.setDate(produceDate.getDate() + validityDays); + expireDate = calculatedExpireDate.getTime(); + } + + basicFormRef.value.formRef.formModel.expireDate = expireDate; + } +} + const { tableObject, tableMethods } = useTable({ getListApi: BarbasicApi.getBarbasicPage // 分页接口 }) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 561152ee9..1ad09830c 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -313,7 +313,6 @@ export const PackageInventory = useCrudSchemas(reactive([ valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')], - disabled: true } }, form: { @@ -323,7 +322,6 @@ export const PackageInventory = useCrudSchemas(reactive([ type: 'date', dateFormat: 'YYYY-MM-DD', valueFormat: 'x', - disabled: true } }, table: {