From ea92614562147327a1c257f4422781631f07ee94 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 29 Nov 2024 14:34:37 +0800
Subject: [PATCH] =?UTF-8?q?YT-1374=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=AE=A1=E7=90=86=E7=B2=BE=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E9=87=8F=E2=80=94=E2=80=94=E6=89=B9=E6=AC=A1?=
 =?UTF-8?q?=EF=BC=8C=E6=95=B0=E9=87=8F=E2=80=94=E2=80=94=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=B8=8D=E9=80=89=E6=8B=A9=E4=BB=8E?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BB=8E=E6=89=B9=E6=AC=A1=EF=BC=9B=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=BB=8E=E6=89=B9=E6=AC=A1=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=B2=A1=E6=9C=89=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventorymoveRequestMainMOVE/index.vue    | 18 ++++-----
 .../inventorymoveRequestMain.data.ts          | 38 +++++--------------
 2 files changed, 18 insertions(+), 38 deletions(-)

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<CrudSchema[]>(
     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<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
     tableForm: {
       disabled: true,
       placeholder: '请选择从批次',
@@ -621,8 +595,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTableForm: false,
+    isTableForm: true,
     isForm: false,
+    tableForm: {
+      disabled: true,
+      placeholder: '请选择从批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
   },
   {
     label: '从包装号',