【委托】 【phase5上线课题56】-增加回收后NG废弃理由上线文件更新

sunxia

2022-03-29 1a7367c38242644640b0abcb4f9773ed32d4b450

 force-app/main/default/pages/EquipmentSetShippmentReceived2.page

@@ -295,7 +295,7 @@
                            <span>发货前-检测结果： </span> 
                            <!-- 20210721 ljh 1719 end -->
                            <apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
                            <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" />
                            <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;"/>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                            <span><apex:outputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" /></span>
@@ -307,18 +307,19 @@
                            <span><apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;"/></span>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                            <span><apex:outputField id="inspectionResultNg1" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;"/></span>
                            <span><apex:outputField id="inspectionResultNg1" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;" /></span>
                            </apex:outputPanel>
                        </li>

                        <li style="{!IF(esdInfo.rec.Inspection_result_NG__c='维修','','display: none;')}">
                        <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                            <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_NG_abord_reason__c.label}：</span>
                            <apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable,esdInfo.rec.Inspection_result_NG__c='维修')}">
                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                            <span>
                                <apex:inputField id="inspectionResultNG2" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"/>
                            </span>
                            <script>
                                disabledShowNG() {
                                disabledShowNG();
                                function disabledShowNG() {
                                    var inspection_result_NG = '{!esdInfo.rec.Inspection_result_NG__c}';
                                    if(inspection_result_NG  != '废弃'){
                                        j$(escapeVfId('allPage:allForm:esdList:' + ('{!indexloop}' - 1) + ':inspectionResultNG2')).prop("disabled", true);
@@ -326,22 +327,27 @@
                                }
                            </script>
                            </apex:outputPanel>
                            <apex:outputPanel layout="none" rendered="{!AND(NOT(esdInfo.editable),esdInfo.rec.Inspection_result_NG__c='维修')}">
                            <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
                                <span>
                                    <apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"></apex:outputField>
                                    <apex:outputField id="inspectionResultNG3" value="{!esdInfo.rec.Pre_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"></apex:outputField>
                                </span>
                            </apex:outputPanel>
                        </li>

                        <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                            <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_Inspection_Comment__c.label}： </span>
                            <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
                            <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:75px;"/>
                            <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:75px;"/></span>
                                <span>
                                    <apex:outputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"></apex:outputField>
                                </span>
                            </apex:outputPanel>
                        </li>

                        <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
                            <span>上次回收后检测时间： </span>
                            <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
@@ -357,6 +363,7 @@
                        <!-- </div> -->
                    </apex:outputPanel>
                </ul>
                
                </div>
                <div class="rbottom">
                    <div class="r4"></div>