From fb70b898d14b044d7f4583b412854a29180ccd34 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 28 Nov 2024 16:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productreceiptRequestMain/index.vue           | 12 ++++++------
 .../productreceiptRequestMain.data.ts             |  3 ++-
 .../productreceiptAssembleRequestMain/index.vue   | 15 +++++++++++++++
 .../productreceiptAssembleRequestMain.data.ts     | 13 ++++++++++---
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index b298c5ab3..483e8fb4f 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -624,19 +624,19 @@ const buttonTableClick = async (val, row) => {
           return
         }
       })
-      ruleApi.getManagementPrecision({
+       ruleApi.getManagementPrecision({
         	itemCodes: [item['itemCode']],
 		      locationCode: item.toLocationCode
         }).then((res) => {
           toManagementPrecision.value = res[0].ManagementPrecision
-        })
-        if ( toManagementPrecision.value == 'BY_BATCH') {
+          if ( toManagementPrecision.value == 'BY_BATCH') {
           // row['fromBatchFormItemType'] = 'FormDate'
-          row['disabled_batch'] = false
-        } else {
+          item['disabled_batch'] = true
+        } else if(toManagementPrecision.value == 'BY_QUANTITY') {
           // row['fromBatchFormItemType'] = ''
-          row['disabled_batch'] = true
+            item['disabled_batch'] = false
         }
+     })  
     })
   } else if (val == 'mainHandle') {
     // 处理
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index f9eb22309..4c5369f59 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -1728,6 +1728,7 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       disabled: true,
+      type: 'FormDate',
       placeholder: '请选择从批次',
       valueFormat: 'YYYYMMDD',
       format: 'YYYYMMDD',
@@ -2136,7 +2137,7 @@ export const ProductreceiptRequestLabelRules = reactive({
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
   batch: [
-    { required: true, message: '请选择生产线', trigger: ['change','blur'] }
+    { required: true, message: '请选择批次', trigger: ['change','blur'] }
   ],
 })
 
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 986198d9c..76245e6a2 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -155,6 +155,7 @@ import { formatDate } from '@/utils/formatTime'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ConfigApi from '@/api/infra/config'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import * as ruleApi  from '@/api/wms/rule/index'
 const { loadStart, loadDone } = usePageLoading()
 // 装配收货申请
 // 号口品收货申请
@@ -381,6 +382,7 @@ const butttondata = (row,$index) => {
 
 
 // 列表-操作按钮事件
+const toManagementPrecision = ref('')
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
@@ -505,6 +507,19 @@ const buttonTableClick = async (val, row) => {
           return
         }
       })
+      ruleApi.getManagementPrecision({
+        	itemCodes: [item['itemCode']],
+		      locationCode: item.toLocationCode
+        }).then((res) => {
+          toManagementPrecision.value = res[0].ManagementPrecision
+          if ( toManagementPrecision.value == 'BY_BATCH') {
+          // row['fromBatchFormItemType'] = 'FormDate'
+          item['disabled_batch'] = true
+        } else if(toManagementPrecision.value == 'BY_QUANTITY') {
+          // row['fromBatchFormItemType'] = ''
+            item['disabled_batch'] = false
+        }
+     })  
     })
 
   } else if (val == 'mainHandle') { // 处理
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index 71beecd5b..9a7df4d64 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -1732,8 +1732,12 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled:true
-    }
+      disabled: true,
+      type:'FormDate',
+      placeholder: '请选择从批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
   },
   {
     label: '数量',
@@ -2090,6 +2094,9 @@ export const ProductreceiptRequestLabelRules = reactive({
   ],
   productionLineCodePackage: [
     { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
+  ],
+  batch: [
+    { required: true, message: '请选择批次', trigger: ['change', 'blur'] }
+  ],
 })