From 6787b94f4811d3bbdbd4fe8ddc874bf7f05f4ced Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 28 Aug 2024 16:26:31 +0800
Subject: [PATCH] =?UTF-8?q?HL-5724SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=A1=AB=E5=86=99=E7=9A=84=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E6=97=A5=E6=9C=9F=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=B3=BB=E7=BB=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                           |  1 +
 src/locales/zh-CN.ts                           |  1 +
 .../supplierdeliverBasicForm.vue               | 18 +++++++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 793259dc4..2ffdbba5d 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1284,6 +1284,7 @@ export default {
     '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity',
     撤销报工成功:'Revocation of work report successful',
     生产日期不能小于:'The date of production cannot be less than',
+    生产日期不能大于当前系统日期:'The production date cannot be greater than the current system date',
     发票回转:'Return of invoice',
     发票回转成功:'The invoice has been successfully forwarded'
   },
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 30d9d58c2..9d42231a1 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1280,6 +1280,7 @@ export default {
     '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量',
     撤销报工成功:'撤销报工成功',
     生产日期不能小于:'生产日期不能小于',
+    生产日期不能大于当前系统日期:'生产日期不能大于当前系统日期',
     发票回转:'发票回转',
     发票回转成功:'发票回转成功'
   },
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 6e1efa992..28fe2369e 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -322,10 +322,15 @@ const submitForm = async (formType, submitData) => {
     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'],'YYYYMMDD')}`)
+      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){
@@ -428,8 +433,15 @@ 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'],'YYYYMMDD')}`)
-      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 produceDateStr = formatDate(val,'YYYYMMDD');
     row.batch = produceDateStr