From 1a6b21ea00a80d09eafa8f624a478a48ac520a60 Mon Sep 17 00:00:00 2001 From: hwj Date: Wed, 17 Jun 2026 09:31:38 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=87=BA=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=8D=AE-=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=87=BA=E5=BA=93/=E5=B7=B2?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/erp/stock/in/index.ts | 31 +++++++++++++++++++++++++++++-- src/api/erp/stock/out/index.ts | 31 +++++++++++++++++++++++++++++-- src/views/erp/stock/in/index.vue | 10 +++++++--- src/views/erp/stock/out/index.vue | 9 +++++++-- 4 files changed, 72 insertions(+), 9 deletions(-) diff --git a/src/api/erp/stock/in/index.ts b/src/api/erp/stock/in/index.ts index 8af08078..edff0500 100644 --- a/src/api/erp/stock/in/index.ts +++ b/src/api/erp/stock/in/index.ts @@ -1,4 +1,21 @@ import request from '@/config/axios' +import qs from 'qs' + +const normalizeStockQueryParams = (params: any) => { + if (!params) return params + const nextParams = { ...params } + if (Array.isArray(nextParams.statusList)) { + if (nextParams.statusList.length) { + nextParams.statusList = nextParams.statusList.join(',') + } else { + delete nextParams.statusList + } + } + return nextParams +} + +const stockQueryParamsSerializer = (params: any) => + qs.stringify(params, { allowDots: true, arrayFormat: 'repeat' }) // ERP 其它入库单 VO export interface StockInVO { @@ -32,7 +49,12 @@ export interface StockInApproveRecordVO { export const StockInApi = { // 查询其它入库单分页 getStockInPage: async (params: any) => { - return await request.get({ url: `/erp/stock-in/page`, params }) + const finalParams = normalizeStockQueryParams(params) + return await request.get({ + url: `/erp/stock-in/page`, + params: finalParams, + paramsSerializer: stockQueryParamsSerializer + }) }, // 查询其它入库单详情 @@ -88,7 +110,12 @@ export const StockInApi = { // 导出其它入库单 Excel exportStockIn: async (params) => { - return await request.download({ url: `/erp/stock-in/export-excel`, params }) + const finalParams = normalizeStockQueryParams(params) + return await request.download({ + url: `/erp/stock-in/export-excel`, + params: finalParams, + paramsSerializer: stockQueryParamsSerializer + }) }, // 查询生产入库单分页 diff --git a/src/api/erp/stock/out/index.ts b/src/api/erp/stock/out/index.ts index cc54ea20..76e2902f 100644 --- a/src/api/erp/stock/out/index.ts +++ b/src/api/erp/stock/out/index.ts @@ -1,4 +1,21 @@ import request from '@/config/axios' +import qs from 'qs' + +const normalizeStockQueryParams = (params: any) => { + if (!params) return params + const nextParams = { ...params } + if (Array.isArray(nextParams.statusList)) { + if (nextParams.statusList.length) { + nextParams.statusList = nextParams.statusList.join(',') + } else { + delete nextParams.statusList + } + } + return nextParams +} + +const stockQueryParamsSerializer = (params: any) => + qs.stringify(params, { allowDots: true, arrayFormat: 'repeat' }) // ERP 其它出库单 VO export interface StockOutVO { @@ -32,7 +49,12 @@ export interface StockOutApproveRecordVO { export const StockOutApi = { // 查询其它出库单分页 getStockOutPage: async (params: any) => { - return await request.get({ url: `/erp/stock-out/page`, params }) + const finalParams = normalizeStockQueryParams(params) + return await request.get({ + url: `/erp/stock-out/page`, + params: finalParams, + paramsSerializer: stockQueryParamsSerializer + }) }, // 查询其它出库单详情 @@ -85,7 +107,12 @@ export const StockOutApi = { // 导出其它出库单 Excel exportStockOut: async (params) => { - return await request.download({ url: `/erp/stock-out/export-excel`, params }) + const finalParams = normalizeStockQueryParams(params) + return await request.download({ + url: `/erp/stock-out/export-excel`, + params: finalParams, + paramsSerializer: stockQueryParamsSerializer + }) }, // 查询其它出库单分页 getMesStockOutPage: async (params: any) => { diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue index f384778c..e8ff9bef 100644 --- a/src/views/erp/stock/in/index.vue +++ b/src/views/erp/stock/in/index.vue @@ -78,11 +78,14 @@ /> - + { /** 重置按钮操作 */ const resetQuery = () => { queryFormRef.value.resetFields() + queryParams.statusList = [] queryParams.inType = activeName.value || stockInTypeOptions.value[0]?.value handleQuery() } diff --git a/src/views/erp/stock/out/index.vue b/src/views/erp/stock/out/index.vue index f98d00b5..5c8e5d24 100644 --- a/src/views/erp/stock/out/index.vue +++ b/src/views/erp/stock/out/index.vue @@ -78,11 +78,14 @@ /> - + { /** 閲嶇疆鎸夐挳鎿嶄綔 */ const resetQuery = () => { queryFormRef.value.resetFields() + queryParams.statusList = [] queryParams.outType = activeName.value || stockOutTypeOptions.value[0]?.value handleQuery() }