diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 6c806f0d1..3a0483446 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -290,6 +290,7 @@ export enum DICT_TYPE { PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型 TT_GLTYPE = 'tt_gltype', //账户类型 REPLY_STATUS = 'reply_status', //询证函回函状态 + PRIORITY = 'priority', //优先级 // ========== 业务 - mes ========== MESDO_STATUS = 'mes_do_status', // 工单执行状态 diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index db8125f6d..00cc8063f 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -62,7 +62,16 @@ @onEnter="onEnter" @onChange="onChange" @clearSearchInput="onChange" - /> + :sumFormDataByTableCustom ="(formRef,formModel,tableData)=>{ + tableData.forEach(item=>{ + item.qty = item.qty1*item.packQty + }) + }" + > + + newRow['uom'] = item['uom'] tableData.value.push(newRow) }) + }else if(formField == 'packUnit'){ + row['packQty'] = val[0]['packQty'] + row[formField] = val[0][searchField] } else { row[formField] = val[0][searchField] } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 74e46ae6e..b02157b91 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -10,7 +10,8 @@ import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/worksta import * as WorkshopApi from '@/api/wms/workshop' import { Workshop } from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data' - +import * as ItempackagingApi from '@/api/wms/itempackage' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import * as ProductionlineitemApi from '@/api/wms/productionlineitem' import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' @@ -301,6 +302,21 @@ export const IssueRequestMain = useCrudSchemas( } } }, + { + label: '优先级', + field: 'priority', + dictType: DICT_TYPE.PRIORITY, + dictClass: 'string', + isSearch: false, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Select' + } + }, { label: '从库区类型范围', field: 'fromAreaTypes', @@ -880,26 +896,124 @@ export const IssueRequestDetail = useCrudSchemas( isForm: false }, { - label: '数量', - field: 'qty', + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装规格', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '物料包装信息', // 查询弹窗标题 + searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 + searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码!', + isMainValue: true + }] + } + // form: { + // // labelMessage: '信息提示说明!!!', + // componentProps: { + // enterSearch:true, + // isSearch:true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装规格', // 输入框占位文本 + // searchField: 'itemCode', // 查询弹窗赋值字段 + // searchTitle: '物料包装信息', // 查询弹窗标题 + // searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 + // searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // },{ + // key: 'itemCode', + // value: 'itemCode', + // message: '请填写物料代码!', + // isMainValue: true + // }], + // verificationParams: [{ + // key: 'packUnit', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + }, + { + label: '标包数', + field: 'packQty', sort: 'custom', table: { width: 150 }, hiddenInMain: true, tableForm: { + disabled:true, type: 'InputNumber', min: 0, - precision: 6 + precision: 0 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 0 + } + } + }, + { + label: '包装数', + field: 'qty1', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 0 }, form: { component: 'InputNumber', componentProps: { min: 0, - precision: 6 + precision: 0 } } }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain: true, + tableForm: { + type: 'slot' + }, + // form: { + // component: 'InputNumber', + // componentProps: { + // min: 0, + // precision: 6 + // } + // } + }, { label: '计量单位', @@ -1170,6 +1284,10 @@ export const IssueRequestDetailRules = reactive({ toLocationCode: [ { required: true, message: '请输入到库位代码', trigger: 'blur' } ], + qty1: [ + { required: true, message: '请输入包装数量', trigger: 'blur' }, + { min: true, message: '包装数量不能小于1', trigger: 'blur' } + ], qty: [ { required: true, message: '请输入数量', trigger: 'blur' } ],