diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index 5cd26d295..0309cf776 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -341,11 +341,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => toManagementPrecision.value = res[0].ManagementPrecision }) if (toManagementPrecision.value == 'BY_BATCH') { - row['toBatchFormItemType'] = 'FormDate' - row['disabled_toBatch'] = false + if(row['fromBatch']==''){ + row['fromBatchFormItemType'] = 'FormDate' + row['disabled_fromBatch'] = false + } + } else if (toManagementPrecision.value == 'BY_QUANTITY') { - row['toBatchFormItemType'] = '' - row['disabled_toBatch'] = true + //row['fromBatchFormItemType'] = '' + row['disabled_fromBatch'] = true } } else { row[formField] = val[0][searchField] diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index 5d000afc4..caf3af137 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -588,22 +588,22 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, }, - { - label: '到批次', - field: 'toBatch', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: true, - isForm: false, - tableForm: { - disabled: true, - placeholder: '请选择从批次', - valueFormat: 'YYYYMMDD', - format: 'YYYYMMDD', - }, - }, + // { + // label: '到批次', + // field: 'toBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: true, + // isForm: false, + // tableForm: { + // disabled: true, + // placeholder: '请选择从批次', + // valueFormat: 'YYYYMMDD', + // format: 'YYYYMMDD', + // }, + // }, { label: '从包装号', field: 'fromPackingNumber', diff --git a/src/views/wms/supplierManage/invoicingcalendar/index.vue b/src/views/wms/supplierManage/invoicingcalendar/index.vue index 700eeb1b5..f02f1abb0 100644 --- a/src/views/wms/supplierManage/invoicingcalendar/index.vue +++ b/src/views/wms/supplierManage/invoicingcalendar/index.vue @@ -168,14 +168,14 @@ const formsSuccess = async (formType,data) => { if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; if (formType === 'create') { - if(data.beginDay > data.endDay){ + if(parseFloat(data.beginDay) > parseFloat(data.endDay)){ message.error('开始日期要小于截止日期') return; } await InvoicingcalendarApi.createInvoicingcalendar(data) message.success(t('common.createSuccess')) } else { - if(data.beginDay > data.endDay){ + if(parseFloat(data.beginDay) > parseFloat(data.endDay)){ message.error('开始日期要小于截止日期') return; }