diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index d65bb32e7..0f44e08bb 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -352,7 +352,7 @@ export default defineComponent({ } } //默认排序 - // updateSort(columns) + updateSort(columns) return [...[renderTableExpand()], ...[renderTableSelection()]].concat( (columnsChildren || columns).map((v) => { const zhName = v.label || '';//中文名称 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 578e91c21..4a2e5ba04 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -661,6 +661,37 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive( // } // } // }, + { + label: '到货时间', + field: 'arriveTime', + formatter: dateFormatter2, + detail: { + dateFormat: 'YYYY-MM-DD hh:mm:ss' + }, + sort: 'custom', + hiddenInMain: true, + table: { + width: 180 + }, + isForm: false, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + + isTableForm: false, + tableForm: { + type: 'FormDate', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, { label: '操作', field: 'action', @@ -927,7 +958,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive