lightningupdate.git

			@@ -122,11 +122,12 @@
			</script>
			<style type="text/css">
			.menu div.m_title{
			width: 308px;
			/* width: 308px; //20230723 ljh*/
			text-align: left;
			margin: 0;
			background:#DCDCDC;
			border-radius:8px 8px 0 0;
			padding-left: 0.75rem;/20230721 ljh /
			}
			.menu blockquote{
			margin: 0;
			@@ -155,7 +156,7 @@
			position: relative;
			/* 20230424 ljh lightning 升级 start */
			/* width: 20%; */
			width: 30%;
			width: 50%;
			/* 20230424 ljh lightning 升级 end */
			float: left;
			margin: 0;
			@@ -179,14 +180,16 @@
			}

			div#main {
			width: 320px;
			/* width: 320px; //20230723 ljh*/
			}
			hr {
			border-top: 2px dotted #f00;
			color: #fff;
			background-color: #fff;
			height: 1px;
			width: 90%;
			/20230722 ljh /
			/* width: 90%; */
			width: 98%;
			}
			.close {
			color: #aaaaaa;
			@@ -234,7 +237,7 @@
			<apex:outputPanel id="message">
			<apex:pageMessages />
			</apex:outputPanel>
			<div style="text-align: right;margin-top: 10px;">
			<!-- <div style="text-align: right;margin-top: 10px;">
			<apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" disabled="{!saveBtnDisabled}"/>
			</div>
			<apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
			@@ -244,7 +247,7 @@
			<col width="170" />
			</colgroup>
			<tr>
			<!-- 状态切换btn -->
			状态切换btn
			<th colspan="2" style="font-size:20px;text-align: center;width:380px;">
			<ul id="Step_tab">
			<li class="selected"><span class="tabsize">上架</span></li>
			@@ -256,7 +259,30 @@
			<div style="text-align: right">
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/>
			<apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/>
			</div>
			</div> -->
			<apex:pageBlock >
			<table style="border-collapse: collapse; font-size:13px;">
			<colgroup>
			<col width="20%" />
			<col width="80%" />
			</colgroup>
			<tr>
			<!-- 状态切换btn -->
			<th style="font-size:20px;text-align: center;width:280px;height: 50px;" >
			<ul id="Step_tab" style="margin:0;">
			<li class="selected"><span class="tabsize">上架</span></li>
			</ul>
			</th>
			<th width="900px;" style="padding-left:50px;" class="myBtn">
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/>
			<apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/>
			<apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" disabled="{!saveBtnDisabled}"/>
			<apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
			</th>
			</tr>
			</table>
			<div style="font-size: 14px;">缺少一对一回库:<apex:inputCheckbox value="{!forceSave}" /></div>
			</apex:pageBlock>
			</div>
			<apex:outputPanel id="detail">

			@@ -291,14 +317,16 @@
			</apex:outputPanel>
			<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c, false, true)}">
			<hr/>
			<h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}"/>
			<!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
			<span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}" style="margin-bottom: 5px;"/>
			<apex:variable var="SetName" value="{!esdInfo.rec.TransferApplySummary__c}" />
			</apex:outputPanel>

			<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
			<h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}"/>
			<!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
			<span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
			<apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}" style="margin-bottom: 5px;"/>
			</apex:outputPanel>
			<apex:outputPanel layout="none" rendered="{!IF(esdInfo.errorInfo=null, false, true)}">
			<div>
			@@ -307,8 +335,13 @@
			</apex:outputPanel>
			<div class="menu">
			<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.AssetName__c}" />  <apex:outputPanel layout="none" rendered="{!esdInfo.rec.OneToOneAccessory__c}">(一对一附属品)</apex:outputPanel>
			<!-- 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>
			<ul>
			<!-- 20230722 ljh -->
			<ul style="padding: 1px 0.75rem;" >
			<li>
			<span>检测结果： </span><span>
			<apex:outputField value="{!esdInfo.rec.Inspection_result_after_F__c}" style="margin:3px;width:75px;"/></span>
			@@ -320,7 +353,10 @@
			<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}">
			<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Arrival_in_wh__c.label}： </span>
			<apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
			<apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;width:75px;" />
			<!-- 20230424 ljh lightning 升级 start -->
			<!-- <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;width:75px;" /> -->
			<apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;" />
			<!-- 20230424 ljh lightning 升级 end -->
			<apex:outputPanel layout="none" rendered="{!esdInfo.rec.OneToOneAccessory__c}">
			<input type="hidden" name="onetoone" value="{!esdInfo.rec.TransferApplySummary__c}"/>
			</apex:outputPanel>
			@@ -348,10 +384,12 @@
			<span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
			</apex:outputPanel>
			</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>