diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 98be37046..5eaecead8 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; import * as ItembasicApi from "@/api/wms/itembasic"; @@ -186,12 +186,12 @@ export const PackageInventory = useCrudSchemas(reactive([ label: '生产日期', field: 'produceDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, search: { component: 'DatePicker', componentProps: { style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')], disabled: true diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index a143066a0..4edf69fbb 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { Itembasic } from "@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data"; import * as ItembasicApi from "@/api/wms/itembasic"; @@ -195,12 +195,12 @@ export const PackageInventory = useCrudSchemas(reactive([ label: '生产日期', field: 'produceDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, search: { component: 'DatePicker', componentProps: { style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', disabled: true, defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] @@ -239,12 +239,12 @@ export const PackageInventory = useCrudSchemas(reactive([ label: '失效日期', field: 'expireDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, search: { component: 'DatePicker', componentProps: { style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', disabled: true, defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts index d276dab53..4c4138bee 100644 --- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts +++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 盘点记录主表 @@ -139,9 +139,9 @@ export const CountRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -151,7 +151,7 @@ export const CountRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index 3a79c8925..46b246f18 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 盘点调整记录主表 @@ -120,9 +120,9 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -132,7 +132,7 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 539d71218..4f7a65db4 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 客户收货记录主表 @@ -143,9 +143,9 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -155,7 +155,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index b1c8d3a63..287b54e45 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 客户退货记录主表 @@ -152,9 +152,9 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -164,7 +164,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts index e0d15ddb5..68e734d86 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 客户结算记录主表 @@ -112,9 +112,9 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -124,7 +124,7 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index e6dcd3f49..0603b3f41 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 发货记录主表 @@ -152,9 +152,9 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -164,7 +164,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index da5e8049f..588f3ef23 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as CustomerApi from '@/api/wms/customer' import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' @@ -66,9 +66,9 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ { label: '计划日期', field: 'planDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -78,7 +78,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index f40f20e8e..95f5bc160 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as CustomerApi from '@/api/wms/customer' import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' @@ -64,9 +64,9 @@ export const SaleMain = useCrudSchemas(reactive([ { label: '订单日期', field: 'orderDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -76,7 +76,7 @@ export const SaleMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -84,9 +84,9 @@ export const SaleMain = useCrudSchemas(reactive([ { label: '截止日期', field: 'dueDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -96,7 +96,7 @@ export const SaleMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index 13b27264d..7b6d7fd64 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 库存余额 @@ -156,9 +156,9 @@ export const Balance = useCrudSchemas(reactive([ label: '到货日期', field: 'arriveDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -168,16 +168,18 @@ export const Balance = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '生产日期', field: 'produceDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -187,16 +189,18 @@ export const Balance = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '失效日期', field: 'expireDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -206,8 +210,10 @@ export const Balance = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '货主代码', diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index f8c0491df..23c92eb93 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.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 PackageRules = reactive({ @@ -80,12 +80,12 @@ export const Package = useCrudSchemas(reactive([ label: '生产日期', field: 'produceDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, search: { component: 'DatePicker', componentProps: { style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } @@ -94,7 +94,8 @@ export const Package = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } }, table: { @@ -120,12 +121,12 @@ export const Package = useCrudSchemas(reactive([ label: '失效日期', field: 'expireDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, search: { component: 'DatePicker', componentProps: { style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } @@ -134,7 +135,8 @@ export const Package = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } }, table: { diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts index dad712c31..810454f40 100644 --- a/src/views/wms/inventoryManage/transaction/transaction.data.ts +++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 库存事务 @@ -223,9 +223,9 @@ export const Transaction = useCrudSchemas(reactive([ label: '到货日期', field: 'arriveDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -235,16 +235,18 @@ export const Transaction = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '生产日期', field: 'produceDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -254,8 +256,10 @@ export const Transaction = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '生效时间', @@ -280,9 +284,9 @@ export const Transaction = useCrudSchemas(reactive([ label: '失效日期', field: 'expireDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -292,8 +296,10 @@ export const Transaction = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '货主代码', diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts index e2fc2f91f..29604d9ab 100644 --- a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts +++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 库存转移日志 @@ -90,9 +90,9 @@ export const Transferlog = useCrudSchemas(reactive([ label: '到货日期', field: 'arriveDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -102,16 +102,18 @@ export const Transferlog = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '生产日期', field: 'produceDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -121,8 +123,10 @@ export const Transferlog = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '生效时间', @@ -141,9 +145,9 @@ export const Transferlog = useCrudSchemas(reactive([ label: '失效日期', field: 'expireDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -153,8 +157,10 @@ export const Transferlog = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } - } + }, }, { label: '从事务号', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts index 05b39efd8..ec3619709 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 库存初始化记录主表 @@ -95,20 +95,20 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { width: 180 }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } } }, @@ -454,9 +454,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ { label: '到货日期', field: 'arriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -466,7 +466,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -474,9 +474,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -486,7 +486,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -494,9 +494,9 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -506,7 +506,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 53a9135a0..1b69b58fa 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as WarehouseApi from '@/api/wms/warehouse' @@ -671,9 +671,9 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( { label: '到货日期', field: 'arriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -684,22 +684,22 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, tableForm: { - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', + type: 'FormDate', + format: 'YYYY-MM-DD', valueFormat: 'x', } }, { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -710,22 +710,22 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, tableForm: { - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', + type: 'FormDate', + format: 'YYYY-MM-DD', valueFormat: 'x', } }, { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -736,13 +736,13 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, tableForm: { - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', + type: 'FormDate', + format: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts index f4121158c..0b0a8acd2 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.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 PackagemergeMain = useCrudSchemas(reactive([ { @@ -61,9 +61,9 @@ export const PackagemergeMain = useCrudSchemas(reactive([ label: '生效日期', field: 'activeDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, table: { width: 180 @@ -73,7 +73,7 @@ export const PackagemergeMain = useCrudSchemas(reactive([ componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts index 8fbbb77b4..7a222f7c2 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverMain.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 PackageoverMain = useCrudSchemas(reactive([ { @@ -61,9 +61,9 @@ export const PackageoverMain = useCrudSchemas(reactive([ label: '生效日期', field: 'activeDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, table: { width: 180 @@ -73,7 +73,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts index 8358fc4b0..fef7aa3e7 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.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 PackagesplitMain = useCrudSchemas(reactive([ @@ -62,9 +62,9 @@ export const PackagesplitMain = useCrudSchemas(reactive([ label: '生效日期', field: 'activeDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, table: { width: 180 @@ -74,7 +74,7 @@ export const PackagesplitMain = useCrudSchemas(reactive([ componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 546c00411..9ca57faca 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 报废出库记录主表 @@ -96,9 +96,9 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -108,7 +108,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index f2f786f87..409acd4ed 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 调拨出库记录主表 @@ -120,9 +120,9 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -132,7 +132,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts index 1a65a77c6..233446ea4 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 调拨入库记录主表 @@ -88,9 +88,9 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -100,7 +100,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index c05ed0b87..a80028604 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 计划外出库记录主表 @@ -96,9 +96,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -108,7 +108,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts index a72ec54e3..3bc0c300e 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 计划外入库任务主表 @@ -724,9 +724,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ { label: '到货日期', field: 'arriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -736,7 +736,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -744,9 +744,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -756,7 +756,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -764,9 +764,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -776,7 +776,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index d2aa563fa..74397e9d9 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 计划外入库记录主表 @@ -96,9 +96,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -108,7 +108,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -432,9 +432,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -92,7 +92,7 @@ export const IssueRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts index 1b9b92497..fc067991b 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRecordMain/onlinesettlementRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 上线结算记录主表 @@ -80,9 +80,9 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive( { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -92,7 +92,7 @@ export const OnlinesettlementRecordMain = useCrudSchemas(reactive( component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts index ba5d64604..820a9e178 100644 --- a/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRecordMain/pickRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 拣料记录主表 @@ -72,9 +72,9 @@ export const PickRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -84,7 +84,7 @@ export const PickRecordMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts index 9e46bd576..4b6a3143d 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as ProductionMainApi from '@/api/wms/productionMain' import { ProductionMain } from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data' @@ -177,9 +177,9 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ { label: '计划日期', field: 'planDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -190,7 +190,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive([ componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index a1113789f..c34acef84 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 生产收料记录主表 @@ -80,9 +80,9 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detai: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -91,8 +91,9 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index fbcb2694d..658ef5cf9 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 生产退料记录主表 @@ -80,9 +80,9 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -91,8 +91,9 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts index 0dbde9d50..7f840295b 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 补料记录主表 @@ -72,9 +72,9 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -83,8 +83,9 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts index 71ebfc109..7fe1c7135 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 库存修改记录主表 @@ -95,9 +95,9 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -106,8 +106,9 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -465,9 +466,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive { label: '从到货日期', field: 'fromArriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -476,8 +477,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -485,9 +487,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive { label: '到到货日期', field: 'toArriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -496,8 +498,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -505,9 +508,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive { label: '从生产日期', field: 'fromProduceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -516,8 +519,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -525,9 +529,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive { label: '到生产日期', field: 'toProduceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -536,8 +540,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -545,9 +550,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive { label: '从过期日期', field: 'fromExpireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -556,8 +561,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -565,9 +571,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive { label: '到过期日期', field: 'toExpireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -576,8 +582,9 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 237225a23..ab790b1f5 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as BalanceApi from '@/api/wms/balance' @@ -680,9 +680,9 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -126,8 +126,9 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/moveManage/itemChange/itemChange.data.ts b/src/views/wms/moveManage/itemChange/itemChange.data.ts index d9edd3a60..71c528e16 100644 --- a/src/views/wms/moveManage/itemChange/itemChange.data.ts +++ b/src/views/wms/moveManage/itemChange/itemChange.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as OwnerApi from '@/api/wms/owner' import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data' @@ -159,9 +159,9 @@ export const ItemChange = useCrudSchemas(reactive([ label: '到货日期', field: 'arriveDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -170,7 +170,10 @@ export const ItemChange = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } }, isForm: false @@ -179,9 +182,9 @@ export const ItemChange = useCrudSchemas(reactive([ label: '生产日期', field: 'produceDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -190,7 +193,10 @@ export const ItemChange = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } }, isForm: false @@ -200,9 +206,9 @@ export const ItemChange = useCrudSchemas(reactive([ label: '失效日期', field: 'expireDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -213,7 +219,7 @@ export const ItemChange = useCrudSchemas(reactive([ componentProps: { style:{width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } } diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts index d940a00a9..c10a28641 100644 --- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts +++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/offlinesettlementRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 下线结算记录主表 @@ -80,9 +80,9 @@ export const OfflinesettlementRecordMain = useCrudSchemas(reactive { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -91,8 +91,9 @@ export const OfflinesettlementRecordMain = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts index 7db7d7a1b..a14ff4866 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/productdismantleJobMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 制品拆解任务主表 @@ -633,9 +633,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive([ { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -644,8 +644,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -653,9 +654,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive([ { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -664,8 +665,9 @@ export const ProductdismantleJobDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts index 702515966..3030e86a7 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 制品拆解记录主表 @@ -88,9 +88,9 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -99,8 +99,9 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -377,9 +378,9 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive([ { label: '订单日期', field: 'orderDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -76,7 +76,7 @@ export const WorkMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -84,9 +84,9 @@ export const WorkMain = useCrudSchemas(reactive([ { label: '截止日期', field: 'dueDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -96,7 +96,7 @@ export const WorkMain = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts index 9ea2fcd23..2828e61ed 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 制品上架记录主表 @@ -80,9 +80,9 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -91,8 +91,9 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index c5e9ec671..376a35b5f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 制品收货任务主表 @@ -641,9 +641,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -652,8 +652,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -661,9 +662,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -672,8 +673,9 @@ export const ProductreceiptJobDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index 2f54f0a6b..be033b033 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 制品收货记录主表 @@ -104,9 +104,9 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -115,8 +115,9 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -385,9 +386,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -396,8 +397,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -405,9 +407,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -416,8 +418,9 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index d22a16781..654759f6d 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as WorkshopApi from '@/api/wms/workshop' @@ -888,16 +888,16 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { width: 180 }, tableForm: { - type: 'FormDateTime', + type: 'FormDate', valueFormat: 'x', }, form: { @@ -905,7 +905,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -913,16 +913,16 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { width: 180 }, tableForm: { - type: 'FormDateTime', + type: 'FormDate', valueFormat: 'x', }, form: { @@ -930,7 +930,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts index d0d5a49cf..3010024a8 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import {Bom} from "@/views/wms/basicDataManage/itemManage/bom/bom.data"; import * as BomApi from "@/api/wms/bom"; @@ -88,9 +88,9 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -99,8 +99,9 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -387,9 +388,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive([ { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -398,8 +399,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -407,9 +409,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive([ { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -418,8 +420,9 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 5d22174ec..5b05e1c18 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; import * as WorkshopApi from "@/api/wms/workshop"; import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data"; @@ -117,9 +117,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -128,8 +128,9 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts index e65750052..2e8d39a56 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/inspectRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 检验记录主表 @@ -88,9 +88,9 @@ export const InspectRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter : dateFormatter, + formatter : dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -99,8 +99,9 @@ export const InspectRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index e78b27624..b4340e059 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 采购收货任务主表 @@ -658,9 +658,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ { label: '到货日期', field: 'arriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -669,8 +669,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -678,9 +679,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -689,8 +690,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -698,9 +700,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -709,8 +711,9 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index daf55b5c2..9903bea1c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' @@ -184,9 +184,9 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -195,8 +195,9 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -652,9 +653,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive { label: '到货日期', field: 'arriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -663,8 +664,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -672,9 +674,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -683,8 +685,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -692,9 +695,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -703,8 +706,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index d674b0599..65c783d72 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as SupplierApi from '@/api/wms/supplier' @@ -659,9 +659,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -201,8 +201,9 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index d1fd62e6f..6cb76462e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain' @@ -813,9 +813,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive { label: '到货日期', field: 'arriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -824,25 +824,25 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { - disabled: true, + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, tableForm:{ disabled:true, - type: 'FormDateTime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'FormDate', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -852,24 +852,25 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive component: 'DatePicker', componentProps: { disabled: true, + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, tableForm:{ disabled:true, - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', + type: 'FormDate', + format: 'YYYY-MM-DD', valueFormat: 'x', } }, { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -879,15 +880,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive component: 'DatePicker', componentProps: { disabled: true, + style: {width:'100%'}, type: 'datetime', - format: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, tableForm:{ disabled:true, - type: 'FormDateTime', - format: 'YYYY-MM-DD HH:mm:ss', + type: 'FormDate', + format: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts index 0cad78a2f..92d34156d 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 上架记录主表 @@ -80,9 +80,9 @@ export const PutawayRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -91,8 +91,9 @@ export const PutawayRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index ea2b1bc4c..2ee881f4f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as SupplieritemApi from '@/api/wms/supplieritem' @@ -269,9 +269,9 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ { label: '预测日期', field: 'predictTime', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -282,13 +282,13 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ componentProps: { style: { width: '100%' }, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, tableForm: { - type: 'FormDateTime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'FormDate', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index 439c6c541..cf1175098 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as SupplieritemApi from '@/api/wms/supplieritem' @@ -81,9 +81,9 @@ export const PurchaseMain = useCrudSchemas(reactive([ label: '订单日期', field: 'orderDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -94,7 +94,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', }, value: new Date().getTime() @@ -104,9 +104,9 @@ export const PurchaseMain = useCrudSchemas(reactive([ label: '截止日期', field: 'dueDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, detail:{ - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -117,7 +117,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ componentProps: { style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts index bd5fc4454..0f42c33a9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/supplierPackage.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 PackageRules = reactive({ @@ -84,12 +84,12 @@ export const Package = useCrudSchemas(reactive([ label: '生产日期', field: 'produceDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, search: { component: 'DatePicker', componentProps: { style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } @@ -97,8 +97,10 @@ export const Package = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width: '100%' }, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } }, table: { @@ -124,12 +126,12 @@ export const Package = useCrudSchemas(reactive([ label: '失效日期', field: 'expireDate', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatter2, search: { component: 'DatePicker', componentProps: { style: {width:'100%'}, - valueFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } @@ -137,8 +139,10 @@ export const Package = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: { width: '100%' }, type: 'datetime', - valueFormat: 'x' + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', } }, table: { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index c0c6f3ad0..ef59cd0e3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 供应商发货记录主表 @@ -188,9 +188,9 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -199,8 +199,9 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -550,9 +551,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive { label: '到货日期', field: 'arriveDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -561,8 +562,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -570,9 +572,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive { label: '生产日期', field: 'produceDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -581,8 +583,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, @@ -590,9 +593,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive { label: '过期日期', field: 'expireDate', - formatter: dateFormatter, + formatter: dateFormatter2, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { @@ -601,8 +604,9 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index d586fac89..d74373ebc 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' const { t } = useI18n() // 国际化 @@ -568,9 +568,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive([ label: '生效日期', field: 'activeDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, deatil: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'YYYY-MM-DD' }, sort: 'custom', table: { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 8c265dc6b..07807ad56 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' /** * @returns {Array} 供应商发票记录主表 @@ -85,9 +85,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '生效日期', field: 'activeDate', isTable: true, - formatter: dateFormatter, + formatter: dateFormatter2, deatil: { - dateFormatter: 'YYYY-MM-DD HH:mm:ss' + dateFormatter: 'YYYY-MM-DD' }, sort: 'custom', table: {