From 5abfba40573cca31673814f47319382099e2599c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Sat, 31 Aug 2024 13:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=BC=BA--=E8=A7=A3=E5=86=B3=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8A=E5=8F=91=E7=89=88=E9=97=AE=E9=A2=98--=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E5=8E=BB=E9=99=A4=E6=97=A5=E6=9C=9F=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E5=80=BC=E5=92=8C=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=80=BC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverBasicForm.vue              | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 6aa797d93..c06b073d3 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -323,21 +323,21 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  let flag = true
-  let currentTime = dayjs().valueOf()
-  tableData.value.forEach(item=>{
-    if(item['minProduceDate']&&item['produceDate']<item['minProduceDate']){
-      flag = false
-      message.error(`${item['itemCode']}${t('ts.生产日期不能小于')}${formatDate(item['minProduceDate'],'YYYY-MM-DD')}`)
-    }
-    if(item['produceDate']>currentTime){
-      flag = false
-      message.error(`${item['itemCode']}${t('ts.生产日期不能大于当前系统日期')}`)
-    }
-  })
-  if(!flag){
-    return
-  }
+  // let flag = true
+  // let currentTime = dayjs().valueOf()
+  // tableData.value.forEach(item=>{
+  //   if(item['minProduceDate']&&item['produceDate']<item['minProduceDate']){
+  //     flag = false
+  //     message.error(`${item['itemCode']}${t('ts.生产日期不能小于')}${formatDate(item['minProduceDate'],'YYYY-MM-DD')}`)
+  //   }
+  //   if(item['produceDate']>currentTime){
+  //     flag = false
+  //     message.error(`${item['itemCode']}${t('ts.生产日期不能大于当前系统日期')}`)
+  //   }
+  // })
+  // if(!flag){
+  //   return
+  // }
   data.subList = tableData.value // 拼接子表数据参数
   let isHave = data.subList.some((item) => {
     console.log("CCCCC",item.expireDate)
@@ -434,17 +434,17 @@ const inputNumberChange = (field, val,row, index) => {
 const formFormDateChange = (field, val,row, index) => {
   console.log('formFormDateChange',field, val,row, index)
   if(field == 'produceDate'){
-    if(row['minProduceDate']&&val<row['minProduceDate']){
-      message.error(`${row['itemCode']}${t('ts.生产日期不能小于')}${formatDate(row['minProduceDate'],'YYYY-MM-DD')}`)
-      // row['produceDate'] = row['minProduceDate']
-    }
+    // if(row['minProduceDate']&&val<row['minProduceDate']){
+    //   message.error(`${row['itemCode']}${t('ts.生产日期不能小于')}${formatDate(row['minProduceDate'],'YYYY-MM-DD')}`)
+    //   // row['produceDate'] = row['minProduceDate']
+    // }
 
-    let currentTime = dayjs().valueOf()
-    if(val>currentTime){
-      val = currentTime
-      message.error(`${row['itemCode']}${t('ts.生产日期不能大于当前系统日期')}`)
-      // row['produceDate'] = currentTime
-    }
+    // let currentTime = dayjs().valueOf()
+    // if(val>currentTime){
+    //   val = currentTime
+    //   message.error(`${row['itemCode']}${t('ts.生产日期不能大于当前系统日期')}`)
+    //   // row['produceDate'] = currentTime
+    // }
     let produceDateStr = formatDate(val,'YYYYMMDD');
     row.batch = produceDateStr
     row.supplierBatch = produceDateStr