From 01f207d979d6be17c8cdec293feab48828c0ec3e Mon Sep 17 00:00:00 2001 From: 黄千龙 <huangqianlong@prec-tech.com> Date: 星期五, 08 四月 2022 14:22:52 +0800 Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG --- force-app/main/default/pages/TransferShippmentReceived2.page | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/force-app/main/default/pages/TransferShippmentReceived2.page b/force-app/main/default/pages/TransferShippmentReceived2.page index 61450d8..a8de9d3 100644 --- a/force-app/main/default/pages/TransferShippmentReceived2.page +++ b/force-app/main/default/pages/TransferShippmentReceived2.page @@ -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