lightningupdate.git

			@@ -1,4 +1,6 @@
			<!-- <apex:page Controller="EquipmentSetShippmentReceived3Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="备品出库入库"> -->
			<apex:page Controller="EquipmentSetShippmentReceived3Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true" title="备品出库入库">
			<!-- 2023-04-23 zyh lightning升级 -->
			<head>
			<meta name="format-detection" content="telephone=no"/>
			</head>
			@@ -114,12 +116,18 @@
			#Step_tab {
			list-style-type: none;
			padding: 0;
			height: 25px;
			/* 2023-04-23 zyh lightning升级 start */
			/* height: 25px; */
			height: 30px;
			/* 2023-04-23 zyh lightning升级 end */
			border-bottom: 5px solid #3b5998;
			}
			#Step_tab li {
			position: relative;
			width: 20%;
			/* 2023-04-23 zyh lightning升级 start */
			width: 30%;
			/* width: 20%; */
			/* 2023-04-23 zyh lightning升级 end */
			float: left;
			margin: 0;
			padding: 0;
			@@ -259,9 +267,13 @@
			<tr>
			<td style="text-align: right;" class="deliveryslip">发货-运输单号： </td>
			<td align="left">
			<apex:inputField value="{!slip.Name}" style="width:120px;float:left" id="SlipNo"/>
			<!-- 2023-04-23 zyh lightning升级 -->
			<apex:inputField value="{!slip.Name}" style="width:100px;float:left" id="SlipNo"/>
			<!-- <apex:inputField value="{!slip.Name}" style="width:120px;float:left" id="SlipNo"/> -->
			<apex:commandButton styleClass="commandbutton" onclick="blockme();searchSlip();return false;" style="float:left" value="检索" rerender="dummy"/>
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="扫运输单号" rerender="dummy"/>
			<!-- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="扫运输单号" rerender="dummy"/> -->
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="扫运输单号" rerender="dummy" style="margin-left:0; "/>
			<!-- 2023-04-23 zyh lightning升级 -->
			</td>
			</tr>
			<tr>
			@@ -330,18 +342,27 @@
			<apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Rental_Apply_Equipment_Set__r.Inspection_not_finish__c > 0, false, true)}">
			<apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>
			</apex:outputPanel>
			<h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h2>
			<!-- 2023-04-26 zyh lightning升级 start -->
			<!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h2> -->
			<span style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</span>
			<!-- 2023-04-26 zyh lightning升级 end -->
			<apex:variable var="SetName2" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Id}" />
			</apex:outputPanel>

			<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
			<h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2>
			<br/>
			<!-- 2023-04-26 zyh lightning升级 start -->
			<!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2>
			<br/> -->
			<div style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</div>
			<!-- 2023-04-26 zyh lightning升级 end -->
			<input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/>
			<apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Rental_Apply_Equipment_Set__r.Inspection_not_finish__c > 0, false, true)}">
			<apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>
			</apex:outputPanel>
			<h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
			<!-- 2023-04-26 zyh lightning升级 start -->
			<span style="padding: 5px; font-weight: blod;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</span>
			<!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3> -->
			<!-- 2023-04-26 zyh lightning升级 end -->
			</apex:outputPanel>
			<div class="rtop">
			<div class="r1"></div>