OlyMEBGProduct.git

			@@ -1,4 +1,4 @@
			<apex:page Controller="EquipmentSetShippmentReceived5Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="备品出库入库">
			<apex:page Controller="EquipmentSetShippmentReceived5Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="备品出库入库" lightningStylesheets="true">
			<head>
			<meta name="format-detection" content="telephone=no"/>
			</head>
			@@ -6,10 +6,13 @@
			<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
			<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
			<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
			<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
			<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">
			var Session_ID = '{!$Api.Session_ID}';
			function getQueryVariable(variable)
			{
			var query = window.location.search.substring(1);
			@@ -63,6 +66,25 @@
			})
			}
			}

			function OpenRentalApplyFault(faultReportFlag, radetailId, radetailName, personId, personName, purpose2, name, hospitalId, hospitalName, serialNumber, fixtureNo, workPlace, deptCategory){
			if(faultReportFlag == '不存在故障报告单'){
			window.open("/a5F/e?Name=*" + "&CF00N9D000007hkLN_lKid=" + radetailId + "&CF00N9D000007hkLN=" + radetailName + "&CF00N9D000007jemP_lKid=" + personId + "&CF00N9D000007jemP=" + personName + "&00N9D000007jrE6=" + purpose2 + "&00N9D000007ijyA=" + name + "&CF00N9D000007jrEG_lKid=" + hospitalId + "&CF00N9D000007jrEG=" + hospitalName + "&00N9D000007jrEL=" + serialNumber + "&00N9D000007jrEQ=" + fixtureNo + "&00N9D000007jrEV=" + workPlace + "&00N9D000007jrJW=" + deptCategory);
			}else{
			// if(confirm('是否打开或创建新的检测分析报告？')){
			// if (faultReportFlag == '存在故障报告单'){
			// window.open("/a5C/e?Name=*" + "&CF00N9D000007hkLN_lKid=" + radetailId + "&CF00N9D000007hkLN=" + radetailName + "&CF00N9D000007jemP_lKid=" + personId + "&CF00N9D000007jemP=" + personName + "&00N9D000007jrE6=" + purpose2 + "&00N9D000007ijyA=" + name + "&CF00N9D000007jrEG_lKid=" + hospitalId + "&CF00N9D000007jrEG=" + hospitalName + "&00N9D000007jrEL=" + serialNumber + "&00N9D000007jrEQ=" + fixtureNo + "&00N9D000007jrEV=" + workPlace + "&00N9D000007jrJW=" + deptCategory);
			// }else{
			// window.open("/" + faultReportFlag);
			// }
			// }

			if(confirm('已存在检测分析报告')){
			window.open("/" + faultReportFlag);
			}
			}
			}

			function filljs1() {
			j$("select[name$='inspectionResult']").val("OK");
			j$("select[name$='inspectionResultNg']").prop("selectedIndex", 0);
			@@ -295,8 +317,10 @@
			<li style="{!IF(esdInfo.rec.Inspection_result_after_NG__c='维修', '', 'display: none;')}" data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" >
			<!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_after_F__c.label}： </span> -->
			<span>检测结果： </span><span>
			<apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" />
			</span>
			<!-- <apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" /> -->
			<output style="margin:3px;width:55px;text-align:left;margin-left:3px;margin-top:0px;float: left;">{!esdInfo.rec.Inspection_result_after__c}</output>
			<apex:commandButton style="margin-top:0px;font-size: 9px !important;" onclick="OpenRentalApplyFault('{!esdInfo.faultReportFlag}', '{!esdInfo.rec.Id}', '{!esdInfo.rec.Name}','{!esdInfo.personInChargeId}','{!esdInfo.personInChargeName}','{!esdInfo.demoPurpose2}','{!esdInfo.raName}','{!esdInfo.hospitalId}','{!esdInfo.hospitalName}','{!esdInfo.rec.SerialNumber_F__c}','{!esdInfo.rec.Fixture_Model_No__c}','{!esdInfo.workPlace}','{!esdInfo.deptCategory}')" value="故障报告" rerender="dummy" rendered="{!esdInfo.showFaultRepor}"/>
			</span>
			</li>
			<li style="{!IF(esdInfo.rec.Inspection_result_after_NG__c='维修', '', 'display: none;')}">
			<!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_after_NG_F__c.label}： </span> -->
			@@ -347,11 +371,12 @@
			<!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_after_F__c.label}： </span> -->
			<span>检测结果： </span>
			<apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable, esdInfo.rec.Inspection_result_after_NG__c!='维修')}">
			<apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 1)" />
			<apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 1)" />
			</apex:outputPanel>
			<apex:outputPanel layout="none" rendered="{!AND(NOT(esdInfo.editable), esdInfo.rec.Inspection_result_after_NG__c!='维修')}">
			<span><apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" /></span>
			<output style="margin:3px;width:55px;text-align:left;margin-left:3px;margin-top:0px;float: left;">{!esdInfo.rec.Inspection_result_after__c}</output>
			</apex:outputPanel>
			<apex:commandButton style="margin-top:0px;font-size: 9px !important;" onclick="OpenRentalApplyFault('{!esdInfo.faultReportFlag}', '{!esdInfo.rec.Id}', '{!esdInfo.rec.Name}','{!esdInfo.personInChargeId}','{!esdInfo.personInChargeName}','{!esdInfo.demoPurpose2}','{!esdInfo.raName}','{!esdInfo.hospitalId}','{!esdInfo.hospitalName}','{!esdInfo.rec.SerialNumber_F__c}','{!esdInfo.rec.Fixture_Model_No__c}','{!esdInfo.workPlace}','{!esdInfo.deptCategory}')" value="故障报告" rerender="dummy" rendered="{!esdInfo.showFaultRepor}"/>
			</li>
			<li style="{!IF(esdInfo.rec.Inspection_result_after_NG__c='维修', 'display: none;', '')}">
			<!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_after_NG_F__c.label}： </span> -->
			@@ -394,7 +419,8 @@
			</li>
			<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>
			<!-- <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span> -->
			<span><apex:outputLink value="/{!esdInfo.rec.Asset__c}" target="_blank" id="assetLink" style="margin:3px;width:140px;float: left;text-align:left;margin-left:3px;margin-top:0px;">{!esdInfo.rec.SerialNumber_F__c}</apex:outputLink></span>
			</li>
			<!-- </div> -->