diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue index 616377da4..b49fba76e 100644 --- a/src/views/wms/basicDataManage/subject/mstr/index.vue +++ b/src/views/wms/basicDataManage/subject/mstr/index.vue @@ -68,6 +68,7 @@ import Detail from '@/components/Detail/src/Detail.vue' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() +// 产品类 defineOptions({ name: 'Mstr' }) const message = useMessage() // 消息弹窗 diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index f315502ab..2e77791d8 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -475,6 +475,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchCondition: [{ key: 'businessType', value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false }] }, form: { @@ -489,6 +494,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchCondition: [{ key: 'businessType', value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false }] } } diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts index 006fc1ecf..3acc8dc13 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts @@ -4,6 +4,7 @@ import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' +import * as getBusinessTypeApi from '@/api/wms/businesstype/index' import { TableColumn } from '@/types/table' @@ -18,6 +19,7 @@ const queryParams = { const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData =data?.list[0]||{} + // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() @@ -26,6 +28,14 @@ const userDept = userStore.userSelfInfo.dept userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] +const businessTypeQueryParams = { + pageSize:10, + pageNo:1, + code:'ProductPutaway' +} +const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) +const businessTypeData =businessTypeValue?.list[0]||{} + /** * @returns {Array} 制品上架申请主表 */ @@ -463,7 +473,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false + }] }, form: { // labelMessage: '信息提示说明!!!', @@ -473,7 +492,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法 + searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'businessType', + value: businessTypeData.code, + }, + { + key: 'inOrOut', + value: 'out', + isMainValue: false + }] } } },