diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 20985c97b..ff3501627 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -135,6 +135,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['outPackUnit'] = val[0]['packUnit'] }else if(formField == 'itemCode') { setV['itemCode'] = val[0]['code'] + }else if(formField == 'repleinshFromArea') { + setV['repleinshFromArea'] = val[0]['code'] }else{ setV[formField] = setV[0][searchField] } diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index 59c7b7997..9e4097441 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -9,10 +9,10 @@ import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMa import * as locationApi from '@/api/wms/location' import { Location } from '../../../basicDataManage/factoryModeling/location/location.data' - +import * as confgiApi from '@/api/infra/config' import * as ItemBasicApi from '@/api/wms/itembasic' import { Itembasic } from '../../../basicDataManage/itemManage/itembasic/itembasic.data' - +import * as WorkstationApi from '@/api/wms/workstation' const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 @@ -23,10 +23,9 @@ const queryParams = { } const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData =data?.list[0]||{} - + const confgiDataOne = await confgiApi.queryByKey("Stockup-areaType") // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' -import { ItemBasic } from '@/utils/disposition/formFields' const userStore = useUserStore() const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 @@ -679,11 +678,16 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ searchField: 'location', searchTitle: '库位基础信息', searchAllSchemas: Location.allSchemas, - searchPage: locationApi.getLocationPage, + searchPage: WorkstationApi.selectAreaTypeToLocation, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'areaType', + value: confgiDataOne.areaType, + isMainValue: false }] }, form: { @@ -693,11 +697,16 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ searchField: 'location', searchTitle: '库位基础信息', searchAllSchemas: Location.allSchemas, - searchPage: locationApi.getLocationPage, + searchPage: WorkstationApi.selectAreaTypeToLocation, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'areaType', + value: confgiDataOne.areaType, + isMainValue: false }] } }