From 809877694659bbf512b129df76f8430239f279d4 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 24 Dec 2024 16:36:31 +0800 Subject: [PATCH] =?UTF-8?q?YT-1763=E5=B0=86=E5=88=B0=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E6=96=B9=E5=BC=8F=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 --- .../inventorymoveRequestMain/index.vue | 2 ++ .../inventorymoveRequestMain.data.ts | 13 +++++++++++++ .../inventorymoveRequestMainOKHOLD/index.vue | 2 ++ .../inventorymoveRequestMain.data.ts | 13 +++++++++++++ 4 files changed, 30 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index caf7fd443..10957c590 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -92,6 +92,7 @@ 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' +import { formatTime } from '@/utils/index' const { loadStart, loadDone } = usePageLoading() // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -412,6 +413,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }else{ newRow['toInventoryStatus'] = item['inventoryStatus'] } + newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd') tableData.value.push(newRow) }) } else { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index e21272525..ee42652fd 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -619,6 +619,19 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, isTableForm: true, isForm: true, + tableForm: { + disabled: false, + type:'FormDate', + placeholder: '请选择到批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, + form: { + componentProps: { + disabled: false, + valueFormat: 'YYYYMMDD', + } + } }, { label: '从包装号', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index 5a20483af..904a2f1c0 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -98,6 +98,7 @@ import { formatDate } from '@/utils/formatTime' import dayjs from 'dayjs' import { usePageLoading } from '@/hooks/web/usePageLoading' import * as ruleApi from '@/api/wms/rule/index' +import { formatTime } from '@/utils/index' const { loadStart, loadDone } = usePageLoading() // 物料隔离申请OktoholdRequestMain // 只有物料隔离申请在使用的 @@ -379,6 +380,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow.disabled_supplierCode = true newRow.isInpuFocusShow_supplierCode = false } + newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd') tableData.value.push(newRow) }) } else if(formField == 'supplierCode'){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index a58eb18f6..0110037d2 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -1215,6 +1215,19 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: true, isForm: true, sortTableDefault:9, + tableForm: { + disabled: false, + type:'FormDate', + placeholder: '请选择到批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, + form: { + componentProps: { + disabled: false, + valueFormat: 'YYYYMMDD', + } + } }, // { // label: '供应商代码',