From 47b2e621c2a5ea58cee946c36a3307f6fe8e6982 Mon Sep 17 00:00:00 2001
From: 李金换 <lijinhuan@prec-tech.com>
Date: 星期三, 23 三月 2022 18:22:58 +0800
Subject: [PATCH] 【委托】金华众智-ET耗材无法入库问题解决
---
force-app/main/default/pages/ArriveGoods.page | 114 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 81 insertions(+), 33 deletions(-)
diff --git a/force-app/main/default/pages/ArriveGoods.page b/force-app/main/default/pages/ArriveGoods.page
index 445c027..f4e823f 100644
--- a/force-app/main/default/pages/ArriveGoods.page
+++ b/force-app/main/default/pages/ArriveGoods.page
@@ -33,11 +33,25 @@
}
}
+
+//鐢ㄦ硶濡備笅//add by rentx 20210617 start
+function cancleKongbai(){
+ var aEle=document.getElementById('tableId').getElementsByTagName('td');
+
+ for(var i=0;i<aEle.length;i++){
+ if(aEle[i].className=='data2Col' || aEle[i].className=='data2Col last')
+ {
+ aEle[i].style.display = 'none';
+ }
+ }
+};
+//鐢ㄦ硶濡備笅//add by rentx 20210617 end
+
window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });
</script>
<apex:form id="allForm">
- <apex:actionFunction name="SearchPro" action="{!SearchPro}" rerender="ConsumableorderdetailsSection,ConsumableorderdetailsSection1,ConsumabledetailsofReturn,productInventorydetails, message,detailsSummary" onComplete="unblockUI();">
+ <apex:actionFunction name="SearchPro" action="{!SearchPro}" rerender="ConsumableorderdetailsSection,ConsumableorderdetailsSection1,ConsumabledetailsofReturn,productInventorydetails, message,detailsSummary" onComplete="unblockUI();cancleKongbai();">
</apex:actionFunction>
<apex:actionFunction name="ArriveGoodsConfim" action="{!ArriveGoodsConfim}" rerender="ConsumableorderdetailsSection,ConsumableorderdetailsSection1,ConsumabledetailsofReturn,productInventorydetails,message,EDCline_1,orderinfo,messageText" onComplete="unblockUI();">
</apex:actionFunction>
@@ -154,39 +168,73 @@
</apex:pageblocktable>
</apex:pageblocksection>
</apex:pageBlock>
- <apex:pageBlock title="鍒拌揣鏄庣粏" rendered="{!!ReturnFLGbln}">
- <apex:pageblocksection columns="1" id="ConsumableorderdetailsSection">
- <!-- //add by rentx CHAN-C3K4ZQ 20210602 start -->
+ <apex:pageBlock title="鍒拌揣鏄庣粏" rendered="{!!ReturnFLGbln}" id="ConsumableorderdetailsSection">
+ <!-- <apex:pageblocksection columns="1" id="ConsumableorderdetailsSection">add by rentx CHAN-C3K4ZQ 20210618 -->
+ <table class="list" border="0" cellpadding="0" cellspacing="0" id="tableId" >
+ <colgroup>
+ <col width="160px"/>
+ <col width="160px"/>
+ <col width="160px"/>
+ <col width="160px"/>
+ <col width="160px"/>
+ <col width="160px"/>
+ <col width="200px"/>
+ </colgroup>
+
+ <tr class="headerRow">
+ <th width="16%">娑堣�楀搧鍚嶇О</th>
+ <th width="16%">瑙勬牸</th>
+ <th width="16%">CFDA鐘舵��</th>
+ <th width="16%">娉ㄥ唽璇佺紪鐮佸彿</th>
+ <th width="16%">娉ㄥ唽璇佹晥鏈�</th>
+ <th width="20%">BarCode</th>
+ </tr>
<apex:repeat value="{!ConsumableorderdetailsRecordsview}" var="records" id="ConsumableorderdetailsTableOuter" >
+ <apex:repeat value="{!records}" var="item" id="ConsumableorderdetailsTable">
+ <tr class="dataRow">
+ <td> {!item.Prod.Name__c} </td>
+ <td> {!item.esd.ProductPacking_list_manual__c} </td>
+ <td> {!item.esd.CFDA_Status__c} </td>
+ <td> {!item.esd.Report_Product_Approbation__c} </td>
+ <td> {!item.ReportProductExpirationDate} </td>
+ <td> {!item.esd.Bar_Code__c} </td>
+ </tr>
+ </apex:repeat>
+ </apex:repeat>
+ </table>
+ <!-- add by rentx CHAN-C3K4ZQ 20210618 -->
+
+ <!-- //add by rentx CHAN-C3K4ZQ 20210602 start 娉ㄩ噴by rentx start 20210618 -->
+ <!-- <apex:repeat value="{!ConsumableorderdetailsRecordsview}" var="records" id="ConsumableorderdetailsTableOuter" > -->
<!-- //add by rentx CHAN-C3K4ZQ 20210602 end -->
<!-- //update by rentx CHAN-C3K4ZQ 20210602 start -->
- <!-- <apex:pageblocktable value="{!ConsumableorderdetailsRecordsdummy}" var="records" id="ConsumableorderdetailsTable"> -->
- <apex:pageblocktable value="{!records}" var="records" id="ConsumableorderdetailsTable">
+ <!-- <apex:pageblocktable value="{!records}" var="records" id="ConsumableorderdetailsTable"> -->
+ <!-- <apex:pageblocktable value="{!records}" var="records" id="ConsumableorderdetailsTable"> -->
<!-- //update by rentx CHAN-C3K4ZQ 20210602 end -->
- <apex:column width="80">
- <apex:facet name="header">娑堣�楀搧鍚嶇О</apex:facet>
- <apex:outputField value="{!records.Prod.Name__c}"/>
- </apex:column>
- <apex:column width="80" style="text-align: center;">
- <apex:facet name="header">瑙勬牸</apex:facet>
- <apex:outputField value="{!records.esd.ProductPacking_list_manual__c}"/>
- </apex:column>
- <apex:column width="80">
- <apex:facet name="header">CFDA鐘舵��</apex:facet>
- <apex:outputField value="{!records.esd.CFDA_Status__c}"/>
- </apex:column>
- <apex:column width="80">
- <apex:facet name="header">娉ㄥ唽璇佺紪鐮佸彿</apex:facet>
- <apex:outputField value="{!records.esd.Report_Product_Approbation__c}"/>
- </apex:column>
- <apex:column width="80">
- <apex:facet name="header">娉ㄥ唽璇佹晥鏈�</apex:facet>
- <apex:outputField value="{!records.esd.Report_Product_Expiration__c}"/>
- </apex:column>
- <apex:column width="80">
- <apex:facet name="header">BarCode</apex:facet>
- <apex:outputField value="{!records.esd.Bar_Code__c}"/>
- </apex:column>
+ <!-- <apex:column width="80"> -->
+ <!-- <apex:facet name="header">娑堣�楀搧鍚嶇О</apex:facet> -->
+ <!-- <apex:outputField value="{!records.Prod.Name__c}"/> -->
+ <!-- </apex:column> -->
+ <!-- <apex:column width="80" style="text-align: center;"> -->
+ <!-- <apex:facet name="header">瑙勬牸</apex:facet> -->
+ <!-- <apex:outputField value="{!records.esd.ProductPacking_list_manual__c}"/> -->
+ <!-- </apex:column> -->
+ <!-- <apex:column width="80"> -->
+ <!-- <apex:facet name="header">CFDA鐘舵��</apex:facet> -->
+ <!-- <apex:outputField value="{!records.esd.CFDA_Status__c}"/> -->
+ <!-- </apex:column> -->
+ <!-- <apex:column width="80"> -->
+ <!-- <apex:facet name="header">娉ㄥ唽璇佺紪鐮佸彿</apex:facet> -->
+ <!-- <apex:outputField value="{!records.esd.Report_Product_Approbation__c}"/> -->
+ <!-- </apex:column> -->
+ <!-- <apex:column width="80"> -->
+ <!-- <apex:facet name="header">娉ㄥ唽璇佹晥鏈�</apex:facet> -->
+ <!-- <apex:outputField value="{!records.esd.Report_Product_Expiration__c}"/> -->
+ <!-- </apex:column> -->
+ <!-- <apex:column width="80"> -->
+ <!-- <apex:facet name="header">BarCode</apex:facet> -->
+ <!-- <apex:outputField value="{!records.esd.Bar_Code__c}"/> -->
+ <!-- </apex:column> -->
<!-- <apex:column width="80">
<apex:facet name="header">鍙戣揣鏃ユ湡</apex:facet>
<apex:outputField value="{!records.esd.Deliver_date__c}"/>
@@ -195,9 +243,9 @@
<apex:facet name="header">{!$ObjectType.Consumable_order_details__c.fields.IsArrival__c.label}</apex:facet>
<apex:outputField value="{!records.esd.IsArrival__c}"/>
</apex:column> -->
- </apex:pageblocktable>
- </apex:repeat>
- </apex:pageblocksection>
+ <!-- </apex:pageblocktable> -->
+ <!-- </apex:repeat> -->
+ <!-- </apex:pageblocksection> 娉ㄩ噴byrentx end 20210618 end-->
</apex:pageBlock>
<apex:pageBlock title="杩斿搧鏄庣粏" rendered="{!ReturnFLGbln}" id="returnTable">
--
Gitblit v1.9.1