【委托】金华众智-ET耗材无法入库问题解决

李金换

2022-03-23 47b2e621c2a5ea58cee946c36a3307f6fe8e6982

 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">