lightningupdate.git

			@@ -109,7 +109,8 @@
			/* width: 308px; // 20230718 ljh */
			text-align: left;
			margin: 0;
			background:#95aee5;
			background:#DCDCDC;
			/* background:#95aee5; */
			border-radius:8px 8px 0 0;
			padding-left: 0.75rem;/20230628 ljh/
			}
			@@ -209,6 +210,9 @@
			.errorMsg{
			width: 140px;
			}
			.mytable tr{
			height: 35px;
			}
			/20230625 ljh /
			</style>
			<div id="myModal" class="modal">
			@@ -281,7 +285,7 @@
			</th>
			</tr>
			</table>
			<table style="border-collapse: collapse; font-size:13px;" width="80%">
			<table style="border-collapse: collapse; font-size:13px;" width="80%" class="mytable">
			<apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}" id="slipPanel">
			<tr>
			<td colspan="2"><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, true, false)}"><span style="margin-left:30px;font-weight: bold;font-size: 15px;">新建</span></apex:outputPanel><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, false, true)}"><span style="margin-left:30px;font-weight: bold;">编辑：[{!slip.DeliveryCompany_SlipNo__c}]</span></apex:outputPanel></td>
			@@ -374,7 +378,8 @@
			<!-- 20230423 ljh lightning 升级 end -->
			<input type="hidden" value="{!esdInfo.rec.TransferApply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.TransferApply__c}"/>
			<apex:outputPanel layout="none" rendered="{!esdInfo.inspectionFinished}">
			<apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/><input type="hidden" value="{!esdInfo.rec.TransferApply__c}"/>
			<!-- 20230721 ljh -->
			<apex:inputCheckbox value="{!esdInfo.isChecked}" style="margin:0 0 0 0.75rem;"/><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/><input type="hidden" value="{!esdInfo.rec.TransferApply__c}"/>
			</apex:outputPanel>
			<!-- 20230423 ljh lightning 升级 start -->
			<!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
			@@ -383,6 +388,9 @@
			</apex:outputPanel>
			<div class="menu">
			<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			<span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			</div></h2>
			<!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->
			<!-- 20230718 ljh -->
			@@ -400,10 +408,12 @@
			<li><span>上次回收后检测时间： </span>
			<span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
			</li>
			<li>
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			<!-- <li>
			<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}： </span>
			<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
			</li>
			</li> -->
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			</ul>
			</div>
			</apex:outputPanel>
			@@ -443,7 +453,11 @@
			</h2>
			</apex:outputPanel>
			<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}">
			<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />  </div>
			<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			<span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			</div>
			</h2>
			</apex:outputPanel>
			<!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ -->
			@@ -462,10 +476,12 @@
			<li><span>上次回收后检测时间： </span>
			<span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
			</li>
			<li>
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			<!-- <li>
			<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}： </span>
			<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
			</li>
			</li> -->
			<!-- 2023-08-02 zyh 机身编号换地方 -->
			</ul>
			</div>
			</apex:outputPanel>