diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 09fbd3265..708d34c38 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -57,6 +57,7 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + @clearInput="clearInput" /> @@ -124,23 +125,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromAreaCode'] = item['areaCode'] newRow['toAreaCode'] = item['areaCode'] newRow['inventoryStatus'] = item['inventoryStatus'] - newRow['fromPackUnit'] = item['packUnit'] + // newRow['fromPackUnit'] = item['packUnit'] newRow['fromPackQty'] = item['packQty'] tableData.value.push(newRow) }) } else if (formField == 'toPackUnit') { row['toPackUnit'] = val[0]['packUnit'] - row['toPackQty'] = val[0]['packQty'] + row['fromPackUnit'] = val[0]['packUnit'] + row['toPackQty'] = 0 } else { row[formField] = val[0][searchField] } } else { const setV = {} setV[formField] = val[0][searchField] - if (formField == 'fromWarehouseCode') { - setV['fromWarehouseCode'] = val[0]['code'] - setV['toWarehouseCode'] = val[0]['code'] + if (formField == 'fromLocationCode') { + setV['toLocationCode'] = val[0]['code'] } formRef.setValues(setV) } @@ -403,13 +404,17 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 - if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) { - message.warning('从包装规格与到包装规格不能相同') - return - } + // if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) { + // message.warning('从包装规格与到包装规格不能相同') + // return + // } if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') return + } + if(tableData.value.find(item => (item.toPackQty <= 0))) { + message.warning('到标包数量必须大于0') + return } formRef.value.formLoading = true try { @@ -477,7 +482,11 @@ const searchFormClick = (searchData) => { } getList() // 刷新当前列表 } - +const clearInput = (field, row, index) => { + if (field == 'toPackUnit') { + row.fromPackUnit = '' + } +} /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index cce3ba989..92e073cff 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -620,13 +620,15 @@ export const PackageoverRequestDetail = useCrudSchemas( tableForm: { type: 'InputNumber', min: 0, - precision: 6 + precision: 6, + disabled:true }, form: { component: 'InputNumber', componentProps: { min: 0, - precision: 6 + precision: 6, + disabled: true } } }, @@ -659,7 +661,8 @@ export const PackageoverRequestDetail = useCrudSchemas( width: 120 }, tableForm: { - enterSearch: true, + disabled:true, + enterSearch: false, isInpuFocusShow: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装规格', // 输入框占位文本 @@ -694,7 +697,8 @@ export const PackageoverRequestDetail = useCrudSchemas( form: { // labelMessage: '信息提示说明!!!', componentProps: { - isSearchList: true, // 开启查询弹窗 + disabled: true, + isSearchList: false, // 开启查询弹窗 searchListPlaceholder: '请选择包装规格', // 输入框占位文本 searchField: 'packUnit', // 查询弹窗赋值字段 searchTitle: '物料包装信息', // 查询弹窗标题 @@ -828,11 +832,13 @@ export const PackageoverRequestDetail = useCrudSchemas( width: 120 }, tableForm: { - disabled: true + // disabled: true + type:'InputNumber' }, form: { + component:'InputNumber', componentProps: { - disabled: true + // disabled: true } } }, @@ -1020,5 +1026,6 @@ export const PackageoverRequestDetail = useCrudSchemas( export const PackageoverRequestDetailRules = reactive({ itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }], fromPackUnit: [{ required: true, message: '请选择从包装规格', trigger: 'change' }], - toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }] + toPackUnit: [{ required: true, message: '请选择到包装规格', trigger: 'change' }], + toPackQty: [{ required: true, message: '请输入到标包数量', trigger: ['change','blur'] }], })