From 0a7ec9bce28ea53b43c7187b92de9a80ae474cc4 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 25 Dec 2024 18:19:27 +0800 Subject: [PATCH] =?UTF-8?q?YT-1769=EF=BC=9A=E7=89=A9=E6=96=99=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inventorymoveRecordMain/index.ts | 12 ++++++++ src/utils/dict.ts | 2 ++ .../inventorymoveRecordMainOKHOLD/index.vue | 2 +- .../inventorymoveRecordMainOKHOLD.data.ts | 29 +++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index 79e6afd82..55b14422a 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -81,6 +81,18 @@ export const exportOkToHoldRecordMain = async (params) => { return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params }) } } + +// 导出物料隔离记录主 Excel +export const exportOkToHoldRecordOkToHoldMain = async (params) => { + params.businessType = 'OkToHold' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior-OkToHold', data }) + } else { + return await request.download({ url: `/wms/inventorymove-record-main/export-excel-OkToHold`, params }) + } +} // 导出合格转隔离记录主 Excel export const exportNokToHoldRecordMain = async (params) => { params.businessType = 'NokToHold' diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1fb2d8fee..7befdde9a 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -420,6 +420,8 @@ export enum DICT_TYPE { SUPPLIER_TOOL_APPORT_STATEMENT_DETAIL = 'supplier_tool_apport_statement_detail', // 供应商模具费用子 PRODUCTION_LINE_ITEM = 'production_line_item', //顺引生产线项 CLASS_ITEM = 'class_item', //顺引班组项 + DUTY = 'duty', //责任 + DUTY_DETAILS ="duty_details",//责任明细字典 } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue index 4fdeef3b6..c58273f66 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue @@ -252,7 +252,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params) + const data = await InventorymoveRecordMainApi.exportOkToHoldRecordOkToHoldMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts index fbe2cff25..364949095 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts @@ -228,6 +228,35 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:9, }, + { + label: '责任', + field: 'duty', + dictType: DICT_TYPE.DUTY, + dictClass: 'string', + table: { + width: 150 + }, + sortTableDefault:9, + }, + { + label: '部门', + field: 'dutyDept', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:9, + }, + { + label: '责任明细', + field: 'dutyDetails', + dictType: DICT_TYPE.DUTY_DETAILS, + dictClass: 'string', + table: { + width: 150 + }, + sortTableDefault:9, + }, // { // label: '部门',