From ea6511958b399456cf8310e28f359cc63552ee3f Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 14 Mar 2025 08:51:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?YT-2099=E4=BE=BF=E6=AC=A1=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/supplierManage/deliTime/deliTime.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts index 16449b433..4a0e7a047 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts @@ -46,7 +46,7 @@ export const DeliTime = useCrudSchemas(reactive([ componentProps: { type: 'time', dateFormat: 'HH:mm:ss', - valueFormat: 'x' + valueFormat: 'YYYY-MM-DD HH:mm:ss', } }, form: { From bd377df45cab8b96fa0baaae4d38ffd518d07947 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 14 Mar 2025 09:14:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?YT-2106=E4=BE=BF=E6=AC=A1=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=90=8E=E5=86=8D=E6=96=B0=E5=A2=9E=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=96=E5=8F=B7=E6=97=A0=E6=B3=95=E8=BE=93?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/supplierManage/deliTimeWms/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue index 756d0f660..704810bbe 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue @@ -155,7 +155,14 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = true } }) + } else { + DeliTimeWms.allSchemas.formSchema.forEach((item) => { + if(item.field == 'code'){ + item.componentProps.disabled = false + } + }) } + basicFormRef.value.open(type, row) } From bf05b94fc59328532cfe15c5195b809ef53b58d0 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 14 Mar 2025 09:18:57 +0800 Subject: [PATCH 3/5] =?UTF-8?q?YT-2110=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=97?= =?UTF-8?q?=E5=85=A5=E5=8F=B7=E5=92=8C=E5=B9=B4=E6=9C=88=E6=B2=A1=E5=81=9A?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/modelDeliTime/modelDeliTime.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts index 763b748b8..f372ba55c 100644 --- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts @@ -8,8 +8,8 @@ import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms' // 表单校验 export const ModelDeliTimeDetailRules = reactive({ - model: [required], - yearAndMonth: [required], + modelShow: [required], + yearAndMonthShow: [required], delayDeli: [required], }) From 9291bd6a1787bbacc793d815db3cc823e25e2fc7 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 14 Mar 2025 09:25:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?YT-2112=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF?= =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=B8=BB?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/supplierManage/modelDeliTime/index.vue | 2 +- .../supplierManage/modelDeliTime/modelDeliTime.data.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue index 41b697674..8db2824ee 100644 --- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts index f372ba55c..9c23211a3 100644 --- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts @@ -5,6 +5,7 @@ import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '../supplier/supplier.data' import { DeliTimeWms } from '../DeliTimeWms/deliTimeWms.data' import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms' +import { fa } from 'element-plus/es/locale' // 表单校验 export const ModelDeliTimeDetailRules = reactive({ @@ -199,11 +200,15 @@ export const ModelDeliTime = useCrudSchemas(reactive([ } }, isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, { label: '操作', field: 'action', isForm: false, + isDetail:false, table: { width: 150, fixed: 'right' From 91d6c7d2f9ed1172497868efb5dfdafac55a16f1 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 14 Mar 2025 09:35:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?YT-2116=E4=BE=BF=E6=AC=A1=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierManage/deliTimeWms/deliTimeWms.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts index d78f26358..b86b0d6bc 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts @@ -46,7 +46,7 @@ export const DeliTimeWms = useCrudSchemas(reactive([ componentProps: { type: 'time', dateFormat: 'HH:mm:ss', - valueFormat: 'x' + valueFormat: 'YYYY-MM-DD HH:mm:ss', } }, form: {