feat:出入库单据-状态默认过滤已出库/已入库状态

besure_bit
黄伟杰 7 days ago
parent bd2e645ab3
commit 1a6b21ea00

@ -1,4 +1,21 @@
import request from '@/config/axios' 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 // ERP 其它入库单 VO
export interface StockInVO { export interface StockInVO {
@ -32,7 +49,12 @@ export interface StockInApproveRecordVO {
export const StockInApi = { export const StockInApi = {
// 查询其它入库单分页 // 查询其它入库单分页
getStockInPage: async (params: any) => { 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 // 导出其它入库单 Excel
exportStockIn: async (params) => { 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
})
}, },
// 查询生产入库单分页 // 查询生产入库单分页

@ -1,4 +1,21 @@
import request from '@/config/axios' 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 // ERP 其它出库单 VO
export interface StockOutVO { export interface StockOutVO {
@ -32,7 +49,12 @@ export interface StockOutApproveRecordVO {
export const StockOutApi = { export const StockOutApi = {
// 查询其它出库单分页 // 查询其它出库单分页
getStockOutPage: async (params: any) => { 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 // 导出其它出库单 Excel
exportStockOut: async (params) => { 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) => { getMesStockOutPage: async (params: any) => {

@ -78,11 +78,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('ErpStock.In.status')" prop="status" v-show="showAllFilters"> <el-form-item :label="t('ErpStock.In.status')" prop="statusList" v-show="showAllFilters">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.statusList"
:placeholder="t('ErpStock.In.placeholderStatus')" :placeholder="t('ErpStock.In.placeholderStatus')"
clearable clearable
multiple
collapse-tags
collapse-tags-tooltip
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
@ -357,7 +360,7 @@ const queryParams = reactive({
productId: undefined, productId: undefined,
supplierId: undefined, supplierId: undefined,
inTime: [], inTime: [],
status: undefined, statusList: [0, 1, 10],
remark: undefined, remark: undefined,
inType: undefined, inType: undefined,
creator: undefined creator: undefined
@ -440,6 +443,7 @@ const handleQuery = () => {
/** 重置按钮操作 */ /** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value.resetFields() queryFormRef.value.resetFields()
queryParams.statusList = []
queryParams.inType = activeName.value || stockInTypeOptions.value[0]?.value queryParams.inType = activeName.value || stockInTypeOptions.value[0]?.value
handleQuery() handleQuery()
} }

@ -78,11 +78,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('ErpStock.Out.status')" prop="status" v-show="showAllFilters"> <el-form-item :label="t('ErpStock.Out.status')" prop="statusList" v-show="showAllFilters">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.statusList"
:placeholder="t('ErpStock.Out.placeholderStatus')" :placeholder="t('ErpStock.Out.placeholderStatus')"
clearable clearable
multiple
collapse-tags
collapse-tags-tooltip
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
@ -355,6 +358,7 @@ const queryParams = reactive({
no: undefined, no: undefined,
productId: undefined, productId: undefined,
outTime: [], outTime: [],
statusList: [0, 1, 10],
remark: undefined, remark: undefined,
outType: undefined, outType: undefined,
creator: undefined creator: undefined
@ -438,6 +442,7 @@ const handleQuery = () => {
/** 閲嶇疆鎸夐挳鎿嶄綔 */ /** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value.resetFields() queryFormRef.value.resetFields()
queryParams.statusList = []
queryParams.outType = activeName.value || stockOutTypeOptions.value[0]?.value queryParams.outType = activeName.value || stockOutTypeOptions.value[0]?.value
handleQuery() handleQuery()
} }

Loading…
Cancel
Save