From 038658d9bbd429b06f036a0887593461d9a72a10 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 23 Nov 2024 18:31:46 +0800
Subject: [PATCH] =?UTF-8?q?YT-1135PDA=E7=9B=B4=E6=8E=A5=E9=9A=94=E7=A6=BB?=
 =?UTF-8?q?=E8=BD=AC=E5=90=88=E6=A0=BC=E9=9C=80=E6=B1=82=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=A1=AB=E5=86=99=E7=89=A9=E6=96=99=E5=92=8C=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E4=BD=86=E5=BA=93=E5=8C=BA=E6=98=AF=E6=8C=89?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=AE=A1=E7=90=86=EF=BC=8C=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E4=B8=AD=E6=89=B9=E6=AC=A1=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA,=E7=9B=AE=E5=89=8D=E6=9C=89=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreturnRequestMain/index.vue       | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 0109881cd..1549da33a 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
@@ -266,13 +266,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         }).then((res) => {
           fromManagementPrecision.value = res[0].ManagementPrecision
         })
-        // if (fromManagementPrecision.value == 'BY_QUANTITY') {
-        //   newRow['batchFormItemType'] = 'FormDate'
-        //   newRow['disabled_batch'] = false
-        // } else {
-        //   newRow['batchFormItemType'] = ''
-        //   newRow['disabled_batch'] = true
-        // }
+        if (fromManagementPrecision.value == 'BY_QUANTITY') {
+          newRow['batchFormItemType'] = 'FormDate'
+          newRow['disabled_batch'] = false
+          newRow['batch'] = formatDate(new Date(),'YYYYMMDD')
+        } else {
+          newRow['batchFormItemType'] = ''
+          newRow['disabled_batch'] = true
+        }
 
           if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])){
             messageItemCodes.push(item['itemCode'])
@@ -902,7 +903,7 @@ const handlePoint = async (row) => {
 const searchTableRef = ref()
 const labelPrint = async (row) => {
   tableObject.loading = true
-  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number}
+  const defaultParams = {'moduleName':'productreceipt_predict','recordNumber':row.number,batch:row.batch}
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,
     getListApi: PackageApi.getLabelDetailPage  // 分页接口