From c291c7960304a0d631ff58c5a659a8ed3115bdce Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 25 Dec 2024 18:46:19 +0800 Subject: [PATCH] =?UTF-8?q?YT-1813=E6=89=B9=E6=AC=A1=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitRequestMain/index.vue | 2 ++ .../inventoryinitRequestMain.data.ts | 13 +++++++++++++ .../unplannedreceiptRequestMain.data.ts | 16 +++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 07173a8c8..d7f688023 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -93,6 +93,7 @@ import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDe import * as defaultButtons from '@/utils/disposition/defaultButtons' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' +import { formatTime } from '@/utils/index' const { loadStart, loadDone } = usePageLoading() // 库存初始化申请 defineOptions({ name: 'InventoryinitRequestMain' }) @@ -130,6 +131,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['packUnit'] = item['defaultPackUnit'] newRow['packQty'] = item['defaultPackQty'] newRow['uom'] = item['uom'] + newRow['batch'] = formatTime(new Date(), 'yyyyMMdd') tableData.value.push(newRow) }) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index fcceafdf4..d0fb982f0 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -490,6 +490,19 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + tableForm: { + disabled: false, + type:'FormDate', + placeholder: '请选择到批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, + form: { + componentProps: { + disabled: false, + valueFormat: 'YYYYMMDD', + } + } }, // { // label: '包装号', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 6ceef2caa..5730fcdbc 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -894,9 +894,19 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive