diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 8755f5c6e..57bdadce7 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -283,6 +283,7 @@ export enum DICT_TYPE { CONTAINER_STATUS = 'container_status', // 容器状态 PREDICT_TIME_TYPE = 'predict_time_type', // 预测时间类型 PACK_UNIT_TYPE = 'pack_unit_type', // 包装规格类型 + PACK_DATA_SOURCE = 'pack_data_source', // 物料包装数据来源 TRANSFER_REASON = 'transfer_reason', // 调拨出入库原因 PURCHASERECEIPT_SOURCE_TYPE = 'purchasereceipt_source_type', //采购收货数据来源 PLAN_PRODUCTION_TYPE = 'plan_production_type', // 生产计划类型 diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 6037ec1dc..358c4d3ef 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -357,6 +357,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { const setV = {} setV[formField] = val[0][searchField] if('itemCode'==formField){ + setV['itemName'] = val[0]['name'] setV['uom'] = val[0]['uom'] } if('packUnit'==formField){ diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index 2fed930a9..e9004c76c 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -46,6 +46,24 @@ export const Itempackaging = useCrudSchemas(reactive([ } } }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + isSearch: false, + table: { + width: 120 + }, + form: { + componentProps: { + disabled: true + } + }, + isTable:true, + isTableForm:true, + isForm:true, + isDetail:true + }, { label: '计量单位', field: 'uom', @@ -56,7 +74,8 @@ export const Itempackaging = useCrudSchemas(reactive([ isTable: true, table: { width: 120 - },form: { + }, + form: { // labelMessage: '信息提示说明!!!', componentProps: { disabled: true @@ -231,10 +250,25 @@ export const Itempackaging = useCrudSchemas(reactive([ field: 'dataSource', sort: 'custom', isForm:false, + dictType: DICT_TYPE.PACK_DATA_SOURCE, + dictClass: 'string', table: { width: 180 }, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + table: { + width: 120 + }, + isTable:true, + isTableForm:true, + isForm:true, + isDetail:true + }, { label: '创建时间', field: 'createTime',