From 6187ac258613e78cf56513c6674bfce82b218501 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期三, 26 七月 2023 17:07:45 +0800
Subject: [PATCH] 备品页面7_26
---
force-app/main/default/pages/EquipmentSetShippmentReceived5.page | 221 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 151 insertions(+), 70 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived5.page b/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
index 7df835b..0ddc234 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
@@ -7,6 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
<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">
@@ -63,6 +64,24 @@
})
}
}
+function OpenRentalApplyFault(faultReportFlag, radetailId, radetailName, personId, personName, purpose2, name, hospitalName, serialNumber, fixtureNo, workPlace, deptCategory){
+ if(faultReportFlag == '涓嶅瓨鍦ㄦ晠闅滄姤鍛婂崟'){
+ window.open("/a5C/e?Name=*" + "&CF00N10000009I5UX_lKid=" + radetailId + "&CF00N10000009I5UX=" + radetailName + "&CF00N10000009I5UV_lKid=" + personId + "&CF00N10000009I5UV=" + personName + "&00N10000009I5Uh=" + purpose2 + "&00N10000009I5UW=" + name + "&00N10000009I6jv=" + hospitalName + "&00N10000009I5Ua=" + serialNumber + "&00N10000009I5UP=" + fixtureNo + "&00N10000009I5Uf=" + workPlace + "&00N10000009I5UU=" + deptCategory);
+ //window.open("/a5F/e?Name=*" + "&CF00N9D000007hkLN_lKid=" + radetailId + "&CF00N9D000007hkLN=" + radetailName + "&CF00N9D000007jemP_lKid=" + personId + "&CF00N9D000007jemP=" + personName + "&00N9D000007jrE6=" + purpose2 + "&00N9D000007ijyA=" + name + "&00N9D000007yNXu=" + 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=" + 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);
@@ -96,6 +115,26 @@
function resetDetailDivMargintop() {
var handerHeight = document.getElementById('hander').clientHeight;
document.getElementById('detailDiv').style.marginTop = handerHeight + 'px';
+ // 20230624 ljh start
+ j$("select[name$='inspectionResult']").each(function() {
+ j$(this).height('30px');
+ })
+ j$("select[name$='inspectionResultNg']").each(function() {
+ j$(this).height('30px');
+ })
+ j$("select[name$='inspectionResultNg3']").each(function() {
+ j$(this).height('30px');
+ })
+ j$("select[name$='inspectionResult2']").each(function() {
+ j$(this).height('30px');
+ })
+ j$("select[name$='inspectionResultNg2']").each(function() {
+ j$(this).height('30px');
+ })
+ j$("select[name$='inspectionResultNg4']").each(function() {
+ j$(this).height('30px');
+ })
+ // 20230624 ljh end
}
window.onload = function hiddenName(){
@@ -114,11 +153,13 @@
</script>
<style type="text/css">
.menu div.m_title{
- width: 308px;
+ /*width: 308px;*/
text-align: left;
margin: 0;
- background:#DCDCDC;
+ /*background:#DCDCDC;*/
+ background:#95aee5;
/*height: 42px;*/
+ padding-left: 0.75rem;/*20230721 ljh */
}
.dateFormat {
display: none;
@@ -126,23 +167,23 @@
#Step_tab {
list-style-type: none;
padding: 0;
- /* 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;
- /* 2023-04-23 zyh lightning鍗囩骇 start */
/* width: 24%; */
- width: 30%;
- /* 2023-04-23 zyh lightning鍗囩骇 end */
+ width: 50%;
float: left;
margin: 0;
padding: 0;
text-align: center;
cursor: pointer;
+ /*20230619 ljh*/
+ height:30px;
+ line-height: 30px;
+ /*20230619 ljh*/
}
#Step_tab li span {
margin: 0;
@@ -159,12 +200,12 @@
color: #fff;
}
- div#main {
+ /*div#main {
width: 320px;
- }
+ }*/
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
- div.rtop div {background:#DCDCDC;}
+ div.rtop div {/*background:#DCDCDC;*/background:#95aee5;}
div.r1, div.r2, div.r3, div.r4 {display:block; overflow:hidden;}
div.r1, div.r2, div.r3 {height:1px;}
div.r2, div.r3, div.r4 {border-left:1px solid silver; border-right:1px solid silver;}
@@ -177,7 +218,10 @@
color: #fff;
background-color: #fff;
height: 1px;
- width: 90%;
+ /*20230619 ljh start*/
+ /*width: 90%;*/
+ width: 98%;
+ /*20230619 ljh end*/
}
.close {
color: #aaaaaa;
@@ -224,38 +268,37 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
- <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;"/>
- <!-- <apex:outputText value="锛堝嚭搴撴寚绀哄悗鍙栨秷锛�" style="color:red;" rendered="{!IF(SR_status='Received' && es.cancel_after_loaner_arranged__c, true, false)}"/> -->
- <table style="border-collapse: collapse; font-size:13px;">
- <colgroup>
- <col width="150" />
- <col width="170" />
- </colgroup>
- <tr>
- <!-- 鐘舵�佸垏鎹tn -->
- <th colspan="2" style="font-size:20px;text-align: center;width:380px;">
- <ul id="Step_tab">
- <apex:outputPanel layout="none" rendered="{!IF(SR_status='Shippment', true, false)}">
- <apex:outputPanel layout="none" rendered="{!IF(Step_status='鍥炴敹鍚庢娴�', true, false)}">
- <li onclick="javascript:Shippment1();" class="selected"><span class="tabsize">鍥炴敹鍚庢娴�</span></li>
- <li onclick="javascript:Shippment2();"><span class="tabsize">涓婃灦</span></li>
- </apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!IF(Step_status='鍙戣揣', true, false)}">
- <li onclick="javascript:Shippment1();"><span class="tabsize">鍥炴敹鍚庢娴�</span></li>
- <li onclick="javascript:Shippment2();" class="selected"><span class="tabsize">涓婃灦</span></li>
- </apex:outputPanel>
- </apex:outputPanel>
- </ul>
- </th>
- </tr>
- </table>
- <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>
+ <apex:pageBlock >
+ <table style="border-collapse: collapse; font-size:13px;">
+ <colgroup>
+ <col width="20%" />
+ <col width="80%" />
+ </colgroup>
+ <tr>
+ <!-- 鐘舵�佸垏鎹tn -->
+ <th style="font-size:20px;text-align: center;width:280px;height: 50px;" >
+ <ul id="Step_tab" style="margin:0;">
+ <apex:outputPanel layout="none" rendered="{!IF(SR_status='Shippment', true, false)}">
+ <apex:outputPanel layout="none" rendered="{!IF(Step_status='鍥炴敹鍚庢娴�', true, false)}">
+ <li onclick="javascript:Shippment1();" class="selected"><span class="tabsize">鍥炴敹鍚庢娴�</span></li>
+ <li onclick="javascript:Shippment2();"><span class="tabsize">涓婃灦</span></li>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!IF(Step_status='鍙戣揣', true, false)}">
+ <li onclick="javascript:Shippment1();"><span class="tabsize">鍥炴敹鍚庢娴�</span></li>
+ <li onclick="javascript:Shippment2();" class="selected"><span class="tabsize">涓婃灦</span></li>
+ </apex:outputPanel>
+ </apex:outputPanel>
+ </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>
+ </apex:pageBlock>
</div>
<apex:outputPanel id="detail">
@@ -266,16 +309,18 @@
<apex:variable var="indexloop" value="{!indexloop+1}"/>
<apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, SetName)}" />
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id && indexloop != 1, true, false)}">
- <br/>
+ <!-- <br/> -->
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, false, true)}">
<hr/>
- <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>
+ <!-- 20230722 ljh -->
+ <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}锛歿!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
<apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Id}" />
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
- <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>
+ <!-- 20230722 ljh -->
+ <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}锛歿!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
</apex:outputPanel>
<div class="rtop">
<div class="r1"></div>
@@ -287,53 +332,66 @@
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.AssetName__c}" />
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
- <ul>
+ <!-- 20230722 ljh -->
+ <ul style="padding: 1px 0.75rem;" >
<apex:outputPanel layout="none" rendered="{!IF(Step_status='鍥炴敹鍚庢娴�', true, false)}">
<!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> -->
<li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item_F__c.label}锛� </span><span>
- <apex:outputField value="{!esdInfo.rec.Check_lost_Item_F__c}" style="margin:3px;width:75px;"/></span>
+ <!-- 20230722 ljh width:75px; -->
+ <apex:outputField value="{!esdInfo.rec.Check_lost_Item_F__c}" style="margin:3px;"/></span>
</li>
<li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_giveup__c.label}锛� </span><span>
- <apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}" style="margin:3px;width:75px;"/></span>
+ <!-- 20230722 ljh width:75px; -->
+ <apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}" style="margin:3px;"/></span>
</li>
<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>
+ <!-- 20230722 ljh -->
<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: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.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> -->
<span>妫�娴婲G鍖哄垎锛� </span><span>
- <apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG__c}" style="margin:3px;width:75px;"/></span>
+ <!-- 20230722 ljh width:75px; -->
+ <apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG__c}" style="margin:3px;"/></span>
</li>
<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>
<apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable, esdInfo.rec.Inspection_result_after_NG__c='缁翠慨')}">
- <apex:inputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 2);" />
+ <!-- 20230722 ljh width:75px; -->
+ <apex:inputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 2);" />
</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_Final__c}" style="margin:3px;width:75px;" /></span>
+ <!-- 20230722 ljh width:75px; -->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</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> -->
<span>鏈�缁圢G鍖哄垎锛� </span>
<apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable,esdInfo.rec.Inspection_result_after_NG__c='缁翠慨')}"><span>
- <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 2);" /></span>
+ <!-- 20230722 ljh width:75px; -->
+ <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 2);" /></span>
</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_NG_Final__c}" style="margin:3px;width:75px;" /></span>
+ <!-- 20230722 ljh width:75px; -->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
<li style="{!IF(esdInfo.rec.Inspection_result_after_NG__c='缁翠慨', '', 'display: none;')}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_NG_abord_reason__c.label}锛�</span>
<apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable,esdInfo.rec.Inspection_result_after_NG__c='缁翠慨')}">
<span>
- <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" />
+ <!-- 20230722 ljh -->
+ <!-- <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /> -->
+ <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" />
</span>
<script>
disabledShowNg4();
@@ -346,34 +404,44 @@
</script>
</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_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span>
- </apex:outputPanel>
+ <!-- 20230722 ljh -->
+ <!-- <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span> -->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" /></span>
+ </apex:outputPanel>
</li>
<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>
<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)" />
+ <!-- 20230722 ljh width:75px; -->
+ <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;" 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>
+ <!-- 20230722 ljh -->
+ <!-- <output style="margin:3px;width:55px;text-align:left;margin-left:3px;margin-top:0px;float: left;">{!esdInfo.rec.Inspection_result_after__c}</output> -->
+ <output>{!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.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> -->
<span>妫�娴婲G鍖哄垎锛� </span>
<apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable, esdInfo.rec.Inspection_result_after_NG__c!='缁翠慨')}"><span>
- <apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_after_NG__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 1)" /></span>
+ <!-- 20230722 ljh width:75px; -->
+ <apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_after_NG__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 1)" /></span>
</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_NG__c}" style="margin:3px;width:75px;" /></span>
+ <!-- 20230722 ljh width:75px; -->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
<li style="{!IF(esdInfo.rec.Inspection_result_after_NG__c='缁翠慨', 'display: none;', '')}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_NG_abord_reason__c.label}锛�</span>
<apex:outputPanel layout="none" rendered="{!AND(esdInfo.editable, esdInfo.rec.Inspection_result_after_NG__c!='缁翠慨')}">
<span>
- <apex:inputField id="inspectionResultNg3" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"/>
+ <!-- 20230722 ljh -->
+ <!-- <apex:inputField id="inspectionResultNg3" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"/> -->
+ <apex:inputField id="inspectionResultNg3" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" />
</span>
<script>
disabledShowNg3();
@@ -386,21 +454,30 @@
</script>
</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_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span>
- </apex:outputPanel>
+ <!-- 20230722 ljh -->
+ <!-- <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span> -->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" /></span>
+ </apex:outputPanel>
</li>
<li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_Comment__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
- <apex:inputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span>
+ <!-- 20230722 ljh -->
+ <!-- <apex:inputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span> -->
+ <apex:inputField value="{!esdInfo.rec.Inspection_Comment__c}" /></span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span>
- </apex:outputPanel>
+ <!-- 20230722 ljh -->
+ <!-- <span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span> -->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}"/></span>
+ </apex:outputPanel>
</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> -->
+ <!-- 20230722 ljh -->
+ <!-- <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> -->
+ <span><apex:outputLink value="/{!esdInfo.rec.Asset__c}" target="_blank" id="assetLink" >{!esdInfo.rec.SerialNumber_F__c}</apex:outputLink></span>
</li>
<!-- </div> -->
@@ -449,7 +526,11 @@
userAgent = window.navigator.userAgent.toLowerCase(),
safari = /safari/.test( userAgent ),
ios = /iphone|ipod|ipad/.test( userAgent ),
- ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
+ // ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
+ 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);
--
Gitblit v1.9.1