From ee9b7fcacf33182af2c9575627548193ba8a47a3 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Wed, 9 Oct 2024 15:05:30 +0800 Subject: [PATCH] =?UTF-8?q?HL-6218=20=E6=89=80=E6=9C=89=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9C=89=E4=B8=BB?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E3=80=81=E5=AD=90=E5=A4=87=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E4=B8=BB=E3=80=81=E5=AD=90?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=BA=94=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/containerMainRequest/index.ts | 14 +++++++------- src/api/wms/containerRecordMain/index.ts | 11 +++++++++-- .../containerMainRequest.data.ts | 10 +++++----- .../containermanage/containerRecordMain/index.vue | 2 +- .../initialContainerMainRequest.data.ts | 10 +++++----- .../scrapContainerMainRequest.data.ts | 10 +++++----- 6 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/api/wms/containerMainRequest/index.ts b/src/api/wms/containerMainRequest/index.ts index 91d143784..2d5bea0c1 100644 --- a/src/api/wms/containerMainRequest/index.ts +++ b/src/api/wms/containerMainRequest/index.ts @@ -47,7 +47,7 @@ export const exportContainerMainRequest = async (params) => { if (params.isSearch) { delete params.isSearch const data = { ...params } - return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data }) } else { return await request.download({ url: `/wms/container-main-request/export-excel`, params }) } @@ -59,7 +59,7 @@ export const exportInitialContainerMainRequest = async (params) => { if (params.isSearch) { delete params.isSearch const data = { ...params } - return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data }) } else { return await request.download({ url: `/wms/container-main-request/export-excel`, params }) } @@ -71,7 +71,7 @@ export const exportScrapContainerMainRequest = async (params) => { if (params.isSearch) { delete params.isSearch const data = { ...params } - return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data }) } else { return await request.download({ url: `/wms/container-main-request/export-excel`, params }) } @@ -83,7 +83,7 @@ export const exportMoveContainerMainRequest = async (params) => { if (params.isSearch) { delete params.isSearch const data = { ...params } - return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data }) } else { return await request.download({ url: `/wms/container-main-request/export-excel`, params }) } @@ -95,7 +95,7 @@ export const exportReturnContainerMainRequest = async (params) => { if (params.isSearch) { delete params.isSearch const data = { ...params } - return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data }) } else { return await request.download({ url: `/wms/container-main-request/export-excel`, params }) } @@ -107,7 +107,7 @@ export const exportDeliverContainerMainRequest = async (params) => { if (params.isSearch) { delete params.isSearch const data = { ...params } - return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + return await request.downloadPost({ url: '/wms/container-main-request/export-excel-senior', data }) } else { return await request.download({ url: `/wms/container-main-request/export-excel`, params }) } @@ -146,4 +146,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/container-main-request/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/containerRecordMain/index.ts b/src/api/wms/containerRecordMain/index.ts index ea84c1260..5fe8c8a49 100644 --- a/src/api/wms/containerRecordMain/index.ts +++ b/src/api/wms/containerRecordMain/index.ts @@ -47,10 +47,17 @@ export const deleteContainerRecordMain = async (id: number) => { // 导出器具管理记录主 Excel export const exportContainerRecordMain = async (params) => { - return await request.download({ url: `/wms/container-record-main/export-excel`, params }) + // return await request.download({ url: `/wms/container-record-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.downloadPost({ url: '/wms/container-record-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-record-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/container-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index 2c1333d9a..6d2baa6b6 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -92,11 +92,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '主备注', + field: 'mainRemark', sort: 'custom', isSearch: false, - isTable: false + isTable: true }, { label: '部门', @@ -501,10 +501,10 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } }, { - label: '备注', + label: '子备注', field: 'remark', sort: 'custom', - isTable: false + isTable: true }, { label: '创建时间', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index c3411002f..3a89bf209 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -143,7 +143,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增 - defaultButtons.defaultExportBtn({hasPermi:`wms:{routeName.value}:export`}), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 868d9fc26..c8ba04eef 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -96,11 +96,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '主备注', + field: 'mainRemark', sort: 'custom', isSearch: false, - isTable:false, + isTable:true, }, { label: '部门', @@ -468,10 +468,10 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } }, { - label: '备注', + label: '子备注', field: 'remark', sort: 'custom', - isTable:false, + isTable:true, }, { label: '创建时间', diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index 7a8b22d41..ca3856e27 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -92,11 +92,11 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '主备注', + field: 'mainRemark', sort: 'custom', isSearch: false, - isTable: false + isTable: true }, { label: '部门', @@ -502,10 +502,10 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } }, { - label: '备注', + label: '子备注', field: 'remark', sort: 'custom', - isTable: false + isTable: true }, { label: '创建时间',