From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/ChoiceAsset.page | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/ChoiceAsset.page b/force-app/main/default/pages/ChoiceAsset.page
index 1df3939..0a0eadc 100644
--- a/force-app/main/default/pages/ChoiceAsset.page
+++ b/force-app/main/default/pages/ChoiceAsset.page
@@ -1,4 +1,4 @@
-<apex:page action="{!init}" controller="ChoiceAssetController" id="allPage" showHeader="false" sidebar="false" title="閫夋嫨淇濇湁璁惧">
+<apex:page action="{!init}" controller="ChoiceAssetController" id="allPage" showHeader="false" sidebar="false" title="閫夋嫨淇濇湁璁惧" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"></apex:stylesheet>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"></apex:includeScript>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"></apex:includeScript>
@@ -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