diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index a84c7e501..5cd26d295 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -340,12 +340,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }).then((res) => { toManagementPrecision.value = res[0].ManagementPrecision }) - if (fromManagementPrecision.value == 'BY_QUANTITY' && toManagementPrecision.value == 'BY_BATCH') { - row['fromBatchFormItemType'] = 'FormDate' - row['disabled_fromBatch'] = false - } else { - row['fromBatchFormItemType'] = '' - row['disabled_fromBatch'] = true + if (toManagementPrecision.value == 'BY_BATCH') { + row['toBatchFormItemType'] = 'FormDate' + row['disabled_toBatch'] = false + } else if (toManagementPrecision.value == 'BY_QUANTITY') { + row['toBatchFormItemType'] = '' + row['disabled_toBatch'] = true } } else { row[formField] = val[0][searchField] @@ -701,10 +701,10 @@ const submitForm = async (formType, submitData) => { message.warning('从库位和到库位不能相同') return } - let batchList = tableData.value.filter(item=>item.fromBatchFormItemType&&item.fromBatchFormItemType == 'FormDate') - let noBatch = batchList.some(item => !item.fromBatch) + let batchList = tableData.value.filter(item=>item.toBatchFormItemType&&item.toBatchFormItemType == 'FormDate') + let noBatch = batchList.some(item => !item.toBatch) if(noBatch){ - message.warning('请选择从批次') + message.warning('请选择到批次') return } data.subList = tableData.value // 拼接子表数据参数 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index e24af8017..5d000afc4 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -561,33 +561,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false, }, - { - label: '生产日期', - field: 'produceDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - sortTableDefault:7, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'date', - format: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, - tableForm: { - type: 'FormDate', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x', - } - }, + { label: '从批次', field: 'fromBatch', @@ -595,7 +569,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTable:false, + isTable:true, tableForm: { disabled: true, placeholder: '请选择从批次', @@ -621,8 +595,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - isTableForm: false, + isTableForm: true, isForm: false, + tableForm: { + disabled: true, + placeholder: '请选择从批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, }, { label: '从包装号',