From e8b3bf26a7b44629b02f18fe0e7e87de62db16a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 15 Mar 2024 11:45:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E6=96=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callmaterials/callmaterials.data.ts | 147 +++++++++++++++++- .../labelManage/callmaterials/index.vue | 7 +- .../issueRequestMain/issueRequestMain.data.ts | 4 +- 3 files changed, 152 insertions(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 72a53bc6a..d8e3e1f7a 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -8,6 +8,18 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l import * as PackageunitApi from '@/api/wms/packageunit' import { Packageunit } from '@/views/wms/basicDataManage/itemManage/packageunit/packageunit.data' +import * as WarehouseApi from '@/api/wms/warehouse' +import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' + +import * as WorkshopApi from '@/api/wms/workshop' +import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data' + +import * as ProductionlineApi from '@/api/wms/productionline' +import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data' + +import * as WorkStationApi from '@/api/wms/workstation' +import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data' + // 表单校验 export const CallmaterialsRules = reactive({ itemCode: [required], @@ -81,12 +93,22 @@ export const Callmaterials = useCrudSchemas(reactive([ { label: '计量单位', field: 'uom', - sort: 'custom', dictType: DICT_TYPE.UOM, dictClass: 'string', + isTable: true, + sort: 'custom', table: { - width: 120 + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' }, + form: { + componentProps: { + disabled: true + } + } }, { label: '批次', @@ -116,6 +138,126 @@ export const Callmaterials = useCrudSchemas(reactive([ } } }, + { + label: '仓库代码', + field: 'warehouseCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择仓库代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '仓库信息', // 查询弹窗标题 + searchAllSchemas: Warehouse.allSchemas, // 查询弹窗所需类 + searchPage: WarehouseApi.getWarehousePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } + }, + { + label: '车间', + field: 'workshopCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择车间代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 + searchPage: WorkshopApi.getWorkshopPage // 查询弹窗所需分页方法 + } + } + }, + { + label: '生产线', + field: 'productionLineCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择生产线', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '生产线信息', // 查询弹窗标题 + searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类 + searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法 + } + } + }, + { + label: '工位', + field: 'workStationCode', + sort: 'custom', + table: { + width: 150 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择工位', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true + },{ + key:'available', + value:'TRUE', + isMainValue: false + }] + } + }, + tableForm:{ + isInpuFocusShow: true, + searchListPlaceholder: '请选择工位', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkStationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true + },{ + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true + },{ + key:'available', + value:'TRUE', + isMainValue: false + }] + }, + }, { label: '是否确认接收', field: 'isRecive', @@ -123,7 +265,6 @@ export const Callmaterials = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, - sort: 'custom', table: { width: 150 }, diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index ea36ed856..93a27d450 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -82,7 +82,12 @@ const tableColumns = ref(Callmaterials.allSchemas.tableColumns) const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} - setV[formField] = val[0][searchField] + if (formField == 'itemCode') { + setV['itemCode'] = val[0]['code'] + setV['uom'] = val[0]['uom'] + } else { + setV[formField] = val[0][searchField] + } formRef.setValues(setV) }) } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index eaed0a207..d0c63ed67 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -142,7 +142,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isSearch: true, isTable: true, @@ -155,7 +155,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ { label: '到库区类型范围', field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + dictType: DICT_TYPE.AREA_TYPE, dictClass: 'string', isTable: true, sort: 'custom',