From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/pages/PCLLostReportPage.page | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/PCLLostReportPage.page b/force-app/main/default/pages/PCLLostReportPage.page
index ca99f26..bb3d375 100644
--- a/force-app/main/default/pages/PCLLostReportPage.page
+++ b/force-app/main/default/pages/PCLLostReportPage.page
@@ -1,6 +1,9 @@
<apex:page standardcontroller="Lost_cancel_report__c" extensions="PCLLostReportController" showHeader="false" sidebar="false"
- id="allPage" action="{!init}" title="璇环澶卞崟/鍙栨秷鎶ュ憡">
+ id="allPage" action="{!init}" title="璇环澶卞崟/鍙栨秷鎶ュ憡" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
+
+ <!-- <apex:stylesheet value="{!URLFOR($Resource.PCLLostReportPagecss)}" /> -->
+
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
<apex:form id="allForm">
@@ -78,9 +81,9 @@
// 澶卞崟鍝佺墝涓嶇瓑浜庡叾浠栨椂,澶卞崟鍝佺墝锛堟墜鍔級娓呯┖骞朵笖涓嶅厑璁稿～鍐�,澶卞崟鍝佺墝绛変簬鍏朵粬鏃�,澶卞崟瀵规墜鍨嬪彿涓嶅彲鐢� thh 2022-01-13 start
function clearBrandMannualName(){
if(document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_CompanyOut:Lost_By_Company').value == '鍏朵粬'){
- document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual').value = '';
j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:productTable:0:LostProduct')).attr("disabled", true);
} else{
+ document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual').value = '';
j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual')).attr("disabled", true);
}
}
@@ -173,7 +176,13 @@
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem id="Lost_By_Company_MannualOut" dataStyle="width:10%;border-top:2px solid;border-left:2px solid;border-bottom:2px solid;border-right:2px solid;"
labelStyle="width:23%;text-align:left;border-top:2px solid ;border-left:2px solid;border-bottom:2px solid;">
- <apex:outputLabel value="澶卞崟鍝佺墝锛堟墜鍔級:"> </apex:outputLabel>
+ <apex:outputLabel value="澶卞崟鍝佺墝锛堟墜鍔級:">
+ <!-- fy SWAG-CCC6F6 start-->
+ <apex:variable value="identif" var="identif" rendered="{!IF(brand.lostBrand.Lost_By_Company__c == '鍏朵粬', true, false)}" id="identifier2">
+ <span style="color:red;font-size: 18px;">* </span>
+ </apex:variable>
+ <!-- fy SWAG-CCC6F6 end-->
+ </apex:outputLabel>
<apex:inputField id="Lost_By_Company_Mannual" value="{!brand.lostBrand.Lost_By_Company_Mannual__c}" onchange="setBrandMannualName({!brand.lineNo});"/>
</apex:pageBlockSectionItem>
--
Gitblit v1.9.1