diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 18bc18ec8..06ffa0745 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -286,10 +286,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['origin_fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] - newRow['packUnit'] = item['packUnit'] - newRow['packQty'] = item['packQty'] + newRow['packUnit'] = '' + newRow['packQty'] = '' tableData.value.push(newRow) }) + }else if(formField == 'packUnit'){ + //包装规格 + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts index fe9a5671b..249bdd9ca 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts @@ -7,6 +7,8 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import * as ItempackagingApi from '@/api/wms/itempackage' +import { Itempackaging } from '@//views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import * as WarehouseApi from '@/api/wms/warehouse' import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data' @@ -285,6 +287,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTableForm:false, tableForm: { disabled: true }, @@ -301,7 +304,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: true, + isTableForm:false, isForm: false, }, { @@ -331,8 +334,43 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, + isTableForm: true, isForm: false, + tableForm:{ + multiple:false, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', + searchField: 'packUnit', + searchTitle: '物料包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackagingApi.getItempackagingPageTree, + searchCondition: [{ + key:'itemCode', // 查询列表中字段 + value:'itemCode', // 指主表某字段 + message: '请选择物料代码!', // 当前置条件为空时 弹出信息提示 + isMainValue: true, // 表示查询条件是主表的字段的值 + action: '==', // 查询拼接条件 + }] + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + disabled: true, + isSearchList: false, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', + searchField: 'packUnit', + searchTitle: '物料包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackagingApi.getItempackagingPageTree, + searchCondition: [{ + key:'itemCode', // 查询列表中字段 + value:'itemCode', // 指主表某字段 + message: '请选择物料代码!', // 当前置条件为空时 弹出信息提示 + isMainValue: true, // 表示查询条件是主表的字段的值 + action: '==', // 查询拼接条件 + }] + } + } }, { label: '包装数量', @@ -341,7 +379,10 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, + tableForm:{ + disabled:true + }, + isTableForm: true, isForm: false, }, {