diff --git a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts index 16449b433..4a0e7a047 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts @@ -46,7 +46,7 @@ export const DeliTime = useCrudSchemas(reactive([ componentProps: { type: 'time', dateFormat: 'HH:mm:ss', - valueFormat: 'x' + valueFormat: 'YYYY-MM-DD HH:mm:ss', } }, form: { diff --git a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts index d78f26358..b86b0d6bc 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/deliTimeWms.data.ts @@ -46,7 +46,7 @@ export const DeliTimeWms = useCrudSchemas(reactive([ componentProps: { type: 'time', dateFormat: 'HH:mm:ss', - valueFormat: 'x' + valueFormat: 'YYYY-MM-DD HH:mm:ss', } }, form: { diff --git a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue index 756d0f660..704810bbe 100644 --- a/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/deliTimeWms/index.vue @@ -155,7 +155,14 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = true } }) + } else { + DeliTimeWms.allSchemas.formSchema.forEach((item) => { + if(item.field == 'code'){ + item.componentProps.disabled = false + } + }) } + basicFormRef.value.open(type, row) } diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue index 41b697674..8db2824ee 100644 --- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue @@ -28,7 +28,7 @@ v-model:sort="tableObject.sort" > diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts index 763b748b8..9c23211a3 100644 --- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts @@ -5,11 +5,12 @@ import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '../supplier/supplier.data' import { DeliTimeWms } from '../DeliTimeWms/deliTimeWms.data' import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms' +import { fa } from 'element-plus/es/locale' // 表单校验 export const ModelDeliTimeDetailRules = reactive({ - model: [required], - yearAndMonth: [required], + modelShow: [required], + yearAndMonthShow: [required], delayDeli: [required], }) @@ -199,11 +200,15 @@ export const ModelDeliTime = useCrudSchemas(reactive([ } }, isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, { label: '操作', field: 'action', isForm: false, + isDetail:false, table: { width: 150, fixed: 'right'