From 6893bb8faf6d28093efc64dbc3493fb73b419f2d Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 25 Jul 2025 13:30:15 +0800 Subject: [PATCH] =?UTF-8?q?YT-2904=EF=BC=9A=E3=80=90=E5=B7=B2=E5=8F=91?= =?UTF-8?q?=E6=9C=AA=E7=BB=93=E8=AE=B0=E5=BD=95=E3=80=91=E5=92=8C=E3=80=90?= =?UTF-8?q?=E5=B7=B2=E5=8F=91=E5=B7=B2=E7=BB=93=E8=AE=B0=E5=BD=95=E3=80=91?= =?UTF-8?q?=EF=BC=9A1.=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=BE=E5=88=B0=E7=AD=9B=E9=80=89=E9=87=8C?= =?UTF-8?q?=202.=20=E5=88=97=E8=A1=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E2=80=9C=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D=20?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=8F=91=E8=B4=A7=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E5=B0=B1=E6=98=AF=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=203.?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B9=E5=A2=9E=E5=8A=A0=20=E2=80=9C?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E6=97=A5=E6=9C=9F=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finishedShipmentMain.data.ts | 51 ++++++++++++++++++- .../unfinishedShipmentMain.data.ts | 51 ++++++++++++++++++- 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts index 126bc1e33..359cd3a16 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' // 表单校验 export const FinishedShipmentMainRules = reactive({ @@ -39,6 +39,36 @@ export const FinishedShipmentMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '发货日期', + field: 'dueTime', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + }, + }, { label: '发货类型', field: 'shipmentType', @@ -66,6 +96,7 @@ export const FinishedShipmentMain = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + isSearch:false, search: { component: 'DatePicker', componentProps: { @@ -77,6 +108,15 @@ export const FinishedShipmentMain = useCrudSchemas(reactive([ detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isTable:true, isForm: false, table:{ @@ -277,6 +317,15 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isForm: false, hiddenInMain:true }, diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts index 01055f86b..df68df660 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter, dateFormatter2 } from '@/utils/formatTime' // 表单校验 export const UnfinishedShipmentMainRules = reactive({ @@ -31,6 +31,36 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '发货日期', + field: 'dueTime', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + }, + }, { label: '发货类型', field: 'shipmentType', @@ -59,6 +89,7 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + isSearch:false, search: { component: 'DatePicker', componentProps: { @@ -67,6 +98,15 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, detail: { dateFormat : 'YYYY-MM-DD HH:mm:ss' }, @@ -271,6 +311,15 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isForm: false, hiddenInMain:true },