From 78971372f5fbfcad2860126f1c2d296d34832121 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Sat, 10 May 2025 10:25:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=BB=98=E8=AE=A4=E4=B8=8D=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Query/StockQuery/StockTransaction/index.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/Query/StockQuery/StockTransaction/index.vue b/src/views/Query/StockQuery/StockTransaction/index.vue index 2e745cc..19a6f67 100644 --- a/src/views/Query/StockQuery/StockTransaction/index.vue +++ b/src/views/Query/StockQuery/StockTransaction/index.vue @@ -8,7 +8,7 @@ - + { */ ] getPRINTLIST() - handleQuery() + //handleQuery() updateTableHeight(); window.addEventListener('resize', handleResize); @@ -301,6 +301,11 @@ function handleQuery() { for (let i = 0; i < state.queryParams.RECEIVEREQUESTNAMETYPE.length; i++) { loactionString = loactionString + state.queryParams.RECEIVEREQUESTNAMETYPE[i] + ',' } + /* + if (loactionString == '') { + loactionString = 'BarCodeToTransferIn,allocateStockIn,receiveMesShippInfo,Assign'; + } + */ let erpFactoryString = '' for (let i = 0; i < state.queryParams.ERPFACTORY.length; i++) { erpFactoryString = erpFactoryString + state.queryParams.ERPFACTORY[i] + ',' @@ -430,7 +435,7 @@ function exportExcel() { function resetQuery() { queryFormRef.value.resetFields(); setDefaultDates(); - handleQuery(); + //handleQuery(); } /** From cf9884564e68e4c9df8fc3ea88c22ad841d236e3 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Sat, 10 May 2025 10:40:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update=20=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=85=E7=A9=BA=E5=88=97=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Query/StockQuery/StockTransaction/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/Query/StockQuery/StockTransaction/index.vue b/src/views/Query/StockQuery/StockTransaction/index.vue index 19a6f67..bfc60c6 100644 --- a/src/views/Query/StockQuery/StockTransaction/index.vue +++ b/src/views/Query/StockQuery/StockTransaction/index.vue @@ -212,12 +212,12 @@ onMounted(() => { { header: "出库仓库", field: "OUTLOCATIONDESC", hide: false, width: '150px' }, { header: "出库货位", field: "OUTLOCATIONNAME", hide: false, width: '150px' }, // 无来源转库、货位调整 - { header: "转出组织", field: "TRANSFEROUTERPFACTORYDESC", hide: false, width: '100px' }, + /* { header: "转出组织", field: "TRANSFEROUTERPFACTORYDESC", hide: false, width: '100px' }, { header: "转出仓库", field: "TRANSFEROUTLOCATIONDESC", hide: false, width: '150px' }, { header: "转出货位", field: "TRANSFEROUTLOCATIONNAME", hide: false, width: '150px' }, { header: "转入组织", field: "TRANSFERINERPFACTORYDESC", hide: false, width: '100px' }, { header: "转入仓库", field: "TRANSFERINLOCATIONDESC", hide: false, width: '150px' }, - { header: "转入货位", field: "TRANSFERINLOCATIONNAME", hide: false, width: '150px' }, + { header: "转入货位", field: "TRANSFERINLOCATIONNAME", hide: false, width: '150px' },*/ { header: "数量", field: "MATERIALQUANTITY", hide: false, width: '100px' }, { header: "单位", field: "FNAME", hide: false, width: '100px' }, { header: "入库单号", field: "RECEIVEREQUESTNAME", hide: false, width: '100px' }, @@ -436,6 +436,8 @@ function resetQuery() { queryFormRef.value.resetFields(); setDefaultDates(); //handleQuery(); + state.list = []; + state.page.total = 0; } /** From b55da844466ff76c43e8a31478893cd9d993eb2f Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Sat, 10 May 2025 13:49:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E4=B8=AD=E6=AF=8F=E9=A1=B5=E5=B1=95=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=E5=A2=9E=E5=8A=A0=E5=88=B0500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Pagination/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue index d907c04..b8cb4ab 100644 --- a/src/components/Pagination/index.vue +++ b/src/components/Pagination/index.vue @@ -35,7 +35,7 @@ const props = defineProps({ pageSizes: { type: Array as PropType, default() { - return [10, 20, 30, 50]; + return [10, 20, 30, 50, 100, 500]; } }, layout: { From 59cf4660cf2c87fea12efdd75336c0430e02128c Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Sat, 10 May 2025 16:05:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA=E5=88=97=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6=E4=BF=AE=E6=94=B9=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockQuery/StockTransaction/index.vue | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/views/Query/StockQuery/StockTransaction/index.vue b/src/views/Query/StockQuery/StockTransaction/index.vue index bfc60c6..5bfaf83 100644 --- a/src/views/Query/StockQuery/StockTransaction/index.vue +++ b/src/views/Query/StockQuery/StockTransaction/index.vue @@ -77,7 +77,7 @@
搜索 - 导出 + 导出 重置
@@ -99,7 +99,8 @@ - + + { materialTableConfig.value.column = [ + { header: "作业类型", field: "LASTEVENTNAME", hide: false , width: '150px'}, { header: "标签", field: "MATERIALPACKINGNAME", hide: false, width: '320px' }, { header: "批次", field: "CHARGE", hide: false, width: '200px' }, { header: "料号", field: "MATERIALSPECNAME", hide: false , width: '100px'}, + { header: "品名", field: "DESC_CN", hide: false , width: '100px'}, { header: "规格", field: "DESCRIPTION", hide: false, width: '200px' }, { header: "阶段", field: "PHASE", hide: false, width: '100px' }, //入库 + { header: "入库组织编码", field: "INERPFACTORY", hide: false, width: '100px' }, { header: "入库组织", field: "INERPFACTORYDESC", hide: false, width: '100px' }, - { header: "入库仓库", field: "INLOCATIONDESC", hide: false, width: '150px' }, + { header: "入库仓库编码", field: "INERPLOCATION", hide: false, width: '150px' }, + { header: "入库仓库", field: "INERPLOCATIONDESC", hide: false, width: '150px' }, + { header: "入库货位编码", field: "INLOCATION", hide: false, width: '150px' }, { header: "入库货位", field: "INLOCATIONNAME", hide: false, width: '150px' }, //出库 + { header: "出库组织编码", field: "OUTERPFACTORY", hide: false, width: '100px' }, { header: "出库组织", field: "OUTERPFACTORYDESC", hide: false, width: '100px' }, - { header: "出库仓库", field: "OUTLOCATIONDESC", hide: false, width: '150px' }, + { header: "出库仓库编码", field: "OUTERPLOCATION", hide: false, width: '150px' }, + { header: "出库仓库", field: "OUTERPLOCATIONDESC", hide: false, width: '150px' }, + { header: "出库货位编码", field: "OUTLOCATION", hide: false, width: '150px' }, { header: "出库货位", field: "OUTLOCATIONNAME", hide: false, width: '150px' }, // 无来源转库、货位调整 /* { header: "转出组织", field: "TRANSFEROUTERPFACTORYDESC", hide: false, width: '100px' }, @@ -225,7 +234,6 @@ onMounted(() => { { header: "作业凭证", field: "UNDOID", hide: false, width: '120px' }, { header: "操作人", field: "LASTEVENTUSER", hide: false, width: '120px' }, { header: "操作时间", field: "LASTEVENTTIME", hide: false , width: '150px' }, - { header: "测试操作事件", field: "LASTEVENTNAME", hide: false , width: '150px' }, /* { header: "组织", field: "ERPFACTORYDESC", hide: false, width: '100px' }, { header: "仓库", field: "LOCATIONDESC", hide: false, width: '150px' }, @@ -505,6 +513,16 @@ function formatDate(param: any) { const day = String(param.getDate()).padStart(2, '0'); return `${year}${month}${day}`; } + +function exportTransactionExcel() { + if (state.list.length > 0) { + state.loading = false + exportDataToExcel(state.list, '出入库报表') + } else { + state.loading = false + proxy.$ElMessage.warning('当前查询没有数据可以导出'); + } +}