From 09f973a418f366083ee4019258a36f429de070df Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Fri, 23 Aug 2024 08:35:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?HL-5424=20=E5=99=A8=E5=85=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerRecordMain.data.ts | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) 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', From fd8e27022e7435a9ee679c8fc9d0b8c0ee13182a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 23 Aug 2024 09:05:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5565=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=87=BA=E5=BA=93=E5=A4=87=E6=B3=A8=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts | 2 +- .../scrap/scrapRecordMain/scrapRecordMain.data.ts | 2 +- .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 3 +++ .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) 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,