diff --git a/src/api/wms/inventoryDetails/types.ts b/src/api/wms/inventoryDetails/types.ts index c633202..dc9886c 100644 --- a/src/api/wms/inventoryDetails/types.ts +++ b/src/api/wms/inventoryDetails/types.ts @@ -111,12 +111,14 @@ export interface InventoryDetailsQuery extends PageQuery { */ locationCode?: string; productCode?: string; + externalBrand?: string; productName?: string; /** * 仓库ID */ warehouseId?: string | number; + projectId?: string | number; /** * 物料ID diff --git a/src/api/wms/outStockBill/index.ts b/src/api/wms/outStockBill/index.ts index 4197891..15174d4 100644 --- a/src/api/wms/outStockBill/index.ts +++ b/src/api/wms/outStockBill/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; -import {AxiosPromise} from 'axios'; -import {OutStockBillForm, OutStockBillQuery, OutStockBillVO} from '@/api/wms/outStockBill/types'; +import { AxiosPromise } from 'axios'; +import { OutStockBillForm, OutStockBillQuery, OutStockBillVO } from '@/api/wms/outStockBill/types'; /** * 查询出库单列表 @@ -83,3 +83,15 @@ export function getWmsOutStockBillList(query) { params: query }); } +/** + * 修改出库单关联项目 + * @param query + * @returns {*} + */ +export function updateOutStockBillProject(query) { + return request({ + url: '/wms/outStockBill/updateOutStockBillProject', + method: 'get', + params: query + }); +} diff --git a/src/api/wms/outStockDetails/types.ts b/src/api/wms/outStockDetails/types.ts index 1d2e9dc..d60636a 100644 --- a/src/api/wms/outStockDetails/types.ts +++ b/src/api/wms/outStockDetails/types.ts @@ -33,6 +33,7 @@ export interface OutStockDetailsVO { * 出库数量 */ outStockAmount: number; + inventoryAmount: number; /** * 单位 @@ -93,7 +94,6 @@ export interface OutStockDetailsVO { * 库存ID */ inventoryDetailsId: string | number; - } export interface OutStockDetailsForm extends BaseEntity { @@ -106,7 +106,7 @@ export interface OutStockDetailsForm extends BaseEntity { * 仓库ID */ warehouseId?: string | number; - + inventoryAmount: number; /** * 物料ID */ @@ -156,11 +156,9 @@ export interface OutStockDetailsForm extends BaseEntity { * 库存ID */ inventoryDetailsId?: string | number; - } export interface OutStockDetailsQuery extends PageQuery { - /** * 仓库ID */ @@ -191,6 +189,3 @@ export interface OutStockDetailsQuery extends PageQuery { */ params?: any; } - - - diff --git a/src/components/WmsInventorySelect/index.vue b/src/components/WmsInventorySelect/index.vue index df31b83..b3df78a 100644 --- a/src/components/WmsInventorySelect/index.vue +++ b/src/components/WmsInventorySelect/index.vue @@ -7,13 +7,6 @@
- - - - - - - + + + + + + + + + + + + + + + - 搜索 + 搜索 重置 @@ -55,21 +68,20 @@ border show-overflow :data="inventoryDetailsList" - :loading="loading" :row-config="{ keyField: 'inventoryDetailsId', isHover: true }" :checkbox-config="{ reserve: true, trigger: 'row', highlight: true, showHeader: prop.multiple }" @checkbox-all="handleCheckboxAll" @checkbox-change="handleCheckboxChange" > - + - + - + { } }; +// 项目列表 +const projectInfoList = ref([]); +/** 查询项目列表 */ +const getProjectInfoList = async () => { + try { + const res = await getErpProjectInfoList(null); + projectInfoList.value = res.data || []; + } catch (error) { + console.error('查询项目列表失败:', error); + } +}; const pageList = async () => { await getList(); const inventories = inventoryDetailsList.value.filter((item) => { @@ -285,6 +309,7 @@ watch( await getList(); await getWarehouseList(); await initSelectInventory(); + await getProjectInfoList(); } else { tableRef.value?.clearCheckboxReserve(); tableRef.value?.clearCheckboxRow(); diff --git a/src/views/wms/outStockBill/index.vue b/src/views/wms/outStockBill/index.vue index 2f05022..06a2579 100644 --- a/src/views/wms/outStockBill/index.vue +++ b/src/views/wms/outStockBill/index.vue @@ -32,11 +32,11 @@ - - - - - + + + + + {{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }} - +