From f7c0a76d415572ec89749e011965d7f441d02cdb Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Mon, 12 May 2025 13:16:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-2394:=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=B9=E7=94=A8=E4=B8=BB=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=BC=E5=87=BA=EF=BC=9B=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E6=A8=A1=E5=85=B7=E8=B4=B9=E7=94=A8=E6=98=8E=E7=BB=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierMoldCostMain/index.vue | 38 ++++++++++++++++++- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue index 2fa43c6a2..2f42c17d9 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue @@ -64,7 +64,18 @@ :detailButtonIsShowEdit="false" :detailButtonIsShowDelete="false" :buttondataTable="buttondataTable" - :otherHeadButttonData = "[]" + :otherHeadButttonData = "[ + { + label: t('ts.导出明细'), + name: 'export-detail', + hide: false, + type: 'primary', + // icon: 'ep:operation', + color: '', + float: 'left', + hasPermi: '' + } + ]" @buttonBaseClick="detailButtonBaseClick" @tableFormButton="tableFormButton" @@ -260,7 +271,7 @@ const buttonBaseClick = (val, item) => { } } - + const clicKRowId = ref() // 点击详情列表列按钮回调事件 const tableFormButton = async (val , row) => { if (val == 'close') { // 点击关闭 @@ -281,6 +292,7 @@ const buttonBaseClick = (val, item) => { value: row.number }] detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomerStatementMain') + clicKRowId.value = row.id; } @@ -369,8 +381,30 @@ const importSuccess = () => { if (val == 'export') { // 子表导出明细 handleExportDetail(detailTableObject) + } else if (val === 'export-detail') { + console.log('导出明细:', clicKRowId.value) + handleDetailExport(clicKRowId.value) + } + } + /** 导出明细按钮操作 */ +const exportLoadingDetail = ref(false) // 导出的加载中 +const handleDetailExport = async (masterId) => { + try { + // 导出的二次确认 + await message.exportConfirm() + // 发起导出导出明细 + exportLoadingDetail.value = true + let params = { + masterId: masterId } + const excelTitle = ref(route.meta.title) + const data = await SuppliperMoldCostDetailApi.exportSupplierMoldCostDetail(params) + download.excel(data, `【${excelTitle.value}明细】【${formatDate(new Date())}】.xlsx`) + } catch { + } finally { + exportLoadingDetail.value = false } +} /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 // 子表导出明细 From 4c690828dff1aa83b537381f2ba16708275a1df4 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 12 May 2025 13:30:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?SCP=E3=80=8A=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E3=80=8B=E5=A2=9E=E5=8A=A0=20=E2=80=9C=E5=B7=B2?= =?UTF-8?q?=E6=94=B6=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E2=80=9D=20?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B7=B2=E6=94=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=95=B0=E9=87=8F=3D=E3=80=8A=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B=E4=B8=AD=E8=AF=A5=E8=A6=81?= =?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E8=AF=A5=E5=93=81=E7=95=AA=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=95=B0=E9=87=8F=E4=B9=8B=E5=92=8C=EF=BC=9B?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E9=87=87=E8=B4=AD=E6=95=B0=E9=87=8F=3D?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=20/=20?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=8E=87=E3=80=82=E5=B7=B2=E6=94=B6=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E9=87=8F=E5=92=8C=E5=B7=B2=E6=94=B6=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=95=B0=E9=87=8F=E9=9C=80=E8=A6=81=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E3=80=8A=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=8B=E5=AE=9E=E6=97=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 3 ++- .../purchasePlanMain/purchasePlanMain.data.ts | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index da978219b..f1b5feff8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -74,7 +74,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false + isTable:true, + sortTableDefault:5, }, { label: '供应商代码', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 8d38b3533..6daba3822 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -1052,6 +1052,18 @@ export const PurchasePlanDetail = useCrudSchemas( isTable: true, }, + { + label: '已收库存数量', + field: 'inventoryedQty', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: true, + }, + // {需求作废 // label: '受入地',