From b31830d33cd4dd05e8f48d272dc0ad4a0725bc84 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 14 May 2024 15:00:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=B1=95=E7=A4=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containermanage/containerMainRequest/index.vue | 10 +++++----- .../containerRecordMain/containerRecordMain.data.ts | 2 -- .../containermanage/containerRecordMain/index.vue | 12 ++++++------ .../initialContainerMainRequest/index.vue | 6 +++--- .../scrapContainerMainRequest/index.vue | 4 ++-- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 00d2bdfb1..98a33615b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'ContainerManage' }) +defineOptions({ name: 'ContainerManageRequest' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -110,7 +110,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'ReturnContainerManage') { + if ( routeName.value == 'ReturnContainerManageRequest') { tableObject.params = { type:'RETURN' } @@ -120,7 +120,7 @@ const { tableObject, tableMethods } = useTable({ }}); businessType.value = 'ReturnContainerManage' importFileName.value = '器具返回申请' -} else if ( routeName.value == 'MoveContainerManage') { +} else if ( routeName.value == 'MoveContainerManageRequest') { tableObject.params = { type:'MOVE' } @@ -130,7 +130,7 @@ const { tableObject, tableMethods } = useTable({ }}); businessType.value = 'MoveContainerManage' importFileName.value = '器具转移申请' -} else if ( routeName.value == 'DeliverContainerManage') { +} else if ( routeName.value == 'DeliverContainerManageRequest') { tableObject.params = { type: 'DELIVER', } @@ -141,7 +141,7 @@ const { tableObject, tableMethods } = useTable({ }}); businessType.value = 'DeliverContainerManage' importFileName.value = '器具发运申请' -} else if( routeName.value == 'ContainerManage'){ +} else if( routeName.value == 'ContainerManageRequest'){ businessType.value = 'ContainerManage' importFileName.value = '器具管理申请' } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index f82f2ca4a..862df9340 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -63,7 +63,6 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isSearch: true, }, { label: '部门', @@ -166,7 +165,6 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ label: '主表ID', field: 'masterId', sort: 'custom', - isSearch: true, form: { component: 'InputNumber', value: 0 diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index c527d1974..1c422db7b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -90,38 +90,38 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'ReturnContainerManage') { + if ( routeName.value == 'ReturnContainerManageRecord') { tableObject.params = { type:'RETURN' } businessType.value = 'ReturnContainerManage' importFileName.value = '器具返回记录' -} else if ( routeName.value == 'MoveContainerManage') { +} else if ( routeName.value == 'MoveContainerManageRecord') { tableObject.params = { type:'MOVE' } businessType.value = 'MoveContainerManage' importFileName.value = '器具转移记录' -} else if ( routeName.value == 'InitialContainerManage') { +} else if ( routeName.value == 'InitialContainerManageRecord') { tableObject.params = { type:'INITIAL', } businessType.value = 'InitialContainerManage' importFileName.value = '器具初始化记录' } -else if ( routeName.value == 'ScrapContainerManage') { +else if ( routeName.value == 'ScrapContainerManageRecord') { tableObject.params = { type:'SCRAP' } businessType.value = 'ScrapContainerManage' importFileName.value = '器具报废记录' -} else if ( routeName.value == 'DeliverContainerManage') { +} else if ( routeName.value == 'DeliverContainerManageRecord') { tableObject.params = { type: 'DELIVER', } businessType.value = 'DeliverContainerManage' importFileName.value = '器具发运记录' -} else if( routeName.value == 'ContainerManage'){ +} else if( routeName.value == 'ContainerManageRecord'){ businessType.value = 'ContainerManage' importFileName.value = '器具管理记录' } diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 42a6941c5..bed6ff8ad 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -67,7 +67,7 @@ :detailAllSchemas="ContainerDetailRequest.allSchemas" :detailAllSchemasRules="ContainerDetailRequestRules" :apiCreate="ContainerDetailRequestApi.createContainerDetailRequest" - :apiUpdate="ContainerDetailRequestApi.updateContainerDetailRequest" + :apiUpdate="ContainerDetailRequestApi.createContainerDetailRequest" :apiPage="ContainerDetailRequestApi.getContainerDetailRequestPage" :apiDelete="ContainerDetailRequestApi.deleteContainerDetailRequest" fromeWhere="ContainerDetailRequest" @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'InitialContainerManage' }) +defineOptions({ name: 'InitialContainerManageRequest' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -109,7 +109,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'InitialContainerManage') { + if ( routeName.value == 'InitialContainerManageRequest') { tableObject.params = { type:'INITIAL', } diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 167c9a215..6f3211c54 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -90,7 +90,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -defineOptions({ name: 'ScrapContainerManage' }) +defineOptions({ name: 'ScrapContainerManageRequest' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -110,7 +110,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ - if ( routeName.value == 'ScrapContainerManage') { + if ( routeName.value == 'ScrapContainerManageRequest') { tableObject.params = { type:'SCRAP' }