diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index 57daad0dd..8b65a711b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -126,7 +126,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -135,7 +135,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: true, + isTable: false, isForm: false, }, { @@ -145,7 +145,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: true + isTable: false }, { label: '最后更新时间', @@ -274,6 +274,20 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, search: { component: 'DatePicker', componentProps: { @@ -282,9 +296,19 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: false, + isTable: true, + isForm: false, + isTableForm: false, + isSearch: true, + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, isForm: false, - isTableForm: false + isTable: true }, { label: '地点ID', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index b6f29dca9..032f68823 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -354,7 +354,7 @@ export const ScrapJobMain = useCrudSchemas( } }, { - label: '备注', + label: '通知单描述', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index b5da4fca0..833d98069 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -357,7 +357,7 @@ export const ScrapRecordMain = useCrudSchemas( } }, { - label: '备注', + label: '通知单描述', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index b09097359..50518741e 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => console.log("报废出库主表") const setV = {} if (formField == 'q1Number') { + setV['remark'] = val[0]['desc'] ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q2Number' || item.field == 'q3Number') { item.componentProps.enterSearch = false @@ -199,6 +200,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => }) } if (formField == 'q2Number') { + setV['remark'] = val[0]['desc'] ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q1Number' || item.field == 'q3Number') { item.componentProps.enterSearch = false @@ -208,6 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => }) } if (formField == 'q3Number') { + setV['remark'] = val[0]['desc'] ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q1Number' || item.field == 'q2Number') { item.componentProps.enterSearch = false diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 2aed0a8b8..8960f82cc 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -617,7 +617,7 @@ export const ScrapRequestMain = useCrudSchemas( } }, { - label: '备注', + label: '通知单描述', field: 'remark', sort: 'custom', isTable: false,