From e1488f2993ebb8b0789c8713c8452134bbcb1e72 Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Fri, 29 Nov 2024 19:47:04 +0800
Subject: [PATCH] =?UTF-8?q?YT-1404=EF=BC=9A=E5=BA=93=E5=AD=98=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=EF=BC=8C=E6=89=B9=E6=AC=A1=E2=80=94=E2=80=94=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E8=AE=B0=E5=BD=95=E7=9A=84=E5=88=B0=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C=E4=B8=8E=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=9A=84=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMainMOVE/index.vue    | 11 ++++---
 .../inventorymoveRequestMain.data.ts          | 32 +++++++++----------
 .../invoicingcalendar/index.vue               |  4 +--
 3 files changed, 25 insertions(+), 22 deletions(-)

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<CrudSchema[]>(
       }
     },
   },
-  {
-    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;
     }