From 4b809d4aecd3043963b14e29803245c70d9bb003 Mon Sep 17 00:00:00 2001
From: liuyan <liuyan@prec-tech.com>
Date: 星期五, 25 十一月 2022 11:02:51 +0800
Subject: [PATCH] 【委托】新建修理提示信息(停产及非修理对象品)

---
 force-app/main/default/pages/ChoiceAsset.page |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/pages/ChoiceAsset.page b/force-app/main/default/pages/ChoiceAsset.page
index 1df3939..9a746d1 100644
--- a/force-app/main/default/pages/ChoiceAsset.page
+++ b/force-app/main/default/pages/ChoiceAsset.page
@@ -16,6 +16,7 @@
         //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
         function checkPartSupplyFinishDateJs(){
             var today = new Date();
+            var targetDate = (today.getFullYear()+1) + '/' + (today.getMonth()+1) + '/' + today.getDate();
             var todayNew = today.toLocaleDateString();
             var check;
             var num = 100000;
@@ -29,7 +30,7 @@
                 var partSupplyFinishDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:ConsumableorderdetailsSection:ConsumableorderdetailsTable:' + num + ':partSupplyFinishDate')).value());
                 if (partSupplyFinishDate != 'Invalid Date'){
                     var partSupplyFinishDateNew = partSupplyFinishDate.toLocaleDateString();
-                    if (partSupplyFinishDateNew > todayNew){
+                    if (partSupplyFinishDateNew > todayNew && partSupplyFinishDateNew <= targetDate){
                         alert('棰勮'+ partSupplyFinishDateNew +'闆朵欢鍗冲皢鍋滀骇锛岃閫佷慨鍓嶄笌宸ュ巶鍙奟C鑱旂粶');
                     }
                     if (partSupplyFinishDateNew <= todayNew){
@@ -187,7 +188,7 @@
                                     </td>
                                     <!--XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start -->
                                     <td>
-                                        <apex:inputField value="{!records.ast.PartSupplyFinishDate__c}" id="partSupplyFinishDate" style="display: none" showDatePicker="false"/>
+                                        <apex:inputField value="{!records.ast.NoPartRiskDate_F__c}" id="partSupplyFinishDate" style="display: none" showDatePicker="false"/>
                                     </td>
                                     <!--XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end  -->
                                     

--
Gitblit v1.9.1