lightningupdate.git

			@@ -7,7 +7,7 @@
			<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
			<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
			<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
			<apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/>
			<!-- <apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/> -->
			<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
			<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
			<script type="text/javascript">
			@@ -98,13 +98,119 @@

			</script>
			<style type="text/css">
			.detail {
			margin-left:5px;
			width:310px;
			}

			.menu {
			padding:0px;
			border-left:1px solid #D1D1D1;
			border-right:1px solid #D1D1D1;
			}

			.menu h2{
			margin:0;
			padding:0;
			font-size:14px;
			}

			.menu h2 div {
			width: 308px;
			text-align: left;
			margin: 0;
			background:#DCDCDC;
			}

			.menu ul{
			margin:0;
			padding:1px;
			list-style: none;
			border-top:1px solid #ddd;
			}

			.menu li {
			padding:0;
			font-size:14px;
			line-height:1.0;
			height:23px;
			clear:both;
			/border-bottom: 1px dotted #999;/
			}

			.menu li span {
			width: 140px;
			text-align: right;
			float: left;
			margin: 5px 0px 0px 0px;
			}

			.menu li span span{
			text-align: left;
			margin-left: 3px;
			margin-top: 0px;
			}

			.commandbutton {
			font-size: 13px !important;
			}

			.tabsize {
			font-size: 14px !important;
			}

			.detailtab {
			font-size: 14px;
			margin-top: 0;
			}

			.detailhander {
			font-size: 16px;
			}

			.deliveryslip {
			font-size: 15px;
			}

			.modal {
			display:none;
			position: fixed; /* Stay in place */
			z-index: 10; /* Sit on top */
			left: 0;
			top: 0;
			width: 100%; /* Full width */
			height: 100%; /* Full height */
			overflow: auto; /* Enable scroll if needed */
			background-color: rgb(0,0,0); /* Fallback color */
			background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
			}

			/* Modal Content/Box */
			.modal-content {
			background-color: #fefefe;
			margin-left: 6px;
			margin-top: 100px;
			padding: 20px;
			border: 1px solid #888;
			width: 265px; /* Could be more or less, depending on screen size */
			}

			.freezehander {
			position: fixed;
			top: 0px;
			background-color:
			white;
			width: 320px;
			z-index: 1;
			}

			.menu div.m_title{
			border-top-left-radius:10px;
			border-top-right-radius:10px;
			text-align: left;
			margin: 0;
			padding: 1%;
			width: 98%;
			width: 100%;
			background:#DCDCDC;
			position: relative;
			}
			@@ -186,7 +292,7 @@
			width: 400px;
			}
			.menu li .fieldname {
			width: 30%;
			width: 35%;
			text-align: right;
			float: left;
			}
			@@ -198,7 +304,7 @@
			}
			.menu li {
			vertical-align: middle;
			margin: 5px 0;
			margin: 15px 0;
			}
			.commandbutton{
			width: 100px !important;
			@@ -206,6 +312,9 @@
			}
			div.freezehander{
			width:500px;
			}
			.checkBox1{
			margin-bottom: 4px;
			}
			</style>

			@@ -273,12 +382,12 @@

			<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id, false, true)}">
			<hr/>
			<apex:inputCheckbox id="summaryCheck" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><h3 style="padding: 5px;" class="detailtab">{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>   到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>   汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
			<h3 style="padding: 5px;" class="detailtab"><apex:inputCheckbox id="summaryCheck" styleClass="checkBox1" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/>{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>   到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>   汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
			<apex:variable var="SetName" value="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" />
			</apex:outputPanel>

			<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}" >
			<apex:inputCheckbox id="summaryCheckS" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><h3 style="padding: 5px;" class="detailtab">{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>   到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>   汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
			<h3 style="padding: 5px;" class="detailtab"><apex:inputCheckbox id="summaryCheckS" styleClass="checkBox1" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/>{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>   到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>   汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
			</apex:outputPanel>

			<div class="menu">
			@@ -414,7 +523,10 @@
			userAgent = window.navigator.userAgent.toLowerCase(),
			safari = /safari/.test( userAgent ),
			ios = /iphone\|ipod\|ipad/.test( userAgent ),
			ver = '';
			if (ios) {
			ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
			}
			let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false});
			scanner.addListener('scan', function (content) {
			filljsQR(content);