diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index 96151f4ec..406313909 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -206,33 +206,6 @@ const formsSuccess = async (formType,data) => { getList() } -// 修改 tableform 属性 -Workstation.allSchemas.tableFormColumns.map(item => { - if(item.field == 'rawLocationCode') { - item.form.componentProps.searchCondition = [ - { - key: 'areaType', - value: 'WIP', - }, - { - key: 'available', - value: 'TRUE', - } - ] - } - if(item.field == 'fgLocationCode') { - item.form.componentProps.searchCondition = [ - { - key: 'areaType', - value: 'WIP', - }, - { - key: 'available', - value: 'TRUE', - } - ] - } - }) // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index bf6753484..6c6b6ee73 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -10,15 +10,20 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod import * as WorkshopApi from '@/api/wms/workshop' import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data' +import * as getBusinesstypeApi from '@/api/wms/businesstype/index' import * as WorkstationApi from '@/api/wms/workstation' import { validateYS } from '@/utils/validator' -import {Team} from "@/views/wms/basicDataManage/orderManage/team/team.data"; -import * as TeamApi from "@/api/wms/team"; +const queryParams = { + pageSize:10, + pageNo:1, + code:'WorkStation' +} const { t } = useI18n() // 国际化 - +const data = await getBusinesstypeApi.getBusinesstypePage(queryParams) +const businesstypeData =data?.list[0]||{} /** * @returns {Array} 工位 */ @@ -125,6 +130,16 @@ export const Workstation = useCrudSchemas(reactive([ searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'areaType', + value: businesstypeData.outAreaTypes, + isMainValue: false + }] } } }, @@ -144,6 +159,16 @@ export const Workstation = useCrudSchemas(reactive([ searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'areaType', + value: businesstypeData.outAreaTypes, + isMainValue: false + }] } } },