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/TransferShippmentReceived2.page | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/TransferShippmentReceived2.page b/force-app/main/default/pages/TransferShippmentReceived2.page
index 61450d8..3061aa4 100644
--- a/force-app/main/default/pages/TransferShippmentReceived2.page
+++ b/force-app/main/default/pages/TransferShippmentReceived2.page
@@ -1,4 +1,4 @@
-<apex:page Controller="TransferShippmentReceived2Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="璋冩嫧鍑哄簱鍏ュ簱">
+<apex:page Controller="TransferShippmentReceived2Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="璋冩嫧鍑哄簱鍏ュ簱" lightningStylesheets="true">
<head>
<meta name="format-detection" content="telephone=no"/>
</head>
@@ -273,12 +273,37 @@
</apex:outputPanel>
</li>
<li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
- <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_Inspection_Comment__c.label}锛� </span>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_NG_abord_reason__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
- <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:75px;"/>
+ <span>
+ <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:75px;"/>
+ <script>
+ disabledShowNG();
+ function disabledShowNG() {
+ var inspection_result_NG = '{!esdInfo.rec.Inspection_result_ng__c}';
+ console.log("====",inspection_result_NG)
+ if(inspection_result_NG != '搴熷純'){
+ j$(escapeVfId('allPage:allForm:esdList:' + ('{!indexloop}' - 1) + ':inspectionResultNG2')).prop("disabled", true);
+ }
+ }
+ </script>
+ </span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:75px;"/></span>
+ <span><apex:outputField id="inspectionResultNg3" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:75px;"/></span>
+ </apex:outputPanel>
+ </li>
+ <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_Inspection_Comment__c.label}锛� </span>
+ <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
+ <span>
+ <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/>
+ </span>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
+ <span>
+ <apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/>
+ </span>
</apex:outputPanel>
</li>
<li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
--
Gitblit v1.9.1