From 215d8e96ad76e8e69b0bc41f0aacf47919f1f730 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 27 Nov 2024 13:24:42 +0800 Subject: [PATCH] =?UTF-8?q?YT-1269=E5=88=B6=E9=80=A0=E4=BB=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=8C=E9=80=89=E5=AE=8C=E7=89=A9=E6=96=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F=E3=80=81?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=97=A5=E6=9C=9F=E6=B2=A1=E6=9C=89=E5=B8=A6?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E4=BF=9D=E5=AD=98=E4=B8=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/manufacturePackage/index.vue | 23 +++++++++++++++++-- .../manufacturePackage.data.ts | 2 -- 2 files changed, 21 insertions(+), 4 deletions(-) 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: {