From e15f4679a2b71a186aa9e87cd49b4ab9c249cc63 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期二, 08 八月 2023 18:20:47 +0800
Subject: [PATCH] 新品收货样式、颜色、显示margin
---
force-app/main/default/pages/ReceivingNoteAcceptance.page | 14 +
force-app/main/default/pages/EquipmentSetShippmentReceived5.page | 82 +++++++--
force-app/main/default/pages/ReceivingNoteExamination.page | 171 ++++++++++++++++-----
force-app/main/default/pages/EquipmentSetShippmentReceived2.page | 26 ++-
force-app/main/default/pages/EquipmentSetShippmentReceived6.page | 14 +
force-app/main/default/pages/EquipmentSetShippmentReceived3.page | 28 ++
force-app/main/default/pages/ReceivingNoteStockInRequest.page | 5
force-app/main/default/pages/ReceivingNoteWaitingReceipt.page | 20 +
force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page | 19 ++
force-app/main/default/pages/ReceivingNotePDF.page | 2
force-app/main/default/pages/ReceivingNoteListFirst.page | 5
force-app/main/default/pages/EquipmentSetShippmentReceived1.page | 19 +
force-app/main/default/pages/NotReceivingNoteListFirst.page | 25 ++
force-app/main/default/pages/EquipmentSetShippmentReceived4.page | 37 +++-
14 files changed, 349 insertions(+), 118 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
index 3d2db17..594653a 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
@@ -93,8 +93,8 @@
text-align: left;
margin: 0;
/*20230623 ljh start*/
- /*background:#DCDCDC;*/
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
/*20230623 ljh end*/
/*height: 42px;*/
padding-left: 0.75rem;/*20230628 ljh*/
@@ -150,8 +150,8 @@
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
div.rtop div {
/*20230623 ljh start*/
- /*background:#DCDCDC;*/
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
/*20230623 ljh end*/
}
div.r1, div.r2, div.r3, div.r4 {display:block; overflow:hidden;}
@@ -303,9 +303,12 @@
</div>
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� start -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� end -->
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
- <ul style="padding: 1px 0.75rem; {!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <ul style="padding: 1px 0.75rem; {!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<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}">
@@ -337,10 +340,12 @@
<span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
</li>
<!-- 20230721 ljh 鏈鸿韩缂栫爜鎹綅缃� -->
- <li>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� start -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� end -->
<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>
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
index 0829f1a..0a77392 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
@@ -336,13 +336,17 @@
</div> -->
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� start -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� end -->
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
<!-- 20230721 ljh -->
- <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<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;', '')}">
+ <!-- <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+ <li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<!-- 20210721 ljh 1719 start -->
<!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}锛� </span> -->
<span>鍙戣揣鍓�-妫�娴嬬粨鏋滐細 </span>
@@ -354,7 +358,8 @@
<span><apex:outputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result__c}" style="margin:3px;width:75px;" /></span>
</apex:outputPanel>
</li>
- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+ <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result_NG__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
<span><apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_NG__c}" style="margin:3px;width:75px;"/></span>
@@ -364,7 +369,8 @@
</apex:outputPanel>
</li>
- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+ <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_NG_abord_reason__c.label}锛�</span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
<span>
@@ -387,7 +393,8 @@
</apex:outputPanel>
</li>
- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+ <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Pre_Inspection_Comment__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}" >
<span>
@@ -403,7 +410,8 @@
</apex:outputPanel>
</li>
- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <!-- <li style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}"> -->
+ <li style="{!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<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>
@@ -411,10 +419,12 @@
<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>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� start -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� end -->
<!-- </div> -->
</apex:outputPanel>
</ul>
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
index 6ea6d89..dff61f0 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
@@ -111,7 +111,8 @@
/*width: 308px;*//*20230619 ljh*/
text-align: left;
margin: 0;
- background:#95aee5;
+ /* background:#95aee5; */
+ background:#dcdcdc;
/*height: 42px;*/
padding-left: 0.75rem;/*20230721 ljh */
}
@@ -170,7 +171,8 @@
}*/
/*20230620 ljh*/
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
- div.rtop div {background:#95aee5;}
+ div.rtop div {background:#DCDCDC;}
+ /* 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;}
@@ -407,6 +409,9 @@
</div>
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� start -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� end -->
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
<!-- 20230721 ljh -->
@@ -424,10 +429,12 @@
<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>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� start -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� end -->
</ul>
</div>
<div class="rbottom">
@@ -483,7 +490,12 @@
</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><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+
+ </div>
</h2>
</apex:outputPanel>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
@@ -502,10 +514,12 @@
<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>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� start -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� end -->
</ul>
</div>
<div class="rbottom">
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived4.page b/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
index 6b0d3a3..79129ed 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
@@ -469,7 +469,8 @@
/*width: 308px;*//*20230620 ljh */
text-align: left;
margin: 0;
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
/*height: 42px;*/
padding-left: 0.75rem;/*20230721 ljh */
}
@@ -529,7 +530,8 @@
/*20230620 ljh end*/
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
div.rtopg div {background:#DCDCDC;}
- div.rtop div {background:#95aee5;}
+ div.rtop div {background:#DCDCDC;}
+ /* div.rtop div {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;}
@@ -806,6 +808,9 @@
<apex:outputPanel layout="none" rendered="{!esdInfo.rec.Return_DeliverySlip__c == null && esdInfo.rec.Lost_item_giveup__c == false && esdInfo.rec.Check_lost_Item_F__c != '娑堣��'}">
<input disabled="disabled" type="checkbox" data-resid="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" name="raesdCheck" value="{!esdInfo.rec.Id}" data-lost="{!esdInfo.rec.Check_lost_Item_Final__c == '娆犲搧' || esdInfo.rec.Check_lost_Item__c == '娆犲搧'}" style="float: right;"/>
</apex:outputPanel>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
<!-- 20230721 ljh -->
@@ -818,10 +823,12 @@
<span><apex:outputField value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Received_ng_detail__c}" style="margin:3px;width:150px" /></span>
</li>
</apex:outputPanel>
- <li>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
<li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.NoItemReturn__c.label}锛� </span>
<!-- 20230621 ljh start-->
@@ -886,11 +893,23 @@
<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>
+ <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>
+ (<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)
+ </span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ </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><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}"/>宸插洖鏀� -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>
+ (<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)
+ </span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ </div>
</h2>
</apex:outputPanel>
<!-- 20230620 ljh 娆犲搧 -------------- -->
@@ -1031,12 +1050,14 @@
</apex:outputPanel>
</li>
</apex:outputPanel>
- <li>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}锛� </span>
<span>
<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>
</span>
- </li>
+ </li> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
</ul>
</div>
<!-- <div class="rbottom">
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived5.page b/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
index 0ddc234..ace3864 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
@@ -64,23 +64,53 @@
})
}
}
+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 ","");
+ ver = '';
+ if(ios) {
+ ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
+ }
function OpenRentalApplyFault(faultReportFlag, radetailId, radetailName, personId, personName, purpose2, name, hospitalName, serialNumber, fixtureNo, workPlace, deptCategory){
- if(faultReportFlag == '涓嶅瓨鍦ㄦ晠闅滄姤鍛婂崟'){
+ console.log(!standalone && !safari && ios);
+ if (!standalone && !safari && ios) {
+ 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);
+ }else{
+ if(confirm('宸插瓨鍦ㄦ娴嬪垎鏋愭姤鍛�')){
+ window.open("/" + faultReportFlag);
+ }
}
- }
+ }else{
+ 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);
+ var url = '/lightning/o/Rental_Apply_Fault__c/new?defaultFieldValues=Name=*,Rental_Apply_Equipment_Set_Detail__c='+radetailId+',Person_In_Charge_User__c='+personId
+ +',demo_purpose2__c='+purpose2
+ +',RentalApplyNo__c='+name
+ +',HospitalText__c='+hospitalName
+ +',Repair_product_body_number__c='+serialNumber
+ +',Fixture_Model_No__c='+fixtureNo
+ +',WorkPlace__c='+workPlace
+ +',OCM_dept_category__c='+deptCategory;
+ // console.log(url);
+ window.open(url);
+ }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");
@@ -156,8 +186,8 @@
/*width: 308px;*/
text-align: left;
margin: 0;
- /*background:#DCDCDC;*/
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
/*height: 42px;*/
padding-left: 0.75rem;/*20230721 ljh */
}
@@ -205,7 +235,7 @@
}*/
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
- div.rtop div {/*background:#DCDCDC;*/background:#95aee5;}
+ 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;}
@@ -330,6 +360,10 @@
</div>
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.AssetName__c}" />
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+ <span>(<apex:outputLink value="/{!esdInfo.rec.Asset__c}" target="_blank" id="assetLink" >{!esdInfo.rec.SerialNumber_F__c}</apex:outputLink>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
<!-- 20230722 ljh -->
@@ -352,7 +386,7 @@
<!-- 20230722 ljh -->
<apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" />
<!-- <output style="margin:3px;width:55px;text-align:left;margin-left:3px;margin-top:0px;float: left;">{!esdInfo.rec.Inspection_result_after__c}</output> -->
- <!-- <apex:commandButton style="margin-top:0px;font-size: 9px !important;" onclick="OpenRentalApplyFault('{!esdInfo.faultReportFlag}', '{!esdInfo.rec.Id}', '{!esdInfo.rec.Name}','{!esdInfo.personInChargeId}','{!esdInfo.personInChargeName}','{!esdInfo.demoPurpose2}','{!esdInfo.raName}','{!esdInfo.hospitalName}','{!esdInfo.rec.SerialNumber_F__c}','{!esdInfo.rec.Fixture_Model_No__c}','{!esdInfo.workPlace}','{!esdInfo.deptCategory}')" value="鏁呴殰鎶ュ憡" rerender="dummy" rendered="{!esdInfo.showFaultRepor}"/> -->
+ <apex:commandButton styleClass="commandbutton" style="margin-left: 20px;" 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;')}">
@@ -421,7 +455,7 @@
<!-- <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}"/> -->
+ <apex:commandButton styleClass="commandbutton" style="margin-left: 20px;" 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> -->
@@ -472,13 +506,15 @@
<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>
+ <!-- <li> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+ <!-- <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> -->
<!-- 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>
+ <!-- <span><apex:outputLink value="/{!esdInfo.rec.Asset__c}" target="_blank" id="assetLink" >{!esdInfo.rec.SerialNumber_F__c}</apex:outputLink></span> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+ <!-- </li> -->
<!-- </div> -->
<script>
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
index fc12d19..1c9dcd0 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
@@ -127,8 +127,8 @@
text-align: left;
margin: 0;
/*20230623 ljh start*/
- /*background:#DCDCDC;*/
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
/*20230623 ljh end*/
/*height: 42px;*/
padding-left: 0.75rem;/*20230721 ljh */
@@ -183,8 +183,8 @@
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
div.rtop div {
/*20230623 ljh start*/
- /*background:#DCDCDC;*/
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
/*20230623 ljh end*/
}
div.r1, div.r2, div.r3, div.r4 {display:block; overflow:hidden;}
@@ -360,6 +360,8 @@
</div>
<div class="menu">
<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>
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/>)</span>
+
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
<!-- 20230722 ljh -->
@@ -429,10 +431,10 @@
<span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;"/></span>
</apex:outputPanel>
</li>
- <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;"/></span>
- </li>
+ </li> -->
<!-- </apex:outputPanel> -->
<!-- </div> -->
</ul>
diff --git a/force-app/main/default/pages/NotReceivingNoteListFirst.page b/force-app/main/default/pages/NotReceivingNoteListFirst.page
index d4e2bd5..4cff272 100644
--- a/force-app/main/default/pages/NotReceivingNoteListFirst.page
+++ b/force-app/main/default/pages/NotReceivingNoteListFirst.page
@@ -1,9 +1,9 @@
<apex:page controller="NotReceivingNoteListFirstController" action="{!init}" showHeader="false" sidebar="false" id="allPage" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-<apex:stylesheet value="{!URLFOR($Resource.MainFixtureSelectCss)}"/>
+<!-- <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:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/> -->
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<script type="text/javascript">
@@ -13,6 +13,23 @@
searchOpp();
}
</script>
+<style type="text/css">
+table.list .col_Internal_asset_location__c{width:100px;}
+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:100px;}
+table.list .col_DateOfDelivery__c{width:100px;}
+table.list .col_ReceivingNoteSummary_Cnt__c{width:100px;}
+table.list .col_ContactPerson__c{width:100px;}
+table.list .col_ReceivingNoteNo_New__c{width:100px;}
+table.list .col_RN_Status__c{width:100px;}
+table.list .col_NotReceivingNoteListFirst_Link__c{width:100px;}
+body .bPageBlock .detailList .dataCol{
+ width: 8%;
+}
+</style>
+
<apex:form id="allForm">
<apex:actionFunction name="searchOpp" action="{!searchOpp}" rerender="allForm,checEventFrame" oncomplete="unblockUI();">
</apex:actionFunction>
@@ -79,7 +96,7 @@
</apex:form>
<apex:outputPanel id="checEventFrame">
<script type="text/javascript">
- j$("table#tableData").disabled = true;
+ /*j$("table#tableData").disabled = true;
function windowResize() {
var heightsp = 0;
if( typeof bottomspace != 'undefined' ){
@@ -125,7 +142,7 @@
j$('div#in_Div').css('height', (blockHeight + sbwidth) +'px');
}
}
- }
+ } */
</script>
</apex:outputPanel>
</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page b/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page
index ae95a75..692992f 100644
--- a/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page
+++ b/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page
@@ -39,6 +39,18 @@
td.newed {
color: #f00 !important;
}
+ table.list td.col_chk {width:3%;}
+ table.list td.col_Chk {width:3%;}
+ table.list td.col_ReceivingNoteDetailNo__c {width:10%;}
+ table.list td.col_OT_CODE__c {width:10%;}
+ table.list td.col_Fixture_Model_No_F__c {width:15%;}
+ table.list td.col_Internal_Asset_number_key__c {width:10%;}
+ table.list td.col_SerialNumber_Origin__c {width:10%;}
+ table.list td.col_SerialNumber__c {width:15%;}
+ table.list td.col_SerialNumber__c input {width:90%;}
+ .buttonSave{
+ display: none;
+ }
</style>
<script type="text/javascript">
var heightAjustment = 120;
@@ -100,7 +112,7 @@
<apex:inputHidden value="{!done_flg}" id="done_flg"/>
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock">
- <table class="headTable" style="width:100%">
+ <table class="headTable" style="width:100%;margin-bottom:10px;">
<tr>
<td>
<span style="font-weight:bold;">
@@ -148,7 +160,7 @@
</td>
</tr>
</table>
- <table class="searchTable" style="width:100%">
+ <table class="searchTable" style="width:100%;margin-bottom:10px;">
<tr>
<td>
<span>
@@ -172,6 +184,7 @@
</td>
<td>
<span style="margin-left: 50px;float: right;">
+ <input class="buttonSave" type="button" style="width:0;height:0;" />
<apex:commandButton style="" value="鏁版嵁纭" action="{!defineSaveRecord}" onclick="blockme();" reRender="allForm" oncomplete="unblockUI();checkMessage();"/>
<apex:commandButton style="" value="淇濆瓨" action="{!saveRecord}" onclick="blockme();" reRender="allForm" oncomplete="unblockUI();checkMessage();"/>
<apex:commandButton value="杩斿洖" onclick="closeCurrentPage();"/>
@@ -189,7 +202,7 @@
{!nowPage}/{!maxPage}
<apex:commandButton reRender="allForm" onclick="blockme();" disabled="{!canNext = false}" action="{!nextPage}" value="next" oncomplete="unblockUI();"/>
</div>
- <div id="out_Div_L" style="width: 100%;">
+ <div id="out_Div_L" style="width: 100%;overflow: auto;">
<table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableHeader_L">
<tr class="headerRow" height="30px">
<td class="col_chk" align="center">
diff --git a/force-app/main/default/pages/ReceivingNoteAcceptance.page b/force-app/main/default/pages/ReceivingNoteAcceptance.page
index 9d486d2..edfddbf 100644
--- a/force-app/main/default/pages/ReceivingNoteAcceptance.page
+++ b/force-app/main/default/pages/ReceivingNoteAcceptance.page
@@ -151,9 +151,9 @@
position:absolute;
right:10px;
}
- .disableInput {
+ input.disableInput[type="text"] {
pointer-events: none;
- background-color: #ccc;
+ background-color: #8c8c8c5b;
}
.dateFormat {
display: none;
@@ -264,6 +264,11 @@
/* width:500px; */
/* lightning鏀归�� zyh end */
}
+ .titleCheckbox[type="checkbox"]{
+ margin-bottom: 4px;
+ margin-right: 0;
+ margin-left: 10px;
+ }
</style>
<div id="myModal" class="modal">
@@ -356,9 +361,10 @@
</apex:outputPanel>
<label style="font-size: 14px;font-weight: bold;" >
<apex:outputPanel rendered="{!esdInfo.rnd.ReceivingNoteSummary__r.Package_Status__c=='OK'}">
- <apex:inputCheckbox id="checkedRN" value="{!esdInfo.isChecked}" html-data-rnId="{!esdInfo.rnd.ReceivingNoteSummary__c}" html-data-fsId="{!esdInfo.rnd.Fixture_Set_Detail__r.Fixture_Set__c}"/>
+ <apex:inputCheckbox id="checkedRN" styleClass="titleCheckbox" value="{!esdInfo.isChecked}" html-data-rnId="{!esdInfo.rnd.ReceivingNoteSummary__c}" html-data-fsId="{!esdInfo.rnd.Fixture_Set_Detail__r.Fixture_Set__c}"/>
</apex:outputPanel>
- {!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}
+ {!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}
+ <!-- {!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c} -->
</label>
<apex:variable var="SetName" value="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" />
<apex:variable var="indexloop" value="{!indexloop+1}"/>
diff --git a/force-app/main/default/pages/ReceivingNoteExamination.page b/force-app/main/default/pages/ReceivingNoteExamination.page
index d82dff3..a89f890 100644
--- a/force-app/main/default/pages/ReceivingNoteExamination.page
+++ b/force-app/main/default/pages/ReceivingNoteExamination.page
@@ -7,7 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
-<apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/>
+<!-- <apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/> -->
<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
<script type="text/javascript">
@@ -98,18 +98,120 @@
</script>
<style type="text/css">
+ .detail {
+ margin-left:5px;
+ width:310px;
+ }
+
+ .menu {
+ padding:0px;
+ border-left:1px solid #D1D1D1;
+ border-right:1px solid #D1D1D1;
+ }
+
+ .menu h2{
+ margin:0;
+ padding:0;
+ font-size:14px;
+ }
+
+ .menu h2 div {
+ width: 308px;
+ text-align: left;
+ margin: 0;
+ background:#DCDCDC;
+ }
+
+ .menu ul{
+ margin:0;
+ padding:1px;
+ list-style: none;
+ border-top:1px solid #ddd;
+ }
+
+ .menu li {
+ padding:0;
+ font-size:14px;
+ line-height:1.0;
+ height:23px;
+ clear:both;
+ /*border-bottom: 1px dotted #999;*/
+ }
+
+ .menu li span {
+ width: 140px;
+ text-align: right;
+ float: left;
+ margin: 5px 0px 0px 0px;
+ }
+
+ .menu li span span{
+ text-align: left;
+ margin-left: 3px;
+ margin-top: 0px;
+ }
+
+ .commandbutton {
+ font-size: 13px !important;
+ }
+
+ .tabsize {
+ font-size: 14px !important;
+ }
+
+ .detailtab {
+ font-size: 14px;
+ margin-top: 0;
+ }
+
+ .detailhander {
+ font-size: 16px;
+ }
+
+ .deliveryslip {
+ font-size: 15px;
+ }
+
+ .modal {
+ display:none;
+ position: fixed; /* Stay in place */
+ z-index: 10; /* Sit on top */
+ left: 0;
+ top: 0;
+ width: 100%; /* Full width */
+ height: 100%; /* Full height */
+ overflow: auto; /* Enable scroll if needed */
+ background-color: rgb(0,0,0); /* Fallback color */
+ background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+ }
+
+ /* Modal Content/Box */
+ .modal-content {
+ background-color: #fefefe;
+ margin-left: 6px;
+ margin-top: 100px;
+ padding: 20px;
+ border: 1px solid #888;
+ width: 265px; /* Could be more or less, depending on screen size */
+ }
+
+ .freezehander {
+ position: fixed;
+ top: 0px;
+ background-color:
+ white;
+ width: 320px;
+ z-index: 1;
+ }
+
.menu div.m_title{
border-top-left-radius:10px;
border-top-right-radius:10px;
text-align: left;
margin: 0;
- /* lightning鏀归�� zyh start */
- /* padding: 1%; */
- /* width: 98%; */
- /* background:#DCDCDC; */
- background:#95aee5;
- padding-left: 0.75rem;
- /* lightning鏀归�� zyh end */
+ padding: 1%;
+ width: 100%;
+ background:#DCDCDC;
position: relative;
}
.checkintitle{
@@ -127,20 +229,13 @@
}
#Step_tab li {
position: relative;
- /* lightning鏀归�� zyh start */
- /* width: 20%; */
- width: 50%;
- /* lightning鏀归�� zyh end */
+ width: 20%;
float: left;
margin: 0;
padding: 0;
text-align: center;
cursor: pointer;
- /* lightning鏀归�� zyh start */
- /* height: 25px; */
- height: 30px;
- line-height: 30px;
- /* lightning鏀归�� zyh end */
+ height: 25px;
}
#Step_tab li span {
margin: 0;
@@ -151,10 +246,8 @@
line-height: 1;
}
div.detail {
- /* lightning鏀归�� zyh start */
- /* margin-left: 5px; */
- /* width: 400px; */
- /* lightning鏀归�� zyh start */
+ margin-left: 5px;
+ width: 400px;
}
#Step_tab li.selected {
background: #3b5998;
@@ -164,9 +257,7 @@
}
div.menu{
margin-bottom: 20px;
- /* lightning鏀归�� zyh start */
- /* width: 490px; */
- /* lightning鏀归�� zyh end */
+ width: 490px;
}
hr {
@@ -198,34 +289,32 @@
.menu{
border:1px solid #a1a1a1;
border-radius:10px;
- /* lightning鏀归�� zyh start */
- /* width: 400px; */
- /* lightning鏀归�� zyh end */
+ width: 400px;
}
.menu li .fieldname {
- width: 30%;
- /* text-align: right; */
- text-align: left;
- /* float: left; */
+ width: 35%;
+ text-align: right;
+ float: left;
}
.menu li .fieldvalue{
- width: 45%;
+ width: 45%;
text-align: left;
margin-left: 10px;
}
.menu li {
vertical-align: middle;
- margin: 5px 0;
+ margin: 15px 0;
}
.commandbutton{
width: 100px !important;
margin-left: 20px !important;
}
div.freezehander{
- /* lightning鏀归�� zyh start */
- /* width:500px; */
- /* lightning鏀归�� zyh end */
+ width:500px;
+ }
+ .checkBox1{
+ margin-bottom: 4px;
}
</style>
@@ -293,13 +382,12 @@
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id, false, true)}">
<hr/>
- <apex:inputCheckbox id="summaryCheck" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><h3 style="padding: 5px;" class="detailtab">{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}锛歿!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/> 鍒拌揣鏃ユ湡锛� <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext> 姹囨�荤粨鏋滐細 {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
+ <h3 style="padding: 5px;" class="detailtab"><apex:inputCheckbox id="summaryCheck" styleClass="checkBox1" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/>{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}锛歿!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/> 鍒拌揣鏃ユ湡锛� <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext> 姹囨�荤粨鏋滐細 {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
<apex:variable var="SetName" value="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" />
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}" >
- <!-- <apex:inputCheckbox id="summaryCheckS" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><h3 style="padding: 5px;" class="detailtab">{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}锛歿!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/> 鍒拌揣鏃ユ湡锛� <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext> 姹囨�荤粨鏋滐細 {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3> -->
- <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>
+ <h3 style="padding: 5px;" class="detailtab"><apex:inputCheckbox id="summaryCheckS" styleClass="checkBox1" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/>{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}锛歿!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/> 鍒拌揣鏃ユ湡锛� <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext> 姹囨�荤粨鏋滐細 {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
</apex:outputPanel>
<div class="menu">
@@ -435,7 +523,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);
diff --git a/force-app/main/default/pages/ReceivingNoteListFirst.page b/force-app/main/default/pages/ReceivingNoteListFirst.page
index 7b2932a..4fff3b8 100644
--- a/force-app/main/default/pages/ReceivingNoteListFirst.page
+++ b/force-app/main/default/pages/ReceivingNoteListFirst.page
@@ -25,7 +25,10 @@
table.list .col_ReceivingNotePDF_LINK__c {width:100px;}
table.list .col_RN_Status__c {width: 100px;}
table.list .col_ContactPerson__c {width: 100px;}
-
+ body .bPageBlock .detailList .labelCol label{line-height: 24px;}
+ body .bPageBlock .detailList .dataCol{
+ width: 8%;
+ }
</style>
<apex:form id="allForm">
<!-- <apex:actionFunction name="saveAndSearch" action="{!save}" rerender="allForm,checEventFrame" oncomplete="unblockUI();"> -->
diff --git a/force-app/main/default/pages/ReceivingNotePDF.page b/force-app/main/default/pages/ReceivingNotePDF.page
index 8cebb19..969dd2f 100644
--- a/force-app/main/default/pages/ReceivingNotePDF.page
+++ b/force-app/main/default/pages/ReceivingNotePDF.page
@@ -41,7 +41,7 @@
<!-- 鍚堝悓缂栫爜 -->
<td style="padding: 0;box-sizing: border-box;text-align:left;font-size:13px;width:13%;" colspan="1">鍚堝悓缂栫爜锛�</td>
<td style="padding: 0;box-sizing: border-box;text-align:left;font-size:13px;width:20%;" colspan="1">{!receivingNoteHeadShow.Sales_order_number__c}</td>
- <td rowspan="6" style="box-sizing: border-box;text-align:right" colspan="1"><img style="width: 90px; height: 90px;padding: 0px;margin-top: 0mm;" src="{!'/servlet/servlet.FileDownload?file=' + receivingNoteHeadShow.QRId__c}" /></td>
+ <td rowspan="6" style="box-sizing: border-box;text-align:right" colspan="1"><img style="width: 90px; height: 90px;padding: 0px;margin-top: 0mm;" src="{!'/sfc/servlet.shepherd/version/download/' + receivingNoteHeadShow.QRId__c}" /></td>
</tr>
<tr>
<!-- 璁㈠崟缂栫爜 -->
diff --git a/force-app/main/default/pages/ReceivingNoteStockInRequest.page b/force-app/main/default/pages/ReceivingNoteStockInRequest.page
index 29f2dd2..5d109aa 100644
--- a/force-app/main/default/pages/ReceivingNoteStockInRequest.page
+++ b/force-app/main/default/pages/ReceivingNoteStockInRequest.page
@@ -29,6 +29,9 @@
td.newed {
color: #f00 !important;
}
+ .input90{
+ width: 90%;
+ }
</style>
<script type="text/javascript">
var heightAjustment = 120;
@@ -629,7 +632,7 @@
<apex:repeat value="{!inputFieldList}" var="info" id="inputField">
<td class="dataCellBorder1 intf {!info.value} col_{!info.value} {!IF(var.rnd['Change_Point__c']=='鍒犻櫎','deleted',IF(var.rnd['Change_Point__c']!=NULL,'newed',''))}" align="center">
<apex:outputPanel rendered="{!(contains(var.canChangeField, info.value) || var.canChangeField == '') && !contains(var.canNotChangeField, info.value) && pageB.fixMode && var.canChange && var.rnd['Change_Point__c']!='鍒犻櫎'}">
- <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')"/>
+ <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" styleClass="input90"/>
</apex:outputPanel>
<apex:outputPanel rendered="{!NOT((contains(var.canChangeField, info.value) || var.canChangeField == '') && !contains(var.canNotChangeField, info.value) && pageB.fixMode && var.canChange && var.rnd['Change_Point__c']!='鍒犻櫎')}">
<apex:outputField value="{!var.rnd[info.value]}"/>
diff --git a/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page b/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
index bfe496e..1ad77b2 100644
--- a/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
+++ b/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
@@ -12,7 +12,7 @@
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_Fixture_Arrival_Product__c {width:200px;}
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;}
@@ -21,7 +21,7 @@
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_EquipmentSet_Managment_Code__c {width:100px;}
table.list .col_Salesdepartment__c {width:100px;}
table.list .col_SalesProvince__c {width:100px;}
table.list .col_Product_category__c {width:100px;}
@@ -86,12 +86,22 @@
result = sforce.connection.update([es]);
// 瀛樺湪qr鏃讹紝缁戝埌娓呭崟涓�
} else {
-
var records = record.getArray("records");
+ var version = new sforce.SObject("ContentVersion");
+ version = sforce.connection.query("select Id,ContentDocumentId from ContentVersion where ContentDocumentId = \'" + records[0].id + "\'");
+ version = version.getArray("records");
+
var es = new sforce.SObject("ReceivingNote__c");
es.Id = "{!pageB.rn.Id}";
- es.QRId__c = records[0].Id;
+ es.QRId__c = versionResult[0].id;
result = sforce.connection.update([es]);
+
+
+ // var records = record.getArray("records");
+ // var es = new sforce.SObject("ReceivingNote__c");
+ // es.Id = "{!pageB.rn.Id}";
+ // es.QRId__c = records[0].Id;
+ // result = sforce.connection.update([es]);
}
}
@@ -769,7 +779,7 @@
</apex:outputPanel>
<!-- <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" rendered="{!info.value != 'Asset_loaner_category__c' || var.haveAsset }" style="{!IF('Fixture_Arrival_Product__c' == info.value, 'width:70%;', '')}"/> -->
- <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" rendered="{!(info.value != 'Asset_loaner_category__c' || var.haveAsset) && ((var.rnd['Asset_loaner_category_F__c'] =='鍥哄畾璧勪骇' && info.value != 'unknow_serial_NO_product__c' && info.value != 'Manage_type__c') || var.rnd['Asset_loaner_category_F__c'] !='鍥哄畾璧勪骇')}" style="{!IF('Fixture_Arrival_Product__c' == info.value, 'width:70%;', '')}"/>
+ <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" rendered="{!(info.value != 'Asset_loaner_category__c' || var.haveAsset) && ((var.rnd['Asset_loaner_category_F__c'] =='鍥哄畾璧勪骇' && info.value != 'unknow_serial_NO_product__c' && info.value != 'Manage_type__c') || var.rnd['Asset_loaner_category_F__c'] !='鍥哄畾璧勪骇')}" style="{!IF('Fixture_Arrival_Product__c' == info.value || 'EquipmentSet_Managment_Code__c' == info.value, 'width:90%;', '')}"/>
<!-- 20210804 ljh add id -->
<!-- update by rentx 20210727 end 鏂板搧鏀惰揣_闆嗕腑澶囧搧_寤虹珛鏁版嵁閫昏緫闄愬埗 -->
</apex:outputPanel>
--
Gitblit v1.9.1