force-app/main/default/pages/EquipmentSetShippmentReceived1.page
@@ -52,8 +52,12 @@ j$(ele).prop("disabled", false); } function filljsQR(qrcode) { console.log('qrcode:'+qrcode); blockme(); var cbox = j$("[data-qr='"+qrcode+"']").children("input[type='checkbox']"); // 20230616 ljh start // var cbox = j$("[data-qr='"+qrcode+"']").children("input[type='checkbox']"); var cbox = j$("[data-qr='"+qrcode+"']").children().children("input[type='checkbox']"); // 20230616 ljh end if (cbox.size() > 1) { alert("数量管理附属品请手动打勾！"); }else { @@ -66,6 +70,7 @@ function checkMessage() { if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') { alert("保存完了"); window.location.reload(false); } } @@ -84,11 +89,15 @@ </script> <style type="text/css"> .menu div.m_title{ width: 308px; /*width: 308px;*//*20230616 ljh*/ text-align: left; margin: 0; background:#DCDCDC; /*20230623 ljh start*/ /*background:#DCDCDC;*/ background:#95aee5; /*20230623 ljh end*/ /*height: 42px;*/ padding-left: 0.75rem;/*20230628 ljh*/ } .dateFormat { display: none; @@ -105,7 +114,8 @@ #Step_tab li { position: relative; /* 2023-04-23 zyh lightning升级 start */ width: 30%; /*width: 30%;*/ width: 50%;/*20230616 ljh*/ /* width: 20%; */ /* 2023-04-23 zyh lightning升级 end */ float: left; @@ -113,6 +123,10 @@ padding: 0; text-align: center; cursor: pointer; /*20230616 ljh*/ height:30px; line-height: 30px; /*20230616 ljh*/ } #Step_tab li span { margin: 0; @@ -128,13 +142,18 @@ #Step_tab li.selected span { color: #fff; } div#main { /*20230615 ljh*/ /*div#main { width: 320px; } }*/ div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;} div.rtop div {background:#DCDCDC;} div.rtop div { /*20230623 ljh start*/ /*background:#DCDCDC;*/ background:#95aee5; /*20230623 ljh end*/ } 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;} @@ -147,7 +166,10 @@ color: #fff; background-color: #fff; height: 1px; width: 90%; /*20230620 ljh*/ /*width: 90%;*/ width: 98%; /*20230620 ljh*/ } .close { color: #aaaaaa; @@ -184,7 +206,7 @@ </div> <apex:form id="allForm"> <apex:actionFunction name="save" action="{!save}" rerender="detail,message,done_flg" onComplete="unblockUI();checkMessage();resetDetailDivMargintop();" /> <apex:actionFunction name="save" action="{!save}" rerender="detail,message,done_flg" onComplete="unblockUI();checkMessage();" /> <apex:actionFunction name="Shippment1" action="{!Shippment1}" /> <apex:actionFunction name="Shippment2" action="{!Shippment2}" /> <apex:inputHidden value="{!done_flg}" id="done_flg"/> @@ -193,18 +215,20 @@ <apex:outputPanel id="message"> <apex:pageMessages /> </apex:outputPanel> <div style="text-align: right;margin-top: 10px;"> <!-- 20230616 ljh start--> <!-- <div style="text-align: right;margin-top: 10px;"> <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" rendered="{!IF(open_type='web', true, false)}" disabled="{!saveBtnDisabled}"/> </div> <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/> </div> --> <!-- <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/> --> <!-- 20230616 ljh end--> <!-- <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;"> <!-- <table style="border-collapse: collapse; font-size:13px;"> <colgroup> <col width="150" /> <col width="170" /> </colgroup> <tr> <!-- 状态切换btn --> 状态切换btn <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)}"> @@ -217,14 +241,41 @@ </ul> </th> </tr> </table> <div style="text-align: right"> </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(this);" 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;"> <apex:outputPanel layout="none" rendered="{!IF(SR_status='Shippment', true, false)}"> <apex:outputPanel layout="none" rendered="{!IF(Step_status='下架', true, false)}"> <li class="selected" ><span class="tabsize">下架</span></li> <li onclick="javascript:Shippment2();"><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(this);" value="全部OK" rerender="dummy" rendered="{!IF(Step_status='下架', true, false)}"/> <!-- 20230616 ljh start--> <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" rendered="{!IF(open_type='web', true, false)}" disabled="{!saveBtnDisabled}"/> <!-- 20230616 ljh end--> </th> </tr> </table> </apex:pageBlock> </div> <apex:outputPanel id="detail"> <div id="detailDiv" class="detail"> <apex:variable var="indexloop" value="{!0}" /> <apex:variable var="SetName" value="" /> @@ -232,16 +283,17 @@ <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/> --> <!-- 20230623 ljh --> </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> <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> <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> @@ -253,7 +305,7 @@ <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> </div></h2> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> <ul style="padding: 1px 0.75rem; {!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> <apex:outputPanel layout="none" rendered="{!IF(Step_status='下架', true, false)}"> <!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> --> <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}"> @@ -262,13 +314,15 @@ <span>下架： </span> <!-- 202107721 ljh 1719 end --> <apex:outputPanel layout="none" rendered="{!esdInfo.editable}"> <!-- 2023-04-23 zyh lightning升级 start --> <apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;" /> <!-- 20230616 ljh --> <!-- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /> --> <!-- 2023-04-23 zyh lightning升级 end --> <span><apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;" /></span> <!-- 20230616 ljh --> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}"> <span><apex:outputField id="inspectionResult1" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /></span> <span style="height: 35px;line-height: 35px;"> <!-- 20230620 ljh style="height: 35px;line-height: 35px;" --> <apex:outputField id="inspectionResult1" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt__c > 0 && esdInfo.rec.Is_Body__c}"> <input type="hidden" name="onetoone_main" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/> @@ -282,6 +336,11 @@ <span>{!$ObjectType.Asset.fields.WH_location__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span> </li> <!-- 20230721 ljh 机身编码换位置 --> <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> <span>上次回收后检测时间： </span> <span><apex:outputField value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span> @@ -290,10 +349,11 @@ <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_After_Inspection_elapsed_days__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Pre_After_Inspection_elapsed_days__c}" style="margin:3px;width:75px;"/></span> </li> <li> <!-- 20230721 ljh 机身编码换位置 --> <!-- <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> --> <!-- </div> --> </apex:outputPanel> </ul> @@ -310,17 +370,29 @@ </apex:outputPanel> </div> <script type="text/javascript"> // var standalone = window.navigator.standalone, // 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 ",""); // let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), refractoryPeriod: 5000,scanPeriod: 5 ,mirror: false}); // scanner.addListener('scan', function (content) { // filljsQR(content); // }); var standalone = window.navigator.standalone, 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 ",""); let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), refractoryPeriod: 5000,scanPeriod: 5 ,mirror: false}); 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); }); function qrsacn() { if (!standalone && !safari && ios) { window.location.href="sfqr://scan"; force-app/main/default/pages/EquipmentSetShippmentReceived2.page
@@ -119,11 +119,17 @@ </script> <style type="text/css"> .menu div.m_title{ width: 308px; /* width: 308px; 20230719 zyh */ text-align: left; margin: 0; background:#DCDCDC; border-radius:8px 8px 0 0; /*height: 42px;*/ padding-left: 0.75rem;/*20230629 zyh */ } .menu { border-radius:8px; border:1px solid #D1D1D1; } .dateFormat { display: none; @@ -134,13 +140,14 @@ /* 2023-04-23 zyh lightning升级 start */ /* height: 25px; */ height: 30px; margin-left:0; /* 2023-04-23 zyh lightning升级 end */ border-bottom: 5px solid #3b5998; } #Step_tab li { position: relative; /* 2023-04-23 zyh lightning升级 start */ width: 30%; width: 50%; /* width: 24%; */ /* 2023-04-23 zyh lightning升级 end */ float: left; @@ -148,6 +155,10 @@ padding: 0; text-align: center; cursor: pointer; /*20230719 zyh*/ height:30px; line-height: 30px; /*20230719 zyh*/ } #Step_tab li span { margin: 0; @@ -165,7 +176,7 @@ } div#main { width: 320px; /* width: 320px; */ } div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;} @@ -182,7 +193,10 @@ color: #fff; background-color: #fff; height: 1px; width: 90%; /*20230719 zyh*/ /*width: 90%;*/ width: 98%; /*20230719 zyh*/ } .close { color: #aaaaaa; @@ -229,19 +243,19 @@ <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;"/> <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;"> <!-- <table style="border-collapse: collapse; font-size:13px;"> <colgroup> <col width="150" /> <col width="170" /> </colgroup> <tr> <tr> --> <!-- 状态切换btn --> <th colspan="2" style="font-size:20px;text-align: center;width:380px;"> <!-- <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)}"> @@ -260,7 +274,37 @@ <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"> <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}"/> </th> </tr> </table> </apex:pageBlock> </div> <apex:outputPanel id="detail"> @@ -271,28 +315,31 @@ <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> <!-- 20230721 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> </apex:outputPanel> <div class="rtop"> <!-- 20230721 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> <div class="r2"></div> <div class="r3"></div> <div class="r4"></div> </div> </div> --> <div class="menu"> <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> </div></h2> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> <!-- 20230721 ljh --> <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> <apex:outputPanel layout="none" rendered="{!IF(Step_status='发货前', true, false)}"> <!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> --> <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> @@ -344,7 +391,9 @@ <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_Inspection_Comment__c.label}： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}" > <span> <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/> <!-- 20230721 ljh --> <!-- <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/> --> <apex:inputField value="{!esdInfo.rec.Pre_Inspection_Comment__c}" style="margin:3px;"/> </span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}"> @@ -371,12 +420,12 @@ </ul> </div> <div class="rbottom"> <!-- <div class="rbottom"> <div class="r4"></div> <div class="r3"></div> <div class="r2"></div> <div class="r1"></div> </div> </div> --> </apex:repeat> </div> @@ -387,7 +436,10 @@ 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 = ''; 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); force-app/main/default/pages/EquipmentSetShippmentReceived3.page
@@ -1,530 +1,580 @@ <!-- <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> <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> <apex:includeScript value="{!URLFOR($Resource.instascan)}"/> <apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/> <script type="text/javascript"> function savejs() { blockme(); save(); } function deleteDetailJs(ele) { blockme(); deleteDetail(j$(ele).next().val()); } var scanType; function filljsQR(qrcode) { if(!qrcode)return; blockme(); if(scanType == 1){ j$("input[name$='SlipNo']").val(qrcode); unblockUI(); } else{ var aId = j$(escapeVfId('allPage:allForm:applyId')).val(); aId = aId + "," + qrcode; var resdid = ''; j$("input[type=checkbox]:checked").each(function() { resdid += j$(this).next().val()+","; }); resdid = resdid.slice(0,-1); filljsQRAction(aId, resdid); } j$("#scanedqr").append("<li>"+qrcode+"</li>"); j$("#scanedqr").animate({ scrollTop: j$("#scanedqr").prop("scrollHeight")}, 1000); } function addToDetail() { blockme(); var resdid = ''; var warning = false; j$("input[type=checkbox]:checked").each(function() { resdid += j$(this).next().val()+":"; var applyid = j$(this).next().next().val(); if (!warning) warning = j$("[data-ngnum='"+applyid+"']").val() > 0; }); resdid = resdid.slice(0,-1); if (warning) { alert("申请单内存在不符合发货状态的配套，请跟进完成配套后续操作或分割申请单!") unblockUI(); return; } ShippmentDetail(resdid); } function checkAllDetail() { j$('input[type="checkbox"]').prop("checked",true); } function ShippmentAddJs() { j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true); ShippmentAdd(); } function checkMessage() { if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') { alert("保存完了"); } } function fixDeliveryType() { j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() { if (this.value == '回寄') j$(this).remove(); }) } function resetDetailDivMargintop() { var handerHeight = document.getElementById('hander').clientHeight; document.getElementById('detailDiv').style.marginTop = handerHeight + 'px'; } window.onload = function hiddenName(){ if( document.getElementById('allPage:allForm:CDS_staff_mlktp')){ document.getElementById('allPage:allForm:CDS_staff_mlktp').style.visibility="hidden" ; document.getElementById('allPage:allForm:CDS_staff_mlktp').style.width="200px" ; } resetDetailDivMargintop(); } </script> <style type="text/css"> .hideDropdown select{ display: none } .menu div.m_title{ width: 308px; text-align: left; margin: 0; background:#95aee5; /*height: 42px;*/ } .menu div.m_titleg{ width: 308px; text-align: left; margin: 0; background:#DCDCDC; /*height: 42px;*/ } .dateFormat { display: none; } #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: 30%; /* width: 20%; */ /* 2023-04-23 zyh lightning升级 end */ float: left; margin: 0; padding: 0; text-align: center; cursor: pointer; } #Step_tab li span { margin: 0; padding: 15px 0 11px; color: #2daae1; font-size: 12px; font-weight: bold; line-height: 1; } #Step_tab li.selected { background: #3b5998; } #Step_tab li.selected span { color: #fff; } div#main { width: 320px; } div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;} div.rtop div {background:#95aee5;} div.rtopg div {background:#DCDCDC;} 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;} div.r1 {margin: 0 5px; background:silver;} div.r2 {margin: 0 3px; border-width:0 2px;} div.r3 {margin: 0 2px;} div.r4 {margin: 0 1px; height: 2px;} hr { border-top: 2px dotted #f00; color: #fff; background-color: #fff; height: 1px; width: 90%; } .close { color: #aaaaaa; float: right; font-size: 28px; font-weight: bold; } .close:hover, .close:focus { color: #000; text-decoration: none; cursor: pointer; } .menu blockquote{ margin: 0; padding: 1px; list-style: none; border-top: 1px solid #ddd; } </style> <div id="myModal" class="modal"> <!-- Modal content --> <div class="modal-content"> <span class="close" onclick="stopScan()">×</span> <p>扫描中</p> <p>Code:<input type="text" id="qrcode"/></p> <video playsinline="true" id="preview" style="width: 100%;z-index: 11;transform: scaleX(-1);margin-top: 10px;"></video> 扫码履历： <ul id="scanedqr" style="list-style-type: none; text-align: center;padding: 0;width: 100%; height: 100px; overflow: auto"> </ul> </div> </div> <apex:form id="allForm"> <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="unblockUI();checkMessage();resetDetailDivMargintop();" /> <apex:actionFunction name="filljsQRAction" action="{!filljsQRAction}" rerender="detail,message" oncomplete="unblockUI();resetDetailDivMargintop();"> <apex:param name="firstParam" assignTo="{!ApplyId}" value="" /> <apex:param name="secondParam" assignTo="{!CheckedId}" value="" /> </apex:actionFunction> <apex:actionRegion > <apex:actionFunction name="deleteDetail" action="{!deleteDetail}" rerender="detail,message" oncomplete="unblockUI();"> <apex:param name="firstParam" assignTo="{!UnCheckedId}" value="" /> </apex:actionFunction> </apex:actionRegion> <!-- <apex:actionFunction name="Shippment" action="{!Shippment}" /> --> <apex:actionFunction name="searchSlip" action="{!searchSlip}" reRender="allForm" onComplete="unblockUI();fixDeliveryType();resetDetailDivMargintop();" /> <apex:actionFunction name="ShippmentDetail" action="{!ShippmentDetail}" reRender="allForm" onComplete="unblockUI();fixDeliveryType();resetDetailDivMargintop();" > <apex:param name="firstParam" assignTo="{!CheckedId}" value="" /> </apex:actionFunction> <apex:actionFunction name="ShippmentAdd" action="{!ShippmentAdd}" > <apex:param name="firstParam" assignTo="{!UnCheckedId}" value="" /> </apex:actionFunction> <apex:inputHidden value="{!done_flg}" id="done_flg"/> <div id="main"> <div id="hander" class="freezehander"> <apex:outputPanel id="message"> <apex:pageMessages /> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}"> <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:outputPanel> <!-- <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> <!-- 状态切换btn --> <th colspan="2" style="font-size:20px;text-align: center;width:380px;"> <ul id="Step_tab"> <!-- <apex:outputPanel layout="none" rendered="{!IF(Step_status='运输单', true, false)}"> <li onclick="javascript:Shippment();return false" class="selected"><span>运输单</span></li> <li onclick="javascript:ShippmentDetail();return false"><span>明细</span></li> <li onclick="javascript:ShippmentAdd();return false"><span>追加</span></li> </apex:outputPanel> --> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}"> <li onclick="javascript:ShippmentAddJs();return false"><span class="tabsize">追加</span></li> <li class="selected"><span>明细</span></li> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(Step_status='追加', true, false)}"> <li class="selected"><span>追加</span></li> <li onclick="javascript:ShippmentDetail();return false"><span class="tabsize">明细</span></li> </apex:outputPanel> </ul> </th> </tr> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}" id="slipPanel"> <tr> <td colspan="2"><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, true, false)}"><span style="margin-left:30px;font-weight: bold;font-size: 15px;">新建</span></apex:outputPanel><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, false, true)}"><span style="margin-left:30px;font-weight: bold;">编辑：[{!slip.DeliveryCompany_SlipNo__c}]</span></apex:outputPanel></td> </tr> <tr> <td style="text-align: right;" class="deliveryslip">发货-运输单号 ： </td> <td align="left"> <!-- 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" style="margin-left:0; "/> <!-- 2023-04-23 zyh lightning升级 --> </td> </tr> <tr> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryType__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;" id="DeliveryType"/></td> </tr> <tr> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Distributor_method__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;" id="DistributorMethod"/></td> </tr> <tr> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryCompany__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;" id="DeliveryCompany"/></td> </tr> <tr> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Wh_Staff__c.label} </td> <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Wh_Staff__c}" style="width:130px;" /></td> </tr> <tr> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Combine_Pack__c.label} </td> <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Combine_Pack__c}" style="width:130px;" /></td> </tr> <!-- <tr> <td colspan="2"><apex:inputField value="{!slip.Wh_Staff__c}" style="width:130px;" /></td> </tr> --> </apex:outputPanel> </table> <div style="text-align: right"> <apex:commandButton styleClass="commandbutton" onclick="qrsacn(0)" value="扫一扫申请书" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/> <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/> <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="追加" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/> </div> </div> <apex:outputPanel id="detail"> <div id="detailDiv" class="detail"> <apex:inputHidden value="{!ApplyId}" id="applyId"/> <apex:outputPanel layout="none" rendered="{!IF(Step_status='追加', true, false)}"> <apex:variable var="indexloop" value="{!0}" /> <apex:variable var="applychange" value="{!0}" /> <apex:variable var="SetName" value="" /> <apex:variable var="SetName2" value="" /> <apex:repeat value="{!esdList}" var="esdInfo" id="esdList2"> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <apex:variable var="indexloop" value="{!indexloop+1}"/> <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, SetName)}" /> <apex:variable var="SetName2" value="{!IF(SetName2='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, SetName2)}" /> <apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id && indexloop != 1, true, false)}"> <br/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, false, true)}"> <hr/> <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2> <br/> <apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}" /> <apex:variable var="applychange" value="{!1}" /> <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, false, true)}"> <apex:outputPanel layout="none" rendered="{!IF(applychange=1, false, true)}"> <hr/> </apex:outputPanel> <apex:variable var="applychange" value="{!0}" /> <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> <!-- 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)}"> <!-- 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> <!-- 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> <div class="r2"></div> <div class="r3"></div> <div class="r4"></div> </div> <div class="menu"> <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> </div></h2> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul> <li> <!-- 20210721 ljh 1719 start --> <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}： </span> --> <span>发货前-检测结果： </span> <!-- 20210721 ljh 1719 end --> <span><apex:outputField value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:150px" /></span> </li> <li><span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_NG__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:150px" /></span> </li> <li><span>上次回收后检测时间： </span> <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span> </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> </li> </ul> </div> <div class="rbottom"> <div class="r4"></div> <div class="r3"></div> <div class="r2"></div> <div class="r1"></div> </div> </apex:outputPanel> </apex:repeat> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}"> <apex:variable var="indexloop" value="{!0}" /> <apex:variable var="SetName" value="" /> <apex:repeat value="{!esdList}" var="esdInfo" id="esdList"> <apex:outputPanel layout="none" rendered="{!esdInfo.isChecked || esdInfo.hasSended}"> <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/> </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><apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/> <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><apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}"> <div class="rtopg"> <div class="r1"></div> <div class="r2"></div> <div class="r3"></div> <div class="r4"></div> </div> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <div class="rtop"> <div class="r1"></div> <div class="r2"></div> <div class="r3"></div> <div class="r4"></div> </div> </apex:outputPanel> <div class="menu"> <apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}"> <h2><div class="m_titleg"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> 已发送</div> </h2> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> </div> </h2> </apex:outputPanel> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul> <li><span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:150px" /></span> </li> <li><span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_NG__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:150px" /></span> </li> <li><span>上次回收后检测时间： </span> <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span> </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> </li> </ul> </div> <div class="rbottom"> <div class="r4"></div> <div class="r3"></div> <div class="r2"></div> <div class="r1"></div> </div> </apex:outputPanel> <apex:inputCheckbox value="{!esdInfo.isChecked}" style="display: none"/> </apex:repeat> </apex:outputPanel> </div> </apex:outputPanel> </div> <script type="text/javascript"> var standalone = window.navigator.standalone, 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 ",""); let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false}); scanner.addListener('scan', function (content) { filljsQR(content); }); function qrsacn(stype) { scanType = stype; if (!standalone && !safari && ios) { window.location.href="sfqr://scan"; } else { j$(".modal").show(); Instascan.Camera.getCameras().then(function (cameras) { if (cameras.length > 0) { if (ver >= 13) { scanner.start(cameras[1]); } else { scanner.start(cameras[0]); } } else { console.error('No cameras found.'); } }).catch(function (e) { console.error(e); <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> <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> <apex:includeScript value="{!URLFOR($Resource.instascan)}"/> <apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/> <script type="text/javascript"> function savejs() { blockme(); save(); } function deleteDetailJs(ele) { blockme(); deleteDetail(j$(ele).next().val()); } var scanType; function filljsQR(qrcode) { if(!qrcode)return; blockme(); if(scanType == 1){ j$("input[name$='SlipNo']").val(qrcode); unblockUI(); } else{ var aId = j$(escapeVfId('allPage:allForm:applyId')).val(); aId = aId + "," + qrcode; var resdid = ''; j$("input[type=checkbox]:checked").each(function() { resdid += j$(this).next().val()+","; }); resdid = resdid.slice(0,-1); filljsQRAction(aId, resdid); } j$("#scanedqr").append("<li>"+qrcode+"</li>"); j$("#scanedqr").animate({ scrollTop: j$("#scanedqr").prop("scrollHeight")}, 1000); } function addToDetail() { blockme(); var resdid = ''; var warning = false; j$("input[type=checkbox]:checked").each(function() { resdid += j$(this).next().val()+":"; var applyid = j$(this).next().next().val(); if (!warning) warning = j$("[data-ngnum='"+applyid+"']").val() > 0; }); resdid = resdid.slice(0,-1); if (warning) { alert("申请单内存在不符合发货状态的配套，请跟进完成配套后续操作或分割申请单!") unblockUI(); return; } ShippmentDetail(resdid); // resetDetailDivMargintop(); } function checkAllDetail() { j$('input[type="checkbox"]').prop("checked",true); } function ShippmentAddJs() { // 20230620 ljh start // j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:SlipNo')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:DistributorMethod')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:DeliveryCompany')).prop("disabled", true); // 20230620 ljh end ShippmentAdd(); // resetDetailDivMargintop(); } function checkMessage() { if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') { alert("保存完了"); } } function stopScan() { scanner.stop().then(function () { j$(".modal").hide(); }); j$("#scanedqr").children().remove(); function fixDeliveryType() { // 20230620 ljh start // j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() { j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).children().each(function() { // 20230620 ljh end if (this.value == '回寄') j$(this).remove(); }) } j$(document).ready(function(){ j$( '#qrcode' ).unbind(); j$( '#qrcode' ).keypress( function ( e ) { if ( e.which == 13 ) { filljsQR(j$( '#qrcode' ).val()); return false; function resetDetailDivMargintop() { var handerHeight = document.getElementById('hander').clientHeight; document.getElementById('detailDiv').style.marginTop = handerHeight + 'px'; } window.onload = function hiddenName(){ if( document.getElementById('allPage:allForm:CDS_staff_mlktp')){ document.getElementById('allPage:allForm:CDS_staff_mlktp').style.visibility="hidden" ; document.getElementById('allPage:allForm:CDS_staff_mlktp').style.width="200px" ; } resetDetailDivMargintop(); } </script> <style type="text/css"> .hideDropdown select{ display: none } .menu div.m_title{ /*width: 308px;*//*20230619 ljh*/ text-align: left; margin: 0; background:#95aee5; /*height: 42px;*/ padding-left: 0.75rem;/*20230721 ljh */ } .menu div.m_titleg{ /*width: 308px;*//*20230619 ljh*/ text-align: left; margin: 0; background:#DCDCDC; /*height: 42px;*/ } .dateFormat { display: none; } #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; /* 20230619 ljh*/ /* width: 20%; */ width: 50%; /* 20230619 ljh*/ float: left; margin: 0; padding: 0; text-align: center; cursor: pointer; /*20230620 ljh*/ height:30px; line-height: 30px; /*20230620 ljh*/ } #Step_tab li span { margin: 0; padding: 15px 0 11px; color: #2daae1; font-size: 12px; font-weight: bold; line-height: 1; } #Step_tab li.selected { background: #3b5998; } #Step_tab li.selected span { color: #fff; } /*20230620 ljh*/ /*div#main { width: 320px; }*/ /*20230620 ljh*/ div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;} div.rtop div {background:#95aee5;} div.rtopg div {background:#DCDCDC;} 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;} div.r1 {margin: 0 5px; background:silver;} div.r2 {margin: 0 3px; border-width:0 2px;} div.r3 {margin: 0 2px;} div.r4 {margin: 0 1px; height: 2px;} hr { border-top: 2px dotted #f00; color: #fff; background-color: #fff; height: 1px; /*20230620 ljh start*/ /*width: 90%;*/ width: 98%; /*20230620 ljh end*/ } .close { color: #aaaaaa; float: right; font-size: 28px; font-weight: bold; } .close:hover, .close:focus { color: #000; text-decoration: none; cursor: pointer; } .menu blockquote{ margin: 0; padding: 1px; list-style: none; border-top: 1px solid #ddd; } /*20230621 ljh start*/ .lookupInput{ display: inline-block; position: relative; width: 145px; padding: 0; } .lookupInput input[type="text"]{ padding: 0; } /*20230621 ljh end*/ </style> <div id="myModal" class="modal"> <!-- Modal content --> <div class="modal-content"> <span class="close" onclick="stopScan()">×</span> <p>扫描中</p> <p>Code:<input type="text" id="qrcode"/></p> <video playsinline="true" id="preview" style="width: 100%;z-index: 11;transform: scaleX(-1);margin-top: 10px;"></video> 扫码履历： <ul id="scanedqr" style="list-style-type: none; text-align: center;padding: 0;width: 100%; height: 100px; overflow: auto"> </ul> </div> </div> <apex:form id="allForm"> <!-- 20230721 ljh resetDetailDivMargintop() --> <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="unblockUI();checkMessage();resetDetailDivMargintop();" /> <apex:actionFunction name="filljsQRAction" action="{!filljsQRAction}" rerender="detail,message" oncomplete="unblockUI();resetDetailDivMargintop();"> <apex:param name="firstParam" assignTo="{!ApplyId}" value="" /> <apex:param name="secondParam" assignTo="{!CheckedId}" value="" /> </apex:actionFunction> <apex:actionRegion > <apex:actionFunction name="deleteDetail" action="{!deleteDetail}" rerender="detail,message" oncomplete="unblockUI();resetDetailDivMargintop();"> <apex:param name="firstParam" assignTo="{!UnCheckedId}" value="" /> </apex:actionFunction> </apex:actionRegion> <!-- <apex:actionFunction name="Shippment" action="{!Shippment}" /> --> <!-- 20230722 ljh --> <apex:actionFunction name="searchSlip" action="{!searchSlip}" reRender="allForm" onComplete="unblockUI();fixDeliveryType();resetDetailDivMargintop();" /> <!-- 20230722 ljh --> <apex:actionFunction name="ShippmentDetail" action="{!ShippmentDetail}" reRender="allForm" onComplete="unblockUI();fixDeliveryType();resetDetailDivMargintop();" > <apex:param name="firstParam" assignTo="{!CheckedId}" value="" /> </apex:actionFunction> <apex:actionFunction name="ShippmentAdd" action="{!ShippmentAdd}" > <apex:param name="firstParam" assignTo="{!UnCheckedId}" value="" /> </apex:actionFunction> <apex:inputHidden value="{!done_flg}" id="done_flg"/> <div id="main"> <div id="hander" class="freezehander"> <apex:outputPanel id="message"> <apex:pageMessages /> </apex:outputPanel> <apex:pageBlock id="newHeader"> <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;"> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}"> <li onclick="javascript:ShippmentAddJs();return false"><span class="tabsize">追加</span></li> <li class="selected"><span>明细</span></li> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(Step_status='追加', true, false)}"> <li class="selected"><span>追加</span></li> <li onclick="javascript:ShippmentDetail();return false"><span class="tabsize">明细</span></li> </apex:outputPanel> </ul> </th> <th width="900px;" style="padding-left:50px;" class="myBtn"> <apex:commandButton styleClass="commandbutton" onclick="qrsacn(0)" value="扫一扫申请书" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/> <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/> <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="追加" rerender="dummy" rendered="{!IF(Step_status='追加', true, false)}"/> <apex:outputPanel layout="none" 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;"/> </apex:outputPanel> </th> </tr> </table> <table style="border-collapse: collapse; font-size:13px;" width="80%"> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}" id="slipPanel"> <tr> <td colspan="2"><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, true, false)}"><span style="margin-left:30px;font-weight: bold;font-size: 15px;">新建</span></apex:outputPanel><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, false, true)}"><span style="margin-left:30px;font-weight: bold;">编辑：[{!slip.DeliveryCompany_SlipNo__c}]</span></apex:outputPanel></td> </tr> <tr> <td style="text-align: right;" class="deliveryslip">发货-运输单号 ： </td> <td align="left"> <!-- 2023-04-23 zyh lightning升级 --> <apex:inputField value="{!slip.Name}" style="width:145px;padding: 0;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" style="margin-left:5px;"/> <!-- 2023-04-23 zyh lightning升级 --> </td> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryType__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;height: 30px;padding: 0;" id="DeliveryType"/></td> </tr> <tr> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Distributor_method__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;height: 30px;padding: 0;" id="DistributorMethod"/></td> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryCompany__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;height: 30px;padding: 0;" id="DeliveryCompany"/></td> </tr> <tr> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Wh_Staff__c.label} </td> <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Wh_Staff__c}" style="width:130px;height: 30px;" /></td> <td style="text-align: right" class="deliveryslip">发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Combine_Pack__c.label} </td> <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Combine_Pack__c}" style="width:145px;" /></td> </tr> <!-- <tr> <td colspan="2"><apex:inputField value="{!slip.Wh_Staff__c}" style="width:130px;" /></td> </tr> --> </apex:outputPanel> </table> </apex:pageBlock> <!-- 20230620 ljh --> </div> <apex:outputPanel id="detail"> <div id="detailDiv" class="detail"> <apex:inputHidden value="{!ApplyId}" id="applyId"/> <apex:outputPanel layout="none" rendered="{!IF(Step_status='追加', true, false)}"> <apex:variable var="indexloop" value="{!0}" /> <apex:variable var="applychange" value="{!0}" /> <apex:variable var="SetName" value="" /> <apex:variable var="SetName2" value="" /> <apex:repeat value="{!esdList}" var="esdInfo" id="esdList2"> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <apex:variable var="indexloop" value="{!indexloop+1}"/> <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, SetName)}" /> <apex:variable var="SetName2" value="{!IF(SetName2='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, SetName2)}" /> <apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id && indexloop != 1, true, false)}"> <!-- <br/> --> <!-- 20230623 ljh --> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, false, true)}"> <hr/> <!-- 20230620 ljh start --> <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2> --> <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</span> <br/> <!-- 20230620 ljh end --> <apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}" /> <apex:variable var="applychange" value="{!1}" /> <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, false, true)}"> <apex:outputPanel layout="none" rendered="{!IF(applychange=1, false, true)}"> <hr/> </apex:outputPanel> <apex:variable var="applychange" value="{!0}" /> <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Rental_Apply_Equipment_Set__r.Inspection_not_finish__c > 0, false, true)}"> <!-- 20230721 ljh --> <apex:inputCheckbox value="{!esdInfo.isChecked}" style="margin:0 0 0 0.75rem;"/> <input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/> </apex:outputPanel> <!-- 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)}"> <!-- 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 0.75rem;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)}"> <!-- 20230721 ljh --> <apex:inputCheckbox value="{!esdInfo.isChecked}" style="margin:0 0 0 0.75rem;"/> <input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/> </apex:outputPanel> <!-- 2023-04-26 zyh lightning升级 start --> <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> <!-- <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> <div class="r2"></div> <div class="r3"></div> <div class="r4"></div> </div> <div class="menu"> <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> </div></h2> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <!-- 20230721 ljh --> <ul style="padding: 1px 0.75rem;" > <li> <!-- 20210721 ljh 1719 start --> <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}： </span> --> <span>发货前-检测结果： </span> <!-- 20210721 ljh 1719 end --> <span><apex:outputField value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:150px" /></span> </li> <li><span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_NG__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:150px" /></span> </li> <li><span>上次回收后检测时间： </span> <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span> </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> </li> </ul> </div> <div class="rbottom"> <div class="r4"></div> <div class="r3"></div> <div class="r2"></div> <div class="r1"></div> </div> </apex:outputPanel> </apex:repeat> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}"> <apex:variable var="indexloop" value="{!0}" /> <apex:variable var="SetName" value="" /> <apex:repeat value="{!esdList}" var="esdInfo" id="esdList"> <apex:outputPanel layout="none" rendered="{!esdInfo.isChecked || esdInfo.hasSended}"> <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/> --> <!-- 20230623 ljh --> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, false, true)}"> <hr/> <!-- 20230721 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 layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/> <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)}"> <!-- 20230721 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 layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}"> <div class="rtopg"> <div class="r1"></div> <div class="r2"></div> <div class="r3"></div> <div class="r4"></div> </div> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <div class="rtop"> <div class="r1"></div> <div class="r2"></div> <div class="r3"></div> <div class="r4"></div> </div> </apex:outputPanel> <div class="menu"> <apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}"> <h2><div class="m_titleg"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> 已发送</div> </h2> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> </div> </h2> </apex:outputPanel> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <!-- 20230721 ljh --> <ul style="padding: 1px 0.75rem;"> <li> <!-- 20230626 ljh start--> <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}： </span> --> <span>发货前-检测结果： </span> <!-- 20230626 ljh end--> <span><apex:outputField value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:150px" /></span> </li> <li><span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_NG__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:150px" /></span> </li> <li><span>上次回收后检测时间： </span> <span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span> </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> </li> </ul> </div> <div class="rbottom"> <div class="r4"></div> <div class="r3"></div> <div class="r2"></div> <div class="r1"></div> </div> </apex:outputPanel> <apex:inputCheckbox value="{!esdInfo.isChecked}" style="display: none"/> </apex:repeat> </apex:outputPanel> </div> </apex:outputPanel> </div> <script type="text/javascript"> var standalone = window.navigator.standalone, userAgent = window.navigator.userAgent.toLowerCase(), safari = /safari/.test( userAgent ), ios = /iphone|ipod|ipad/.test( userAgent ), // 20230619 ljh // 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 ",""); } // 20230619 ljh let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false}); scanner.addListener('scan', function (content) { filljsQR(content); }); function qrsacn(stype) { scanType = stype; if (!standalone && !safari && ios) { window.location.href="sfqr://scan"; } else { j$(".modal").show(); Instascan.Camera.getCameras().then(function (cameras) { if (cameras.length > 0) { if (ver >= 13) { scanner.start(cameras[1]); } else { scanner.start(cameras[0]); } } else { console.error('No cameras found.'); } }).catch(function (e) { console.error(e); }); } } }); }); </script> </apex:form> </apex:page> function stopScan() { scanner.stop().then(function () { j$(".modal").hide(); }); j$("#scanedqr").children().remove(); } j$(document).ready(function(){ j$( '#qrcode' ).unbind(); j$( '#qrcode' ).keypress( function ( e ) { if ( e.which == 13 ) { filljsQR(j$( '#qrcode' ).val()); return false; } }); }); </script> </apex:form> </apex:page> force-app/main/default/pages/EquipmentSetShippmentReceived4.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"> @@ -51,12 +52,21 @@ deleteDetail(j$(ele).next().val()); } function changeCheckLost(ele) { var ele1 = j$(ele).parent().parent().find('[name$="checkboxCDS"]'); var ele2 = j$(ele).parent().parent().find('[name$="checkboxGiveUp"]'); var ele3 = j$(ele).parent().parent().find('select[id$="checkLost"]'); var ele4 = j$(ele).parent().parent().find('span[id$="checkLost3"]'); var ele5 = j$(ele).parent().parent().find('input[id$="lostMemo"]'); var ele6 = j$(ele).parent().parent().find('input[id$="lostMemo2"]'); // 20230722 ljh start // var ele1 = j$(ele).parent().parent().find('[name$="checkboxCDS"]'); // var ele2 = j$(ele).parent().parent().find('[name$="checkboxGiveUp"]'); // var ele3 = j$(ele).parent().parent().find('select[id$="checkLost"]'); // var ele4 = j$(ele).parent().parent().find('span[id$="checkLost3"]'); // var ele5 = j$(ele).parent().parent().find('input[id$="lostMemo"]'); // var ele6 = j$(ele).parent().parent().find('input[id$="lostMemo2"]'); var ele1 = j$(ele).parent().parent().parent().find('[name$="checkboxCDS"]'); var ele2 = j$(ele).parent().parent().parent().find('[name$="checkboxGiveUp"]'); var ele3 = j$(ele).parent().parent().parent().find('select[id$="checkLost"]'); var ele4 = j$(ele).parent().parent().parent().find('span[id$="checkLost3"]'); var ele5 = j$(ele).parent().parent().parent().find('input[id$="lostMemo"]'); var ele6 = j$(ele).parent().parent().parent().find('input[id$="lostMemo2"]'); // 20230722 ljh end var lastken = ele3.val() == '欠品' || ele4.text() == '欠品'; ele5.prop('disabled', true); ele6.prop('disabled', true); @@ -96,8 +106,11 @@ } function changeCheckCds(ele) { var ele1 = j$(ele).parent().parent().find('[name$="CDSChargement"]'); var ele2 = j$(ele).parent().parent().find('[name$="CDSType"]'); console.log(ele); // var ele1 = j$(ele).parent().parent().find('[name$="CDSChargement"]'); // var ele2 = j$(ele).parent().parent().find('[name$="CDSType"]'); var ele1 = j$(ele).parent().parent().parent().find('[name$="CDSChargement"]'); var ele2 = j$(ele).parent().parent().parent().find('[name$="CDSType"]'); if (ele1 != null && ele2 != null) { if (j$(ele).prop("checked") == true) { ele1.prop('disabled', false); @@ -242,17 +255,29 @@ changeCheckCds(cds); } function ShippmentAddJs() { j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true); // 20230621 ljh start // j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:SlipNo')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:DistributorMethod')).prop("disabled", true); j$(escapeVfId('allPage:allForm:newHeader:DeliveryCompany')).prop("disabled", true); // 20230621 ljh end ShippmentAdd(); } function ShippmentDetailJs() { // 20230621 ljh start j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true); j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:newHeader:SlipNo')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:newHeader:DistributorMethod')).prop("disabled", true); // j$(escapeVfId('allPage:allForm:newHeader:DeliveryCompany')).prop("disabled", true); // 20230621 ljh end ShippmentDetail(); } @@ -279,10 +304,13 @@ } function fixDeliveryType() { j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() { // 20230621 ljh start // j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() { j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).children().each(function() { // 20230621 ljh end if (this.value == '发货') j$(this).remove(); }) j$("input[name='noSlip']").prev().children().each(function() { j$(this).children().each(function() { if (this.value == 'OK') j$(this).remove(); @@ -297,81 +325,106 @@ // j$("select[name$='checkLost2']").trigger('change'); // j$("select[name$='checkLost']").trigger('change'); // 20230722 ljh start parent() 相关 start // select checkLost 最初 select checkLost2 最终 // 文本 span checkLost3 最初 span checkLost4 最终 j$("select[name$='checkLost2']").each(function() { if (j$(this).val() == '欠品' || j$(this).val() == '消耗' || j$(this).val() == '' ) { j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true); j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true); j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true); // j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true); // j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true); // j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true); j$(this).parent().parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true); j$(this).parent().parent().parent().find('[name$="CDSChargement"]').prop('disabled',true); j$(this).parent().parent().parent().find('[name$="CDSType"]').prop('disabled',true); } if (j$(this).val() == '欠品' ) { j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false); // j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false); j$(this).parent().parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false); } else { j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true); // j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true); j$(this).parent().parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true); } }) j$("select[name$='checkLost']").each(function() { if (j$(this).val() == '欠品' || j$(this).val() == '消耗' || j$(this).val() == '' ) { j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true); j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true); j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true); // j$(this).parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true); // j$(this).parent().parent().find('[name$="CDSChargement"]').prop('disabled',true); // j$(this).parent().parent().find('[name$="CDSType"]').prop('disabled',true); j$(this).parent().parent().parent().find('[name$="checkboxCDS"]').prop('disabled',true); j$(this).parent().parent().parent().find('[name$="CDSChargement"]').prop('disabled',true); j$(this).parent().parent().parent().find('[name$="CDSType"]').prop('disabled',true); } if (j$(this).val() == '欠品' ) { j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',false); // j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',false); j$(this).parent().parent().parent().find('input[id$="lostMemo"]').prop('disabled',false); } else { j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',true); // j$(this).parent().parent().find('input[id$="lostMemo"]').prop('disabled',true); j$(this).parent().parent().parent().find('input[id$="lostMemo"]').prop('disabled',true); } }) j$('span[id$="checkLost3"]').each(function() { if (j$(this).text() == '欠品') { j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) } j$(this).parent().find('[name$="lostMemo"]').prop('disabled',true) j$(this).parent().find('[name$="lostMemo"]').hide() // j$(this).parent().find('[name$="lostMemo"]').prop('disabled',true) // j$(this).parent().find('[name$="lostMemo"]').hide() j$(this).parent().parent().find('[name$="lostMemo"]').prop('disabled',true) j$(this).parent().parent().find('[name$="lostMemo"]').hide() }) j$('select[id$="checkLost"]').each(function() { if (j$(this).val() == '欠品') { j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) } }) j$('span[id$="checkLost"]').each(function() { if (j$(this).children().text() == '欠品') { j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) } }) j$('span[id$="checkLost4"]').each(function() { if (j$(this).text() == '欠品') { j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',false); j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) // j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',false); // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',false); j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) } else if (j$(this).text() != '') { j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',true); j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) // j$(this).parent().find('input[id$="lostMemo2"]').prop('disabled',true); // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) j$(this).parent().parent().find('input[id$="lostMemo2"]').prop('disabled',true); j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) } }) j$('span[id$="checkLost2"]').each(function() { if (j$(this).children().text() == '欠品') { j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) } else if (j$.trim(j$(this).text()) != '') { j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) } }) j$('select[id$="checkLost2"]').each(function() { if (j$(this).val() == '欠品') { j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) // j$(this).parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) } else if (j$(this).val() != '') { j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) j$(this).parent().parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',true) } }) j$('img[alt="チェック"]').each(function() { // j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) j$(this).parent().parent().find('[name$="checkboxGiveUp"]').prop('disabled',false) }) // 20230722 ljh start parent() 相关 end j$('input[id$="noitem"]').prop('disabled', true); } @@ -380,7 +433,8 @@ if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') { alert("保存完了"); if (need_redirect){ window.location.href = window.location.href + '&done=1'; // window.location.href = window.location.href + '&done=1'; window.location.reload(false); } } else if (checked_raes) { var carray = checked_raes.split(","); @@ -404,8 +458,6 @@ // j$("[name$='checkLost']").each(function() { // changeCheckLost(this); // }); } </script> @@ -414,14 +466,15 @@ display: none } .menu div.m_title{ width: 308px; /*width: 308px;*//*20230620 ljh */ text-align: left; margin: 0; background:#95aee5; /*height: 42px;*/ padding-left: 0.75rem;/*20230721 ljh */ } .menu div.m_titleg{ width: 308px; /*width: 308px;*/ text-align: left; margin: 0; background:#DCDCDC; @@ -441,15 +494,19 @@ } #Step_tab li { position: relative; /* 2023-04-23 zyh lightning升级 start */ /* 20230619 ljh*/ /* width: 20%; */ width: 30%; /* 2023-04-23 zyh lightning升级 end */ width: 50%; /* 20230619 ljh*/ float: left; margin: 0; padding: 0; text-align: center; cursor: pointer; /*20230620 ljh*/ height:30px; line-height: 30px; /*20230620 ljh*/ } #Step_tab li span { margin: 0; @@ -465,11 +522,11 @@ #Step_tab li.selected span { color: #fff; } div#main { /*20230620 ljh start*/ /*div#main { width: 320px; } }*/ /*20230620 ljh end*/ div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;} div.rtopg div {background:#DCDCDC;} div.rtop div {background:#95aee5;} @@ -485,7 +542,10 @@ color: #fff; background-color: #fff; height: 1px; width: 90%; /*20230620 ljh start*/ /*width: 90%;*/ width: 98%; /*20230620 ljh end*/ } .close { color: #aaaaaa; @@ -525,6 +585,23 @@ #alertbox > div > #alertboxbody{ background:white; padding:10px; color:red; } #alertbox > div > #alertboxbody1{ background:white; padding:10px; color:blue; } #alertbox > div > #alertboxfoot{ background:white; padding:3px; text-align:right; } /*20230621 ljh start*/ .lookupInput{ display: inline-block; position: relative; width: 145px; padding: 0; } .lookupInput input[type="text"]{ padding: 0; } .errorMsg{ width: 140px; } .mytable tr{ height: 35px; } /*20230621 ljh end*/ </style> <div id="myModal" class="modal"> @@ -553,7 +630,7 @@ <apex:form id="allForm"> <!-- OCM_OLY-435 追加 window.location.reload(false) 保存后刷新画面 しないと、triggerにて更新した値がVFに反映されない --> <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="checkMessage(true);unblockUI();resetDetailDivMargintop();resetDetailDivMargintop();" /> <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="checkMessage(true);unblockUI();resetDetailDivMargintop();" /> <apex:actionFunction name="filljsQRAction" action="{!filljsQRAction}" rerender="detail,message" oncomplete="unblockUI();resetDetailDivMargintop();"> <apex:param name="firstParam" assignTo="{!ApplyId}" value="" /> <apex:param name="secondParam" assignTo="{!CheckedId}" value="" /> @@ -565,7 +642,8 @@ </apex:actionRegion> <apex:actionFunction name="saveToSlip" action="{!ShippmentDetail}" /> <apex:actionFunction name="ShippmentDetail" action="{!ShippmentDetail}" /> <apex:actionFunction name="ShippmentDetailAdd" action="{!ShippmentDetailAdd}" rerender="allForm" onComplete="unblockUI();checkMessage(false);resetDetailDivMargintop();"> <!-- 20230722 ljh --> <apex:actionFunction name="ShippmentDetailAdd" action="{!ShippmentDetailAdd}" rerender="allForm" onComplete="unblockUI();checkMessage(true);resetDetailDivMargintop();"> <apex:param name="firstParam" assignTo="{!CheckedSetId}" value="" /> </apex:actionFunction> <apex:actionFunction name="ShippmentAdd" action="{!ShippmentAdd}" /> @@ -576,24 +654,18 @@ <apex:outputPanel id="message"> <apex:pageMessages /> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}"> <div style="text-align: right;margin-top: 10px;"> <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="保存"/> </div> <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/> </apex:outputPanel> <!-- 2023-04-26 zyh lightning升级 start --> <!-- <table style="border-collapse: collapse; font-size:13px;"> --> <table style="border-collapse: collapse; font-size:13px; width:340px;"> <!-- 2023-04-26 zyh lightning升级 end --> <colgroup> <col width="150" /> <col width="170" /> <!-- </div> --> <!-- 20230621 ljh start --> <apex:pageBlock id="newHeader"> <table style="border-collapse: collapse; font-size:13px;"> <colgroup> <col width="20%" /> <col width="80%" /> </colgroup> <tr> <!-- 状态切换btn --> <th colspan="2" style="font-size:20px;text-align: center;width:380px;"> <ul id="Step_tab"> <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(Step_status='明细', true, false)}"> <li onclick="javascript:ShippmentAddJs();return false"><span class="tabsize">回寄</span></li> <li class="selected"><span class="tabsize">欠品</span></li> @@ -606,7 +678,29 @@ </apex:outputPanel> </ul> </th> <th width="900px;" style="padding-left:50px;" class="myBtn"> <!-- <apex:outputPanel layout="none" rendered="{!IF(Step_status='明细', true, false)}"> <div style="text-align: right;"> <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="保存"/> </div> <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/> </apex:outputPanel> --> <apex:outputPanel rendered="{!Step_status='追加' && !isSameCity}"> <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫申请书" rerender="dummy" /> <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/> <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="保存" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/> </apex:outputPanel> <apex:outputPanel rendered="{!Step_status!='追加'}"> <apex:commandButton styleClass="commandbutton" onclick="qrsacnDetail()" value="扫一扫备品" rerender="dummy" /> <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail2();return false" value="全部OK" rerender="dummy" /> <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="保存"/> <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/> </apex:outputPanel> <input type="hidden" id="QRType" value="1"/> </th> </tr> </table> <table style="border-collapse: collapse; font-size:13px;" width="80%" class="mytable"> <apex:outputPanel layout="none" rendered="{!Step_status='追加' && !isSameCity }" id="slipPanel"> <tr> <td colspan="2"><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, true, false)}"><span style="margin-left:30px;font-weight: bold;">新建</span></apex:outputPanel><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, false, true)}"><span style="margin-left:30px;font-weight: bold;">编辑：[{!slip.DeliveryCompany_SlipNo__c}]</span></apex:outputPanel></td> @@ -614,41 +708,31 @@ <apex:actionRegion > <tr> <td style="text-align: right">回寄-运输单号 ： </td> <td align="left"><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="检索"/></td> <td align="left"> <apex:inputField value="{!slip.Name}" style="width:145px;padding: 0;float:left;" id="SlipNo"/> <apex:commandButton styleClass="commandbutton" onclick="blockme();searchSlip();return false;" style="float:left;" value="检索"/> </td> <apex:actionFunction name="searchSlip" action="{!searchSlip}" reRender="allForm" onComplete="unblockUI();fixDeliveryType();resetDetailDivMargintop();" /> </tr> <tr> <td style="text-align: right">回寄-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryType__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;" id="DeliveryType"/></td> <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;height: 30px;" id="DeliveryType"/></td> </tr> <tr> <td style="text-align: right">回寄-{!$ObjectType.FixtureDeliverySlip__c.fields.Distributor_method__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;" id="DistributorMethod"/></td> </tr> <tr> <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;height: 30px;padding: 0;" id="DistributorMethod"/></td> <td style="text-align: right">回寄-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryCompany__c.label} ： </td> <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;" id="DeliveryCompany"/></td> <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;height: 30px;padding: 0;" id="DeliveryCompany"/></td> </tr> </apex:actionRegion> <tr> <td style="text-align: right">回寄-{!$ObjectType.FixtureDeliverySlip__c.fields.Wh_Staff__c.label} ： </td> <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Wh_Staff__c}" style="width:130px;" /></td> <td colspan="2"></td> </tr> </apex:outputPanel> </table> <apex:outputPanel style="float: right;" rendered="{!Step_status='追加' && !isSameCity}"> <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫申请书" rerender="dummy" /> <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="全选" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/> <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="保存" rerender="dummy" rendered="{! (!showTab2 || isEquipmentCenter)}"/> </apex:outputPanel> <apex:outputPanel style="float: right;" rendered="{!Step_status!='追加'}"> <apex:commandButton styleClass="commandbutton" onclick="qrsacnDetail()" value="扫一扫备品" rerender="dummy" /> <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail2();return false" value="全部OK" rerender="dummy" /> </apex:outputPanel> <input type="hidden" id="QRType" value="1"/> </apex:pageBlock> </div> <!-- 20230621 ljh end --> <apex:outputPanel id="detail"> <div id="detailDiv" class="detail"> <apex:inputHidden value="{!ApplyId}" id="applyId"/> @@ -663,12 +747,17 @@ <apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, SetName)}" /> <apex:variable var="SetName2" value="{!IF(SetName2='', esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, SetName2)}" /> <apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id && indexloop != 1, true, false)}"> <br/> <!-- <br/> --> <!-- 20230623 ljh --> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name, false, true)}"> <hr/> <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2> <!-- 20230620 ljh start --> <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2> --> <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</span> <br/> <!-- 20230620 ljh end --> <apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}" /> <apex:variable var="applychange" value="{!1}" /> </apex:outputPanel> @@ -679,19 +768,32 @@ </apex:outputPanel> <apex:variable var="applychange" value="{!0}" /> <apex:outputPanel layout="none" rendered="{!esdInfo.showRaesCheck && !isSameCity}"> <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" /><input type="hidden" value="{!esdInfo.overtime}"/> <!-- 20230722 ljh --> <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" style="margin:0 0 0 0.75rem;" /> <input type="hidden" value="{!esdInfo.overtime}"/> </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> <!-- 20230620 ljh 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 0.75rem;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> <br/> <!-- 20230620 ljh 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> <!-- 20230621 ljh start --> <!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2> --> <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</span> <!-- 20230621 ljh end --> <br/> <apex:outputPanel layout="none" rendered="{!esdInfo.showRaesCheck && !isSameCity}"> <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')"/><input type="hidden" value="{!esdInfo.overtime}"/> <input type="checkbox" name="raesCheck" data-resid2="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" onchange="checkDetail(this, '{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" style="margin:0 0 0 0.75rem;"/> <input type="hidden" value="{!esdInfo.overtime}"/> </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> <!-- lightning升级start zyh title --> <span style="padding: 5px 0.75rem; 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> <!-- <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> --> <!-- lightning升级end zyh title --> </apex:outputPanel> <div class="rtop"> <div class="r1"></div> @@ -706,7 +808,8 @@ </apex:outputPanel> </div></h2> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul> <!-- 20230721 ljh --> <ul style="padding: 1px 0.75rem;" > <li><span>{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Received_Confirm__c.label}： </span> <span><apex:outputField value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Received_Confirm__c}" style="margin:3px;width:150px" /></span> </li> @@ -721,8 +824,15 @@ </li> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.NoItemReturn__c.label}： </span> <apex:inputField rendered="{!NOT(esdInfo.rec.Return_DeliverySlip__c != null)}" id="noitem" value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;" onchange="checkNoItem(this, '{!esdInfo.rec.Id}')"/> <span><apex:outputField rendered="{!esdInfo.rec.Return_DeliverySlip__c != null}" value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;"/></span> <!-- 20230621 ljh start--> <!-- <apex:inputField rendered="{!NOT(esdInfo.rec.Return_DeliverySlip__c != null)}" id="noitem" value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;" onchange="checkNoItem(this, '{!esdInfo.rec.Id}')"/> --> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.rec.Return_DeliverySlip__c != null)}"> <span><apex:inputField id="noitem" value="{!esdInfo.rec.NoItemReturn__c}" onchange="checkNoItem(this, '{!esdInfo.rec.Id}')"/></span> </apex:outputPanel> <!-- 20230621 ljh end --> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Return_DeliverySlip__c != null}"> <span><apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;"/></span> </apex:outputPanel> </li> </ul> </div> @@ -743,16 +853,19 @@ <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;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}：{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3> --> <span style="padding: 5px 0.75rem;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> <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> <!-- <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> --> <span style="padding: 5px 0.75rem;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> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <div class="rtop"> @@ -772,84 +885,166 @@ </apex:outputPanel> <div class="menu"> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"> <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/> --></div> <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/> --></div> </h2> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}"> <h2><div class="m_titleg"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="删除" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/>已回收 --></div> </h2> </apex:outputPanel> <!-- 20230620 ljh 欠品 -------------- --> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="font-size:14px;"> <!-- 20230721 ljh --> <ul data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="font-size:14px;padding: 1px 0.75rem;"> <apex:inputField value="{!esdInfo.rec.Loaner_accsessary__c}" style="display:none"/> <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), true, false)}"> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}"><apex:outputField value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px" /></apex:outputPanel> <li> <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item__c.label}： </span> --> <span>欠品结果（最初）：</span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"> <apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}" onchange="changeCheckLost(this)"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}"> <apex:outputField value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px" /> </apex:outputPanel> </li> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true )}"> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item__c.label} ： </span> <apex:outputField id="checkLost3" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px"/><br/> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item_Final__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" /></apex:outputPanel> <!-- #################上下一对####################### --> <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true)}"> <li> <!-- 20230623 ljh start--> <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item__c.label}： </span> --> <span>欠品结果（最初）：</span> <!-- 20230623 ljh end--> <apex:outputField id="checkLost3" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px"/> </li> <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Check_lost_Item_Final__c.label}： </span> --> <!-- <li> <span>欠品结果（最终）：</span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"> <span><apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"> <span><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" /></span> </apex:outputPanel> </li> --> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Return_DeliverySlip__c=null, true, false)}"> <input type="hidden" name="noSlip" value="1"/> </apex:outputPanel> <br/> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.NoItemReturn__c.label}： </span> <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;"/> <br/> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_Memo__c.label}： </span> <apex:outputPanel layout="none" rendered="{!esdInfo.editable}"> <apex:inputField id="lostMemo" value="{!esdInfo.rec.Lost_item_Memo__c}" style="margin:3px;width:75px;"/> <!-- <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.NoItemReturn__c.label}：</span> <span><apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;"/></span> </li> --> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_Memo__c.label}：</span> <apex:outputPanel layout="none" rendered="{!esdInfo.editable}"> <span><apex:inputField id="lostMemo" value="{!esdInfo.rec.Lost_item_Memo__c}" style="width:75px;"/> </span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || (esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK'))}"> <span><apex:outputField value="{!esdInfo.rec.Lost_item_Memo__c}" style="width:75px;"/></span> </apex:outputPanel> </li> <!-- 20230722 ljh 最终一对 start --> <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true)}"> <li> <span>欠品结果（最终）：</span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"> <apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"> <span><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" /></span> </apex:outputPanel> </li> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }"> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_Memo_Final__c.label}： </span> <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗'}"> <span><apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗'}"> <span><apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span> </apex:outputPanel> </li> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || (esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK'))}"> <apex:outputField value="{!esdInfo.rec.Lost_item_Memo__c}" style="margin:3px;width:75px;"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }"> <br/> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_Memo_Final__c.label}： </span> <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗'}"> <apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;width:75px;"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗'}"> <apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;width:75px;"/> </apex:outputPanel> </apex:outputPanel> <br/> <!-- 20230722 ljh 最终一对end--> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.NoItemReturn__c.label}：</span> <span><apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;"/></span> </li> <!-- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }"> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_Memo_Final__c.label}： </span> <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗'}"> <span><apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗'}"> <span><apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="width:75px;"/></span> </apex:outputPanel> </li> </apex:outputPanel> --> <apex:outputPanel layout="none" rendered="{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_giveup__c.accessible}"> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_giveup__c.label} ： <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && NOT(esdInfo.rec.Lost_item_giveup__c) && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Lost_item_giveup__c || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel> <br/> <li> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Lost_item_giveup__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && NOT(esdInfo.rec.Lost_item_giveup__c) && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"> <span><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Lost_item_giveup__c || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"> <span><apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}"/></span> </apex:outputPanel> </li> </apex:outputPanel> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDS_complete__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Return_DeliverySlip__c=null, false, true)}"> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="checkboxCDS" value="{!esdInfo.rec.CDS_complete__c}" onchange="changeCheckCds(this);"/></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField value="{!esdInfo.rec.CDS_complete__c}"/></apex:outputPanel> </apex:outputPanel> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDS_complete__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Return_DeliverySlip__c=null, false, true)}"> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"> <span><apex:inputField id="checkboxCDS" value="{!esdInfo.rec.CDS_complete__c}" onchange="changeCheckCds(this);"/></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"> <span><apex:outputField value="{!esdInfo.rec.CDS_complete__c}"/></span> </apex:outputPanel> </apex:outputPanel> </li> <apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Return_DeliverySlip__c=null, false, esdInfo.rec.Is_Body__c)}"> <br/> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDSChargement__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="CDSChargement" value="{!esdInfo.rec.CDSChargement__c}"/></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField value="{!esdInfo.rec.CDSChargement__c}"/></apex:outputPanel> <br/> <span> {!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDSType__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"><apex:inputField id="CDSType" value="{!esdInfo.rec.CDSType__c}"/></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"><apex:outputField value="{!esdInfo.rec.CDSType__c}"/></apex:outputPanel> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDSChargement__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"> <span><apex:inputField id="CDSChargement" value="{!esdInfo.rec.CDSChargement__c}"/></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"> <span><apex:outputField value="{!esdInfo.rec.CDSChargement__c}"/></span> </apex:outputPanel> </li> <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.CDSType__c.label} ： </span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '消耗')}"> <span><apex:inputField id="CDSType" value="{!esdInfo.rec.CDSType__c}"/></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '消耗')}"> <span><apex:outputField value="{!esdInfo.rec.CDSType__c}"/> </span> </apex:outputPanel> </li> </apex:outputPanel> <br/> <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> <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> </ul> </div> <div class="rbottom"> <!-- <div class="rbottom"> <div class="r4"></div> <div class="r3"></div> <div class="r2"></div> <div class="r1"></div> </div> </div> --> </apex:outputPanel> <apex:inputCheckbox Id="bbbaaa" value="{!esdInfo.isChecked}" style="display: none"/> </apex:repeat> 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> <!-- 状态切换btn --> <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> <!-- 状态切换btn --> <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 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <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>检测NG区分： </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>最终NG区分： </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>检测NG区分： </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); force-app/main/default/pages/EquipmentSetShippmentReceived6.page
@@ -123,11 +123,15 @@ </script> <style type="text/css"> .menu div.m_title{ width: 308px; /*width: 308px;*/ text-align: left; margin: 0; background:#DCDCDC; /*20230623 ljh start*/ /*background:#DCDCDC;*/ background:#95aee5; /*20230623 ljh end*/ /*height: 42px;*/ padding-left: 0.75rem;/*20230721 ljh */ } .dateFormat { display: none; @@ -143,15 +147,19 @@ } #Step_tab li { position: relative; /* 2023-04-23 zyh lightning升级 start */ /* 20230619 ljh*/ /* width: 20%; */ width: 30%; /* 2023-04-23 zyh lightning升级 end */ width: 50%; /* 20230619 ljh*/ 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; @@ -168,12 +176,17 @@ 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 { /*20230623 ljh start*/ /*background:#DCDCDC;*/ background:#95aee5; /*20230623 ljh end*/ } 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;} @@ -186,7 +199,10 @@ color: #fff; background-color: #fff; height: 1px; width: 90%; /*20230619 ljh start*/ /*width: 90%;*/ width: 98%; /*20230619 ljh end*/ } .close { color: #aaaaaa; @@ -246,33 +262,29 @@ <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> <!-- 状态切换btn --> <th colspan="2" style="font-size:20px;text-align: center;width:380px;"> <!-- 2023-04-26 zyh lightning升级 start --> <!-- <ul id="Step_tab"> --> <ul id="Step_tab" style="margin-left:0px;"> <!-- 2023-04-26 zyh lightning升级 end --> <li class="selected"><span class="tabsize">上架</span></li> </ul> </th> </tr> </table> <div style="font-size: 14px;">缺少一对一回库:<apex:inputCheckbox value="{!forceSave}" /></div> <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> <!-- 状态切换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"> @@ -318,19 +330,23 @@ <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> <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/> <!-- 20230722 ljh --> <!-- <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> --> <span style="padding: 5px 0.75rem;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> <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}" style="margin-bottom: 5px;" /> <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> <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}"/> </apex:outputPanel> <!-- 20230722 ljh --> <!-- <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> --> <span style="padding: 5px 0.75rem;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> <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.Rental_Apply_Equipment_Set__c}')" value="扫一扫附属品" rerender="dummy" rendered="{!IF(Step_status='上架', true, false)}" style="margin-bottom: 5px;"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!IF(esdInfo.errorInfo=null, false, true)}"> <div> <span style="color:red;font-weight: bold;">异常: </span><span style="color:red;font-weight: bold;">{!esdInfo.errorInfo}</span> @@ -346,26 +362,27 @@ <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.AssetName__c}" /> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Fixture_Set_Detail__r.Is_OneToOne__c && !esdInfo.rec.Substitute_flag__c}">(一对一附属品)</apex:outputPanel> </div></h2> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul> <!-- 20230722 ljh --> <ul style="padding: 1px 0.75rem;" > <!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> --> <li> <!-- <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_F__c}" style="margin:3px;width:75px;"/></span> <apex:outputField value="{!esdInfo.rec.Inspection_result_after_F__c}" style="margin:3px;"/></span> </li> <li> <!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_after_NG_F__c.label}： </span> --> <span>检测NG区分： </span><span> <apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_F__c}" style="margin:3px;width:75px;"/></span> <apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_F__c}" style="margin:3px;"/></span> </li> <!-- <li> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.OneToOne_Flag__c.label}： </span><span> <apex:outputField value="{!esdInfo.rec.OneToOne_Flag__c}" style="margin:3px;width:75px;"/></span> <apex:outputField value="{!esdInfo.rec.OneToOne_Flag__c}" style="margin:3px;"/></span> </li> --> <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;" /> <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;" /> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Fixture_Set_Detail__r.Is_OneToOne__c && !esdInfo.rec.Substitute_flag__c}"> <input type="hidden" name="onetoone" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/> </apex:outputPanel> @@ -375,25 +392,24 @@ </apex:outputPanel> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}"> <span><apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;width:75px;"/></span> <span><apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;"/></span> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Is_Body__c}"> <apex:variable var="main_loc" value="{!esdInfo.rec.Asset__r.WH_location__c}" /> </apex:outputPanel> </apex:outputPanel> </li> <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记 thh 2021-09-07 start --> <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记 thh 2021-09-07 start --> <apex:outputPanel layout="none" rendered="{!esdInfo.isShow}"> <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}"> <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.BoxInconsistent__c.label}： </span> <apex:outputPanel layout="none" rendered="{!esdInfo.editable}"> <apex:inputField id="inconsistent" value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;width:75px;" /> </apex:outputPanel> <span><apex:inputField id="inconsistent" value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;" /></span></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}"> <span><apex:outputField value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;width:75px;" /></span> <span><apex:outputField value="{!esdInfo.rec.BoxInconsistent__c}" style="margin:3px;" /></span> </apex:outputPanel> </li> </apex:outputPanel> <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记 thh 2021-09-07 end --> <!-- SFDC-C63DFK 上架时镜箱/周转箱不符的标记 thh 2021-09-07 end --> <!-- <apex:outputPanel layout="none" rendered="{!esdInfo.discardFlg}"> <li> @@ -408,15 +424,14 @@ <span><span>废弃区</span></span> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!esdInfo.editable && NOT(esdInfo.discardFlg)}"> <apex:inputField id="WHlocation" value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;" onchange="changeloc(this)"/> </apex:outputPanel> <span><apex:inputField id="WHlocation" value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;" onchange="changeloc(this)"/></span></apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) && NOT(esdInfo.discardFlg)}"> <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span> <span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;"/></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;"/></span> </li> <!-- </apex:outputPanel> --> <!-- </div> --> @@ -439,7 +454,14 @@ 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 ",""); // 20230619 ljh // 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 ",""); } // 20230619 ljh let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false}); function filljsQR(content) { force-app/main/default/pages/NotReceivingNoteListFirst.page
@@ -5,6 +5,7 @@ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/> <apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/> <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/> <script type="text/javascript"> var heightAjustment = 120; var widthAjustment = 30; force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page
@@ -1,10 +1,11 @@ <apex:page controller="NotReceivingNoteWaitingReceiptController" showHeader="false" action="{!init}" id="allPage"> <apex:page controller="NotReceivingNoteWaitingReceiptController" showHeader="false" action="{!init}" id="allPage" lightningStylesheets="true"> <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> <apex:stylesheet value="{!URLFOR($Resource.ReceivingNotePageCss)}"/> <apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/> <apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/> <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/> <apex:form > <!-- 此处隐式生成二维码图片，防止PDF页上的二维码崩坏 --> <!-- <apex:includeScript value="{!URLFOR($Resource.qrcode)}"/> --> force-app/main/default/pages/ReceivingNoteAcceptance.page
@@ -138,9 +138,13 @@ border-top-right-radius:10px; text-align: left; margin: 0; padding: 1%; width: 98%; background:#DCDCDC; /* lightning改造 zyh start */ /* padding: 1%; */ /* width: 98%; */ /* background:#DCDCDC; */ background:#95aee5; padding-left: 0.75rem; /* lightning改造 zyh end */ position: relative; } .checkintitle{ @@ -157,18 +161,26 @@ #Step_tab { list-style-type: none; padding: 0; margin: 0; height: 31px; border-bottom: 5px solid #3b5998; } #Step_tab li { position: relative; width: 20%; /* lightning改造 zyh start */ /* width: 20%; */ width: 50%; /* lightning改造 zyh end */ float: left; margin: 0; padding: 0; text-align: center; cursor: pointer; height: 25px; /* lightning改造 zyh start */ /* height: 25px; */ height: 30px; line-height: 30px; /* lightning改造 zyh end */ } #Step_tab li span { margin: 0; @@ -185,8 +197,11 @@ color: #fff; } div.menu{ margin-bottom: 20px; width: 490px; /* lightning改造 zyh start */ /* margin-bottom: 20px; */ margin-bottom: 2px; /* width: 490px; */ /* lightning改造 zyh end */ } hr { @@ -194,7 +209,10 @@ color: #fff; background-color: #fff; height: 1px; width: 90%; /* lightning改造 zyh start */ /* width: 90%; */ width: 98%; /* lightning改造 zyh end */ } .close { color: #aaaaaa; @@ -218,7 +236,9 @@ .menu{ border:1px solid #a1a1a1; border-radius:10px; width: 400px; /* lightning改造 zyh start */ /* width: 400px; */ /* lightning改造 zyh end */ } .menu li .fieldname { width: 30%; @@ -240,7 +260,9 @@ margin-left: 20px !important; } div.freezehander{ width:500px; /* lightning改造 zyh start */ /* width:500px; */ /* lightning改造 zyh end */ } </style> @@ -262,26 +284,27 @@ <apex:form id="allForm"> <apex:actionFunction name="save" action="{!save}" rerender="allForm" onComplete="unblockUI();checkMessage();resetDetailDivMargintop();" /> <apex:inputHidden value="{!done_flg}" id="done_flg"/> <div id="main"> <div id="main" style="margin-bottom:20px;"> <input type="hidden" id="QRType" value="1"/> <input type="hidden" id="QRTypeID" value=""/> <div id="hander" class="freezehander"> <apex:outputPanel id="message"> <apex:pageMessages /> </apex:outputPanel> <div style="text-align: right;margin-top: 10px;"> <!-- lightning改造 zyh start --> <!-- <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 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;"> <!-- <table style="border-collapse: collapse; font-size:13px;"> <colgroup> <col width="150" /> <col width="170" /> </colgroup> <tr> <tr> --> <!-- 状态切换btn --> <th colspan="2" style="font-size:20px;text-align: center;width:500px;"> <!-- <th colspan="2" style="font-size:20px;text-align: center;width:500px;"> <ul id="Step_tab"> <li class="selected"><span class="tabsize">清点</span></li> </ul> @@ -293,7 +316,29 @@ <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy"/> <apex:commandButton styleClass="commandbutton" onclick="checkAll();" value="全选" rerender="dummy" /> <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/> </div> </div> --> <apex:pageBlock > <table style="border-collapse: collapse; font-size:13px; margin-bottom:10px;"> <colgroup> <col width="20%" /> <col width="80%" /> </colgroup> <tr> <th style="font-size:20px;text-align: center;width:280px;"> <ul id="Step_tab"> <li class="selected"><span class="tabsize">清点</span></li> </ul> </th> <th width="1900px;"> <apex:commandButton styleClass="commandbutton" onclick="changeAccessory()" value="附属品调整" rerender="dummy"/> <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy"/> <apex:commandButton styleClass="commandbutton" onclick="checkAll();" value="全选" rerender="dummy" /> <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/> <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="保存" rerender="dummy" disabled="{!saveBtnDisabled}"/> </th> </tr> </table> </apex:pageBlock> </div> <apex:outputPanel id="detail"> @@ -304,7 +349,8 @@ <apex:repeat value="{!esdList}" var="esdInfo" id="esdList"> <!-- <apex:outputPanel rendered="{!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,false,true)}"> --> <div style="margin-bottom: -20px;display: {!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,'none','block')}"> <!-- <div style="margin-bottom: -20px;display: {!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,'none','block')}"> --> <div style="display: {!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id,'none','block')}"> <apex:outputPanel rendered="{!IF(indexloop=0,false,true)}"> <hr/> </apex:outputPanel> @@ -318,10 +364,10 @@ <apex:variable var="indexloop" value="{!indexloop+1}"/> </div> <!-- </apex:outputPanel> --> <!-- <br /> --> <apex:outputPanel layout="none" rendered="true" > <br/> <!-- <br/> --> <div class="menu"> @@ -338,31 +384,52 @@ <ul data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__c}" data-model="{!IF(esdInfo.rnd.Fixture_Arrival_Process__c=='变体',esdInfo.rnd.Fixture_Arrival_Product__r.Fixture_Model_No_T__c, esdInfo.rnd.Fixture_Model_No_F__c)}"> <li> <span class="fieldname">明细No.</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">明细No.</span> --> <span class="fieldvalue">明细No.</span> <!-- lightning改造 zyh end --> <span class="fieldvalue" style="width: 65%;">{!esdInfo.rnd.ReceivingNoteDetailNo__c}</span> </li> <li style="{!IF(ISBLANK(esdInfo.rnd.Fixture_Arrival_Process__c),'display: none;','')}"> <span class="fieldname">备品入库处理</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">备品入库处理</span> --> <span class="fieldvalue">备品入库处理</span> <!-- lightning改造 zyh end --> <span class="fieldvalue" style="width: 65%;">{!esdInfo.rnd.Fixture_Arrival_Process__c}</span> </li> <li style="{!IF(esdInfo.rnd.Fixture_Arrival_Process__c == '变体','','display: none;')}"> <span class="fieldname">备品入库产品</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">备品入库产品</span> --> <span class="fieldvalue">备品入库产品</span> <!-- lightning改造 zyh end --> <span class="fieldvalue" style="width: 65%;">{!esdInfo.rnd.Fixture_Arrival_Product__r.Name}</span> </li> <li> <span class="fieldname">规格</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">规格</span> --> <span class="fieldvalue">规格</span> <!-- lightning改造 zyh end --> <span class="fieldvalue">{!esdInfo.rnd.Packing_list_Fixture_F__c}</span> </li> <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c = 'TRUE', '', 'display: none;')}"> <span class="fieldname">无机身号码设备</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">无机身号码设备</span> --> <span class="fieldvalue">无机身号码设备</span> <!-- lightning改造 zyh end --> <apex:outputText styleclass="fieldvalue" id="isNoSerialNumber" value="{!esdInfo.rnd.unknow_serial_NO_product__c}" /> </li> <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c = 'TRUE', '', 'display: none;')}"> <span class="fieldname">机身编码</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">机身编码</span> --> <span class="fieldvalue">机身编码</span> <!-- lightning改造 zyh end --> <apex:outputText styleClass="fieldvalue" value="{!esdInfo.rnd.SerialNumber_F__c}"/> </li> <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c != 'TRUE', '', 'display: none;')}"> <span class="fieldname">机身编码</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">机身编码</span> --> <span class="fieldvalue">机身编码</span> <!-- lightning改造 zyh end --> <apex:inputHidden value="{!esdInfo.rnd.unknow_serial_NO_product__c}" /> <apex:outputText styleClass="fieldvalue" value="{!esdInfo.rnd.SerialNumber_Origin__c}"/> <apex:outputPanel rendered="{!esdInfo.canChange==true}" layout="none"> @@ -370,26 +437,41 @@ </apex:outputPanel> </li> <li style="{!IF(esdInfo.rnd.unknow_serial_NO_product__c != 'TRUE', '', 'display: none;')}"> <span class="fieldname">机身编码(更新)</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">机身编码(更新)</span> --> <span class="fieldvalue">机身编码(更新)</span> <!-- lightning改造 zyh end --> <span class="fieldvalue"><apex:inputField id="serialNumberfix" styleclass="disableInput" value="{!esdInfo.rnd.SerialNumber__c}" /></span> </li> <li style="{!IF(esdInfo.rnd.Asset_loaner_category_F__c != '耗材','','display: none;')}"> <span class="fieldname">使用期限(修改前)</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">使用期限(修改前)</span> --> <span class="fieldvalue">使用期限(修改前)</span> <!-- lightning改造 zyh end --> <span class="fieldvalue"> <apex:outputField id="PeriodOfUse_Old_F__c" value="{!esdInfo.rnd.PeriodOfUse_Old_F__c}" /> </span> </li> <li style="{!IF(esdInfo.rnd.Asset_loaner_category_F__c != '耗材','','display: none;')}"> <span class="fieldname">使用期限(修改后)</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">使用期限(修改后)</span> --> <span class="fieldvalue">使用期限(修改后)</span> <!-- lightning改造 zyh end --> <span class="fieldvalue"> <apex:inputField id="PeriodOfUse_Final__c" value="{!esdInfo.rnd.PeriodOfUse_Final__c}" rendered="{!esdInfo.canChange==true}" /> <apex:outputField value="{!esdInfo.rnd.PeriodOfUse_Final__c}" rendered="{!esdInfo.canChange==false}" /> </span> </li> <li style="{!IF(esdInfo.rnd.Asset_loaner_category_F__c == '耗材','','display: none;')}"> <span class="fieldname">使用期限</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">使用期限</span> --> <span class="fieldvalue">使用期限</span> <!-- lightning改造 zyh end --> <span class="fieldvalue"> <apex:outputField value="{!esdInfo.rnd.PeriodOfUse__c}" /> </span> </li> <li data-qr="{!esdInfo.rnd.Fixture_QRCode_F__c}" data-bar="{!esdInfo.rnd.Barcode_F__c}" data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__c}"> <span class="fieldname">清点结果</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">清点结果</span> --> <span class="fieldvalue">清点结果</span> <!-- lightning改造 zyh end --> <apex:outputPanel layout="none" rendered="{!esdInfo.canChange==false}" > <span class="fieldvalue"><apex:outputField value="{!esdInfo.rnd.AcceptanceResult__c}"/></span> </apex:outputPanel> @@ -398,7 +480,10 @@ </apex:outputPanel> </li> <li> <span class="fieldname">清点备注</span> <!-- lightning改造 zyh start --> <!-- <span class="fieldname">清点备注</span> --> <span class="fieldvalue">清点备注</span> <!-- lightning改造 zyh end --> <apex:outputPanel layout="none" rendered="{!esdInfo.canChange==false}" > <span class="fieldvalue"><apex:outputField value="{!esdInfo.rnd.AcceptanceComments__c}"/></span> </apex:outputPanel> @@ -416,11 +501,21 @@ </apex:outputPanel> </div> <script type="text/javascript"> // lightning改造 zyh start // var standalone = window.navigator.standalone, // 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 ",""); var standalone = window.navigator.standalone, 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 ",""); 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 ",""); } // lightning改造 zyh end let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false}); function filljsQR(content) { force-app/main/default/pages/ReceivingNoteDetailSelect.page
@@ -1,4 +1,4 @@ <apex:page controller="ReceivingNoteDetailSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> <apex:page controller="ReceivingNoteDetailSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true"> <head> <apex:outputPanel rendered="{!isAcceptance}"> <meta name="viewport" content="width=device-width,initial-scale=1"/> @@ -11,7 +11,12 @@ <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/> <apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/> <apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/> <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/> <!-- lightning改造 zyh start --> <style type="text/css"> table.list td input[type="text"]{width:55%;} </style> <!-- lightning改造 zyh end --> <script type="text/javascript"> var heightAjustment = 120; var widthAjustment = 30; @@ -90,10 +95,16 @@ <apex:outputPanel id="pageallPanel"> <apex:pageBlock id="searchBlock" tabStyle="Report"> <apex:pageBlockButtons location="bottom"> <apex:commandButton style="float:left;" action="{!save}" value="确定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> <apex:commandButton style="float:left;" value="无配套明细提醒邮件" onclick="setEmailBody();" rerender="allForm, checEventFrame"/> <apex:commandButton style="float:right;" value="{!IF(isAcceptance, '返回', '返回上一级')}" action="{!goBack}"/> <apex:commandButton rendered="{!isAcceptance == false}" style="float:right;" value="返回数据确认画面" action="{!cancel}"/> <!-- lightning改造 zyh start --> <!-- <apex:commandButton style="float:left;" action="{!save}" value="确定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> --> <!-- <apex:commandButton style="float:left; margin-left:12px;" action="{!save}" value="确定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> --> <!-- lightning改造 zyh end --> <!-- <apex:commandButton style="float:left;" value="无配套明细提醒邮件" onclick="setEmailBody();" rerender="allForm, checEventFrame"/> --> <!-- lightning改造 zyh start --> <!-- <apex:commandButton style="float:right;" value="{!IF(isAcceptance, '返回', '返回上一级')}" action="{!goBack}"/> --> <!-- <apex:commandButton style="float:right; margin-right:12px;" value="{!IF(isAcceptance, '返回', '返回上一级')}" action="{!goBack}"/> --> <!-- lightning改造 zyh end --> <!-- <apex:commandButton rendered="{!isAcceptance == false}" style="float:right;" value="返回数据确认画面" action="{!cancel}"/> --> </apex:pageBlockButtons> <div style="clear:both;"></div> @@ -121,6 +132,14 @@ <!--TODO 同一附属品：レ --> </table> <!-- lightning改造 zyh start --> <div style="margin-top: 15px;"> <apex:commandButton style="float:left; margin-left:12px;" action="{!save}" value="确定" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> <apex:commandButton style="float:left;" value="无配套明细提醒邮件" onclick="setEmailBody();" rerender="allForm, checEventFrame"/> <apex:commandButton style="float:right; margin-right:12px;" value="{!IF(isAcceptance, '返回', '返回上一级')}" action="{!goBack}"/> <apex:commandButton rendered="{!isAcceptance == false}" style="float:right;" value="返回数据确认画面" action="{!cancel}"/> </div> <!-- lightning改造 zyh end --> </apex:pageBlock> <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="false" noSort="true"/> </apex:outputPanel> @@ -130,6 +149,16 @@ table.list .col_Fixture_Set_New_Quantity__c input {width:55%;} /*没找着这个输入框在哪设置的 就直接设置隐藏了 */ table.list .col_Rental_Num__c input { display: none;} /* table.list .col_SortInt_F__c{height: 40px;} */ /* <!-- lightning改造 zyh start --> */ table.list .col_Fixture_Set_New_Quantity__c {width: 200px;} table.list .col_Fixture_Set_Detail__r_Fixture_Model_No_F__c {width: 150px;} table.list .col_Fixture_Set_Detail__r_Name_CHN__c {width: 100px;} table.list .col_Is_Optional_F__c {width: 100px;} table.list .col_OneToOne_Flag__c {width: 150px;} table.list .col_Fixture_Set_Detail__r_Fixture_Set_New__c {width: 100px;} /* table.list .col_Fixture_Set_New_Quantity__c {width: 100px;} */ /* <!-- lightning改造 zyh end --> */ </style> <!-- add by rentx 20210729 end 新品收货_集中备品_建立新品入库标准配套 --> <apex:outputPanel id="checEventFrame"> @@ -189,7 +218,10 @@ j$(this).find("input[type=text]")[0].style.display = "None"; }else{ j$(this).find("input[type=text]")[0].readonly = true; j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" /> <input type="hidden" style="width: auto;" class="dec btn" value="'+oldValue+'" />'); // lightning改造 zyh start // j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" /> <input type="hidden" style="width: auto;" class="dec btn" value="'+oldValue+'" />'); j$(this).append('<input type="button" style="width: 1.5rem; height: 22px; font-size: 18px; line-height: 20px; margin-top: 5px;" class="inc btn" value="+" /><input type="button" style="width: 22px; height: 22px; font-size: 18px; line-height: 20px; margin-top: 5px;" class="dec btn" value="-" /> <input type="hidden" style="width: auto;" class="dec btn" value="'+oldValue+'" />'); // lightning改造 zyh end } i ++; }); force-app/main/default/pages/ReceivingNoteExamination.page
@@ -103,9 +103,13 @@ border-top-right-radius:10px; text-align: left; margin: 0; padding: 1%; width: 98%; background:#DCDCDC; /* lightning改造 zyh start */ /* padding: 1%; */ /* width: 98%; */ /* background:#DCDCDC; */ background:#95aee5; padding-left: 0.75rem; /* lightning改造 zyh end */ position: relative; } .checkintitle{ @@ -123,13 +127,20 @@ } #Step_tab li { position: relative; width: 20%; /* lightning改造 zyh start */ /* width: 20%; */ width: 50%; /* lightning改造 zyh end */ float: left; margin: 0; padding: 0; text-align: center; cursor: pointer; height: 25px; /* lightning改造 zyh start */ /* height: 25px; */ height: 30px; line-height: 30px; /* lightning改造 zyh end */ } #Step_tab li span { margin: 0; @@ -140,8 +151,10 @@ line-height: 1; } div.detail { margin-left: 5px; width: 400px; /* lightning改造 zyh start */ /* margin-left: 5px; */ /* width: 400px; */ /* lightning改造 zyh start */ } #Step_tab li.selected { background: #3b5998; @@ -151,7 +164,9 @@ } div.menu{ margin-bottom: 20px; width: 490px; /* lightning改造 zyh start */ /* width: 490px; */ /* lightning改造 zyh end */ } hr { @@ -183,15 +198,18 @@ .menu{ border:1px solid #a1a1a1; border-radius:10px; width: 400px; /* lightning改造 zyh start */ /* width: 400px; */ /* lightning改造 zyh end */ } .menu li .fieldname { width: 30%; text-align: right; float: left; /* text-align: right; */ text-align: left; /* float: left; */ } .menu li .fieldvalue{ width: 45%; width: 45%; text-align: left; margin-left: 10px; @@ -205,7 +223,9 @@ margin-left: 20px !important; } div.freezehander{ width:500px; /* lightning改造 zyh start */ /* width:500px; */ /* lightning改造 zyh end */ } </style> @@ -278,7 +298,8 @@ </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> <!-- <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> --> <apex:inputCheckbox id="summaryCheckS" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><span style="padding: 5px; font-weight: bold;" 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}</span> </apex:outputPanel> <div class="menu"> force-app/main/default/pages/ReceivingNoteList.page
@@ -1,5 +1,5 @@ <!--仿EquipmentSetSRList2.page--> <apex:page Controller="ReceivingNoteListController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="收货清单配套一览"> <apex:page Controller="ReceivingNoteListController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="收货清单配套一览" lightningStylesheets="true"> <head> <meta name="format-detection" content="telephone=no"/> <meta name="viewport" content="width=device-width,initial-scale=1"/> force-app/main/default/pages/ReceivingNoteListFirst.page
@@ -1,16 +1,32 @@ <apex:page controller="ReceivingNoteListFirstController" action="{!init}" showHeader="false" sidebar="false" id="allPage"> <apex:page controller="ReceivingNoteListFirstController" action="{!init}" showHeader="false" sidebar="false" id="allPage" lightningStylesheets="true"> <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> <apex:stylesheet value="{!URLFOR($Resource.MainFixtureSelectCss)}"/> <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/> <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/> <script type="text/javascript"> var heightAjustment = 120; var widthAjustment = 30; </script> <style type="text/css"> table.list .col_Internal_asset_location__c {width:85px;} table.list .col_Sales_order_number__c {width:100px;} table.list .col_OrderCode__c {width:100px;} table.list .col_ApprovalNumber__c {width:100px;} table.list .col_Asset_loaner_category__c {width:70px;} table.list .col_DateOfDelivery__c {width:100px;} table.list .col_ReceivingNoteSummary_Cnt__c {width:80px;} table.list .col_ReceivingNoteNo_New__c {width:100px;} table.list .col_Data_Confirmation_Link__c {width:100px;} table.list .col_Data_Confirmation_Again_Link__c {width:100px;} table.list .col_ReceivingNotePDF_LINK__c {width:100px;} table.list .col_RN_Status__c {width: 100px;} table.list .col_ContactPerson__c {width: 100px;} </style> <apex:form id="allForm"> <!-- <apex:actionFunction name="saveAndSearch" action="{!save}" rerender="allForm,checEventFrame" oncomplete="unblockUI();"> --> <!-- <apex:param name="firstParam" assignTo="{!saveType}" value="" /> --> force-app/main/default/pages/ReceivingNoteStockIn.page
@@ -1,5 +1,5 @@ <!--仿EquipmentSetShippmentReceived6.page--> <apex:page Controller="ReceivingNoteStockInController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="收货清单入库"> <apex:page Controller="ReceivingNoteStockInController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="收货清单入库" lightningStylesheets="true"> <head> <meta name="format-detection" content="telephone=no"/> </head> @@ -178,10 +178,12 @@ border-top-right-radius:10px; text-align: left; margin: 0; padding: 1%; width: 98%; /*20230725 ljh*/ /*padding: 1%;*/ /*width: 98%;*/ background:#DCDCDC; position: relative; padding-left: 0.75rem;/*20230721 ljh */ } .checkintitle{ position:absolute; @@ -220,8 +222,9 @@ color: #fff; } div.menu{ margin-bottom: 20px; width: 490px; /*20230725 ljh*/ /*margin-bottom: 20px; */ /*width: 490px;*/ } hr { @@ -229,7 +232,9 @@ color: #fff; background-color: #fff; height: 1px; width: 90%; /*20230725 ljh*/ /*width: 90%;*/ width: 98%; } .close { color: #aaaaaa; @@ -253,31 +258,35 @@ .menu{ border:1px solid #a1a1a1; border-radius:10px; width: 400px; /*width: 400px;*//*20230725 ljh*/ } .menu li .fieldname { width: 30%; line-height: 25px; /*20230725 ljh*/ /*width: 30%; line-height: 25px;*/ text-align: right; float: left; } .menu li .fieldvalue{ width: 40%; line-height: 25px; /*20230725 ljh*/ /*width: 40%; line-height: 25px;*/ text-align: left; margin-left: 10px; } /*20230725 ljh*/ .menu li { vertical-align: middle; height: 25px; margin: 5px 0; /*height: 25px; margin: 5px 0;*/ } .commandbutton{ width: 100px !important; margin-left: 20px !important; } div.freezehander{ width:500px; /*width:500px;*//*20230725 ljh*/ } } </style> @@ -307,18 +316,17 @@ <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();" rerender="dummy" value="保存" 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> <!-- 状态切换btn --> 状态切换btn <th colspan="2" style="font-size:20px;text-align: center;width:500px;"> <ul id="Step_tab"> <li class="selected"><span class="tabsize">入库</span></li> @@ -330,7 +338,37 @@ <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="扫一扫" rerender="dummy"/> <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/> </div> <div style="font-size: 14px;">缺少一对一入库:<apex:inputCheckbox value="{!forceSave}" /></div> <apex:outputPanel layout="none" rendered="{!isConsum}"> <div style="font-size: 14px;background-color:yellow;display:inline;">⚠️已存在货架号信息时无法修改，请在新品收货完成后再修改。</div> </apex:outputPanel> <div style="font-size: 14px;">缺少一对一入库:<apex:inputCheckbox value="{!forceSave}" /></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"/> <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="全部OK" rerender="dummy"/> <apex:commandButton styleClass="commandbutton" onclick="savejs();" rerender="dummy" value="保存" disabled="{!saveBtnDisabled}"/> <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/> </th> </tr> </table> <apex:outputPanel layout="none" rendered="{!isConsum}"> <div style="font-size: 14px;background-color:yellow;display:inline;">⚠️已存在货架号信息时无法修改，请在新品收货完成后再修改。</div> </apex:outputPanel> <div style="font-size: 14px;">缺少一对一入库:<apex:inputCheckbox value="{!forceSave}" /></div> </apex:pageBlock> </div> <apex:outputPanel id="detail"> @@ -364,7 +402,9 @@ </div></h2> <!-- TODO 回库はSet単位で、明細一つ一つのquickCheck要らないが、SetのquickCheck要る？ --> <ul style="display:table text-align:center"> <!-- <ul style="display:table text-align:center"> --> <!-- 20230722 ljh --> <ul style="padding: 1px 0.75rem;" > <li> <span class="fieldname">明细No.</span> <span class="fieldvalue">{!esdInfo.rec.ReceivingNoteDetailNo__c}</span> @@ -428,13 +468,14 @@ <!-- 货架号 --> <span class="fieldname">{!$ObjectType.Asset.fields.WH_location__c.label}</span> <apex:outputPanel layout="none" rendered="{!esdInfo.editable}"> <apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.WH_location__c =''}"> <apex:inputField id="WHlocation" value="{!esdInfo.rec.WH_location__c}" styleClass="fieldvalue" style="margin-top:5px;height:15px"/> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}"> <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable && esdInfo.rec.WH_location__c ='')}"> <span class="fieldvalue">{!esdInfo.rec.WH_location__c}</span> </apex:outputPanel> </li> <!-- qiu 改 --> <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" data-bar="{!esdInfo.rec.Barcode_F__c}"> <!-- 入库确认 --> @@ -442,7 +483,7 @@ <apex:outputPanel layout="none" rendered="{!esdInfo.editable}"> <!-- 可修改情况下的入库确认的checkbox --> <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin-left:20px;margin-top:10px;" /> <span class="fieldvalue"><apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin-left:20px;margin-top:10px;" /></span> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.onetoone}"> <input type="hidden" name="onetoone" value="{!esdInfo.rec.ReceivingNoteSummary__c}"/> @@ -450,17 +491,17 @@ <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Is_Body_F__c}"> <apex:variable var="main_loc" value="{!esdInfo.rec.WH_location__c}" /> <input type="hidden" name="onetoone_main" value="{!esdInfo.rec.ReceivingNoteSummary__c}"/> <span class="fieldvalue"><input type="hidden" name="onetoone_main" value="{!esdInfo.rec.ReceivingNoteSummary__c}"/></span> </apex:outputPanel> </apex:outputPanel> <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}"> <!-- 不可修改情况下的入库确认的checkbox --> <apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" /> <span class="fieldvalue"> <apex:outputField value="{!esdInfo.rec.Arrival_in_wh__c}" /></span> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt_F__c > 0 && esdInfo.rec.Is_Body_F__c}"> <apex:variable var="main_loc" value="{!esdInfo.rec.WH_location__c}" /> <span class="fieldvalue"> <apex:variable var="main_loc" value="{!esdInfo.rec.WH_location__c}" /></span> </apex:outputPanel> </apex:outputPanel> force-app/main/default/pages/ReceivingNoteStockInRequest.page
@@ -1,10 +1,11 @@ <apex:page controller="ReceivingNoteStockInRequestController" showHeader="false" action="{!init}" id="allPage"> <apex:page controller="ReceivingNoteStockInRequestController" showHeader="false" action="{!init}" id="allPage" lightningStylesheets="true"> <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> <apex:stylesheet value="{!URLFOR($Resource.ReceivingNotePageCss)}"/> <apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/> <apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/> <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/> <apex:form id="allForm"> <style> table.headTable td { @@ -152,7 +153,7 @@ </td> </tr> </table> <table class="searchTable"> <table class="searchTable" style="margin-bottom: 5px; margin-top: 5px;"> <tr> <td> 收货状态: @@ -189,57 +190,53 @@ <table class="searchTable" style="width:100%"> <tr> <td> <td style="padding-top:5px;"> <!-- 所在地区(本部) --> {!$ObjectType.Asset.fields.Salesdepartment__c.label} <apex:inputField id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}"/> --> <apex:inputField style="width:180px;" id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}"/> <!-- lightning改造 zyh end --> </td> <td> <td style="padding-top:5px;"> <!-- 所在地区(省) --> {!$ObjectType.Asset.fields.SalesProvince__c.label} <apex:inputField id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}"/> --> <apex:inputField style="width:180px;" id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}"/> <!-- lightning改造 zyh end --> </td> <td> <td style="padding-top:5px;"> <span> <!-- 产品分类(GI/SP) --> {!$ObjectType.Asset.fields.Product_category__c.label}: <apex:inputField id="appProduct_category" value="{!pageB.assetInput.Product_category__c}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appProduct_category" value="{!pageB.assetInput.Product_category__c}"/> --> <apex:inputField style="width:180px;" id="appProduct_category" value="{!pageB.assetInput.Product_category__c}"/> <!-- lightning改造 zyh end --> </span> </td> <td> <td style="padding-top:5px;"> <span> <!-- 备品分类 --> {!$ObjectType.Asset.fields.Equipment_Type__c.label}: <apex:inputField id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}"/> --> <apex:inputField style="width:180px;" id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}"/> <!-- lightning改造 zyh end --> </span> </td> <td> <span> <!-- 管理种类 --> {!$ObjectType.Asset.fields.Manage_type__c.label}: <apex:inputField id="appManage_type" value="{!pageB.assetInput.Manage_type__c}"/> </span> </td> <td> <span> <!-- 无机身号码设备 --> {!$ObjectType.Asset.fields.unknow_serial_NO_product__c.label}: <apex:inputField id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}"/> </span> </td> <td> <span> <!-- 备品用途附属品 --> {!$ObjectType.Asset.fields.Loaner_accsessary__c.label}: <apex:inputField id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}"/> </span> </td> <td> <td rowspan="2"> <span style="margin-left: 10px;"> <apex:commandButton value="编辑" onclick="blockme();" action="{!changeFixModel}" reRender="allForm" oncomplete="unblockUI();windowResize();"/> <apex:commandButton style="margin-top: 10px;" value="编辑" onclick="blockme();" action="{!changeFixModel}" reRender="allForm" oncomplete="unblockUI();windowResize();"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="适用" onclick="applyJs();return false;"/> <apex:commandButton style="margin-top: 10px;" value="适用" onclick="applyJs();return false;"/> <script type="text/javascript"> // 适用按钮 function applyJs() { @@ -488,19 +485,57 @@ <apex:commandButton value="选择配套" action="{!selectRNS}"/> </span> --> <span style="margin-left: 10px;"> <apex:commandButton value="保存" action="{!saveRecord}"/> <apex:commandButton style="margin-top: 10px;" value="保存" action="{!saveRecord}"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="驳回" action="{!reject}"/> <apex:commandButton style="margin-top: 10px;" value="驳回" action="{!reject}"/> </span> <!-- lightning改造 zyh start --> <br /> <!-- lightning改造 zyh end --> <span style="margin-left: 10px;"> <apex:commandButton style="margin-top: 10px;" value="入库指示" action="{!inStockRequest}"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="入库指示" action="{!inStockRequest}"/> <apex:commandButton style="margin-top: 10px;" value="打印收货清单" onclick="window.open('/apex/ReceivingNotePDF?rnid={!parId}');return false;"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="打印收货清单" onclick="window.open('/apex/ReceivingNotePDF?rnid={!parId}');return false;"/> <apex:commandButton style="margin-top: 10px;" value="返回" onclick="window.close();"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="返回" onclick="window.close();"/> </td> </tr> <tr> <td style="padding-top:5px;"> <span> <!-- 管理种类 --> {!$ObjectType.Asset.fields.Manage_type__c.label}: <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appManage_type" value="{!pageB.assetInput.Manage_type__c}"/> --> <apex:inputField style="width:180px;" id="appManage_type" value="{!pageB.assetInput.Manage_type__c}"/> <!-- lightning改造 zyh end --> </span> </td> <td style="padding-top:5px;"> <span> <!-- 无机身号码设备 --> {!$ObjectType.Asset.fields.unknow_serial_NO_product__c.label}: <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}"/> --> <apex:inputField style="width:180px;" id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}"/> <!-- lightning改造 zyh end --> </span> </td> <td style="padding-top:5px;"> <span> <!-- 备品用途附属品 --> {!$ObjectType.Asset.fields.Loaner_accsessary__c.label}: <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}"/> --> <apex:inputField style="width:180px;" id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}"/> <!-- lightning改造 zyh end --> </span> </td> </tr> force-app/main/default/pages/ReceivingNoteSummarySelect.page
@@ -1,4 +1,4 @@ <apex:page controller="ReceivingNoteSummarySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> <apex:page controller="ReceivingNoteSummarySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true"> <head> <title>备品配套选择</title> <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> @@ -6,6 +6,7 @@ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/> <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/> <script type="text/javascript"> var heightAjustment = 120; @@ -40,7 +41,7 @@ <apex:outputPanel id="pageallPanel"> <apex:pageBlock id="searchBlock" tabStyle="Report"> <table style="width:700px;"> <table style="width:700px;margin-bottom:10px;"> <tr> <td width="50px">关键字</td> <td width="200px"><apex:inputText value="{!keyword}" style="width:98%;"/></td> force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
@@ -5,6 +5,33 @@ <apex:stylesheet value="{!URLFOR($Resource.ReceivingNotePageCss)}"/> <apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/> <apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/> <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/> <style type="text/css"> table.list .col_ReceivingNoteDetailNo__c {width:100px;} table.list .col_OT_CODE__c {width:100px;} table.list .col_Fixture_Model_No_F__c {width:100px;} table.list .col_Fixture_Model_Name_F__c {width:100px;} table.list .col_Fixture_Arrival_Process__c {width:100px;} table.list .col_Fixture_Arrival_Product__c {width:100px;} table.list .col_Internal_Asset_number_key__c {width:100px;} table.list .col_SerialNumber_Origin__c {width:100px;} table.list .col_SerialNumber__c {width:100px;} table.list .col_PeriodOfUse_Old_F__c {width:100px;} table.list .col_PeriodOfUse_Final__c {width:100px;} table.list .col_Packing_list_Fixture_F__c {width:100px;} table.list .col_RND_Status__c {width:100px;} table.list .col_Asset_loaner_category_F__c {width:100px;} table.list .col_EquipmentSet_Managment_Code__c {width:200px;} table.list .col_Salesdepartment__c {width:100px;} table.list .col_SalesProvince__c {width:100px;} table.list .col_Product_category__c {width:100px;} table.list .col_Equipment_Type__c {width:100px;} table.list .col_Manage_type__c {width:100px;} table.list .col_unknow_serial_NO_product__c {width:100px;} table.list .col_Loaner_accsessary__c {width:100px;} table.list .col_Change_Point__c {width:100px;} /* table.list .noClick .col_DataConfirmation__c {width:100px;} */ </style> <apex:form > <!-- 此处隐式生成二维码图片，防止PDF页上的二维码崩坏 --> <apex:includeScript value="{!URLFOR($Resource.qrcode)}"/> @@ -20,23 +47,46 @@ sforce.connection.sessionId = '{!GETSESSIONID()}'; // 20210312 you WLIG-BV8CHF start var record = sforce.connection.query("select id from Attachment where ParentId = \'{!pageB.rn.Id}\' and name = \'QRCode-{!pageB.rn.ReceivingNoteNo_New__c}\'"); // 20210312 you WLIG-BV8CHF end // var record = sforce.connection.query("select id from Attachment where ParentId = \'{!pageB.rn.Id}\' and name = \'QRCode-{!pageB.rn.ReceivingNoteNo_New__c}\'"); var record = sforce.connection.query("select Id,ContentDocumentId from ContentDocumentLink where LinkedEntityId = \'{!pageB.rn.Id}\'"); if(record.size > 0){ var records = record.getArray("records"); var idList = records.map(obj => "'" + obj.ContentDocumentId + "'").join(","); record = sforce.connection.query("select Id from ContentDocument where Id in (" + idList + ") and Title = \'QRCode-{!pageB.rn.ReceivingNoteNo_New__c}\'"); } // 20210312 you WLIG-BV8CHF end // 不存在qr文件时，新生成一个，并连到清单上 if (record.size == 0) { var atta = new sforce.SObject("Attachment"); // 20210312 you WLIG-BV8CHF start atta.Name = "QRCode-{!pageB.rn.ReceivingNoteNo_New__c}"; // 20210312 you WLIG-BV8CHF end atta.ParentId = "{!pageB.rn.Id}"; atta.Body = src; var result = sforce.connection.create([atta]); var version = new sforce.SObject("ContentVersion"); version.VersionData = src; version.Title = "QRCode-{!pageB.rn.ReceivingNoteNo_New__c}"; version.ContentLocation = 's'; version.PathOnClient= "QRCode-{!pageB.rn.ReceivingNoteNo_New__c}.jpg"; var versionResult = sforce.connection.create([version]); record = sforce.connection.query("SELECT ContentDocumentId FROM ContentVersion WHERE Id =\'" + versionResult[0].id + "\'"); var records = record.getArray("records"); var link = new sforce.SObject("ContentDocumentLink"); link.ContentDocumentId = records[0].ContentDocumentId; link.LinkedEntityId = "{!pageB.rn.Id}"; link.ShareType = 'I'; link.Visibility = 'AllUsers'; var result = sforce.connection.create([link]); // var atta = new sforce.SObject("Attachment"); // // 20210312 you WLIG-BV8CHF start // atta.Name = "QRCode-{!pageB.rn.ReceivingNoteNo_New__c}"; // // 20210312 you WLIG-BV8CHF end // atta.ParentId = "{!pageB.rn.Id}"; // atta.Body = src; // var result = sforce.connection.create([atta]); var es = new sforce.SObject("ReceivingNote__c"); es.Id = "{!pageB.rn.Id}"; es.QRId__c = result[0].id; es.QRId__c = versionResult[0].id; result = sforce.connection.update([es]); // 存在qr时，绑到清单上 } else { var records = record.getArray("records"); var es = new sforce.SObject("ReceivingNote__c"); es.Id = "{!pageB.rn.Id}"; @@ -223,7 +273,8 @@ </td> </tr> </table> <table class="searchTable"> <table class="searchTable" style="margin-bottom:5px;margin-top:5px;"> <!-- <tr> --> <tr> <td> 收货状态: @@ -262,75 +313,60 @@ <table class="searchTable" style="width:100%"> <tr> <td> <td style="padding-top:5px;"> <!-- 所在地区(本部) --> {!$ObjectType.ReceivingNoteDetail__c.fields.Salesdepartment__c.label} <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Salesdepartment__c.InlineHelpText}"/> <apex:selectList id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}" size="1"> <!-- lightning改造 zyh start --> <br /> <!-- <apex:selectList id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}" size="1"> --> <apex:selectList style="width:180px;" id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}" size="1"> <!-- lightning改造 zyh end --> <apex:selectOptions value="{!SalesdepartmentOps}"/> </apex:selectList> </td> <!-- 所在地区(省) --> <td> <td style="padding-top:5px;"> {!$ObjectType.Asset.fields.SalesProvince__c.label} <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.SalesProvince__c.InlineHelpText}"/> <apex:selectList id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}" size="1"> <!-- lightning改造 zyh start --> <br /> <!-- <apex:selectList id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}" size="1"> --> <apex:selectList style="width:180px;" id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}" size="1"> <!-- lightning改造 zyh end --> <apex:selectOptions value="{!SalesProvinceOps}"/> </apex:selectList> </td> <td> <td style="padding-top:5px;"> <!-- 产品分类(GI/SP) --> {!$ObjectType.Asset.fields.Product_category__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Product_category__c.InlineHelpText}"/> <apex:selectList id="appProduct_category" value="{!pageB.assetInput.Product_category__c}" size="1"> <!-- lightning改造 zyh start --> <br /> <!-- <apex:selectList id="appProduct_category" value="{!pageB.assetInput.Product_category__c}" size="1"> --> <apex:selectList style="width:180px;" id="appProduct_category" value="{!pageB.assetInput.Product_category__c}" size="1"> <!-- lightning改造 zyh end --> <apex:selectOptions value="{!ProductCategoryOps}"/> </apex:selectList> </td> <td> <td style="padding-top:5px;"> <!-- 备品分类 --> {!$ObjectType.Asset.fields.Equipment_Type__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Equipment_Type__c.InlineHelpText}"/> <apex:selectList id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}" size="1"> <!-- lightning改造 zyh start --> <br /> <!-- <apex:selectList id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}" size="1"> --> <apex:selectList style="width:180px;" id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}" size="1"> <!-- lightning改造 zyh end --> <apex:selectOptions value="{!EquipmentTypeOps}"/> </apex:selectList> </td> <td> <!-- 管理种类 --> {!$ObjectType.Asset.fields.Manage_type__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Manage_type__c.InlineHelpText}"/> <apex:selectList id="appManage_type" value="{!pageB.assetInput.Manage_type__c}" size="1"> <apex:selectOptions value="{!ManageTypeOps}"/> </apex:selectList> </td> <td> <!-- 无机身号码设备 --> {!$ObjectType.Asset.fields.unknow_serial_NO_product__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.unknow_serial_NO_product__c.InlineHelpText}"/> <apex:selectList id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}" size="1"> <apex:selectOptions value="{!UnknowSerialNOProductOps}"/> </apex:selectList> </td> <td> <!-- 备品用途附属品 --> {!$ObjectType.Asset.fields.Loaner_accsessary__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Loaner_accsessary__c.InlineHelpText}"/> <apex:selectList id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}" size="1"> <apex:selectOptions value="{!LoanerAccsessaryOps}"/> </apex:selectList> </td> <td> <!-- 备品入库产品 --> {!$ObjectType.ReceivingNoteDetail__c.fields.Fixture_Arrival_Product__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Fixture_Arrival_Product__c.InlineHelpText}"/> <apex:inputField id="appLoaner_fixture_arrival_product" value="{!rndInfo[0].Fixture_Arrival_Product__c}"/> <!-- value="{!pageB.assetInput.Fixture_Arrival_Product__c}" --> </td> <td> <td rowspan="2"> <span style="margin-left: 10px;"> <apex:commandButton value="编辑" onclick="blockme();" action="{!changeFixModel}" reRender="allForm,checEventFrame" oncomplete="unblockUI();windowResize();"/><!-- 20210804 ljh add checEventFrame --> <apex:commandButton value="编辑" style="margin-top: 10px;" onclick="blockme();" action="{!changeFixModel}" reRender="allForm,checEventFrame" oncomplete="unblockUI();windowResize();"/><!-- 20210804 ljh add checEventFrame --> </span> <span style="margin-left: 10px;"> <apex:commandButton value="适用" onclick="applyJs();return false;"/> <apex:commandButton value="适用" style="margin-top: 10px;" onclick="applyJs();return false;"/> <script type="text/javascript"> // 适用按钮 function applyJs() { @@ -559,20 +595,77 @@ </script> </span> <span style="margin-left: 10px;"> <apex:commandButton value="选择配套" action="{!selectRNS}" rendered="{!showSelectRnsButton}"/> <apex:commandButton value="保存" style="margin-top: 10px;" onclick="blockme();" action="{!saveRecord}"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="型号提醒邮件" onclick="return setEmailBody();" /> <apex:commandButton value="返回" style="margin-top: 10px;" onclick="window.close();"/> </span> <!-- lightning改造 zyh start --> <br /> <!-- lightning改造 zyh end --> <span style="margin-left: 10px;"> <apex:commandButton value="选择配套" style="margin-top: 10px;" action="{!selectRNS}" rendered="{!showSelectRnsButton}"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="保存" onclick="blockme();" action="{!saveRecord}"/> <apex:commandButton value="型号提醒邮件" style="margin-top: 10px;" onclick="return setEmailBody();" /> </span> <!-- lightning改造 zyh start --> <!-- <br /> --> <!-- lightning改造 zyh end --> <span style="margin-left: 10px;"> <apex:commandButton value="打印收货清单" onclick="window.open('/apex/ReceivingNotePDF?rnid={!parId}');return false;"/> <apex:commandButton value="打印收货清单" style="margin-top: 10px;" onclick="window.open('/apex/ReceivingNotePDF?rnid={!parId}');return false;"/> </span> <span style="margin-left: 10px;"> <apex:commandButton value="返回" onclick="window.close();"/> </span> </td> <!-- lightning改造 zyh start --> </tr> <tr> <!-- lightning改造 zyh end --> <td style="padding-top:5px;"> <!-- 管理种类 --> {!$ObjectType.Asset.fields.Manage_type__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Manage_type__c.InlineHelpText}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:selectList id="appManage_type" value="{!pageB.assetInput.Manage_type__c}" size="1"> --> <apex:selectList style="width:180px;" id="appManage_type" value="{!pageB.assetInput.Manage_type__c}" size="1"> <!-- lightning改造 zyh end --> <apex:selectOptions value="{!ManageTypeOps}"/> </apex:selectList> </td> <td style="padding-top:5px;"> <!-- 无机身号码设备 --> {!$ObjectType.Asset.fields.unknow_serial_NO_product__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.unknow_serial_NO_product__c.InlineHelpText}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:selectList id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}" size="1"> --> <apex:selectList style="width:180px;" id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}" size="1"> <!-- lightning改造 zyh end --> <apex:selectOptions value="{!UnknowSerialNOProductOps}"/> </apex:selectList> </td> <td style="padding-top:5px;"> <!-- 备品用途附属品 --> {!$ObjectType.Asset.fields.Loaner_accsessary__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Loaner_accsessary__c.InlineHelpText}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:selectList id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}" size="1"> --> <apex:selectList style="width:180px;" id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}" size="1"> <!-- lightning改造 zyh end --> <apex:selectOptions value="{!LoanerAccsessaryOps}"/> </apex:selectList> </td> <td style="padding-top:5px;"> <!-- 备品入库产品 --> {!$ObjectType.ReceivingNoteDetail__c.fields.Fixture_Arrival_Product__c.label}: <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Fixture_Arrival_Product__c.InlineHelpText}"/> <!-- lightning改造 zyh start --> <br /> <!-- <apex:inputField id="appLoaner_fixture_arrival_product" value="{!rndInfo[0].Fixture_Arrival_Product__c}"/> --> <apex:inputField style="width:180px;" id="appLoaner_fixture_arrival_product" value="{!rndInfo[0].Fixture_Arrival_Product__c}"/> <!-- lightning改造 zyh end --> <!-- value="{!pageB.assetInput.Fixture_Arrival_Product__c}" --> </td> </tr> </table>
