Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 force-app/main/default/pages/ReantalApplySeriesNo.page

@@ -1,27 +1,27 @@
<apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="序列查看">
<apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="序列查看" lightningStylesheets="true">
    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
   <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
   <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
   <apex:includeScript value="/soap/ajax/29.0/connection.js"/>
   <apex:includeScript value="/soap/ajax/29.0/apex.js"/>
   <style type="text/css">
   .bPageBlock .detailList .dataCol {
       width: auto;
   }
   .table-head{padding-right:17px;}
   .tablehead0{padding-right:0;}
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
    <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
    <style type="text/css">
    .bPageBlock .detailList .dataCol {
        width: auto;
    }
    .table-head{padding-right:17px;}
    .tablehead0{padding-right:0;}
    .table-body table tr:nth-child(2n){background-color:#f2f2f2;}
   </style>
   <script>
      // window.onload = () => {
      window.onload = function gunzhou(){
          if(j$('#tablebody').height() >= 270){
            j$('#table-head').addClass("table-head");
         }else{
            j$('#table-head').addClass("tablehead0");
         }
      }
   </script>
    </style>
    <script>
        // window.onload = () => {
        window.onload = function gunzhou(){
            if(j$('#tablebody').height() >= 270){
                j$('#table-head').addClass("table-head");
            }else{
                j$('#table-head').addClass("tablehead0");
            }
        }
    </script>
    <apex:form id="allForm">
        <apex:pageBlock id="searchBlock" title="序列信息">
            <apex:pageBlockSection columns="3" id="mainSection">
@@ -57,78 +57,79 @@
            <apex:pageMessages />
        </apex:outputPanel>
        <apex:pageBlock id="raqList" title="查看序列情况">
       <div class="" id="table-head">
           <table class="list" border="0" cellpadding="0" cellspacing="0" width="100%" >
              <colgroup>
               <col width="4%" />
               <col width="4%" />
               <col width="10%" />
               <col width="10%"/>
               <col width="8%"/>
               <col width="8%"/>
               <col width="7%"/>
               <col width="10%"/>
               <col width="8%"/>
               <col width="5%"/>
               <col width="13%"/>
               <col width="13%"/>
               </colgroup>
               <thead>
               <tr class="headerRow" >
                   <th style="padding-bottom: 6px;">序列号</th>
                   <th style="padding-bottom: 6px;">排队NO.</th> 
                   <th style="padding-bottom: 6px;">申请单NO.</th> 
                   <th style="padding-bottom: 6px;">排队时间</th>
                   <th style="padding-bottom: 6px;">申请者办事处</th> 
                   <th style="padding-bottom: 6px;">备品出借担当</th> 
                   <th style="padding-bottom: 6px;">希望到货日</th>
                   <th style="padding-bottom: 6px;">批准时间</th> 
                   <th style="padding-bottom: 6px;">使用目的2</th> 
                   <th style="padding-bottom: 6px;">负责人</th>
                   <th style="padding-bottom: 6px;">医院</th> 
                   <th style="padding-bottom: 6px;">学会</th> 
               </tr>
               </thead>
               </table>
           </div>
           <div class="table-body" id="table-body" style="height: 270px;overflow-y:auto;">
           <table class="list" border="0" cellpadding="0" cellspacing="0" id="tablebody">
              <colgroup>
               <col width="4%" />
               <col width="4%" />
               <col width="10%" />
               <col width="10%"/>
               <col width="8%"/>
               <col width="8%"/>
               <col width="7%"/>
               <col width="10%"/>
               <col width="8%"/>
               <col width="5%"/>
               <col width="13%"/>
               <col width="13%"/>
               </colgroup>
               <tbody>
               <apex:repeat value="{!raqList}" var="info"  id="info">
               <tr height="48px">
                   <td style="white-space: pre-wrap;"><apex:outputLink value="/{!info.Id}">{!info.Series_No__c}</apex:outputLink></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Apply_Set_Detail__r.Queue_Number__c}"/></td>            
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__c}"/></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Apply_Set_Detail__r.Queue_Time_F__c}"/></td>
                   <apex:outputPanel layout="none"> 
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.WorkPlace__c}"/></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Person_In_Charge__c}"/></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Request_shipping_day__c}"/></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Request_approval_time__c}"/></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.demo_purpose2__c}"/></td>
                   </apex:outputPanel>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Apply_Set_Detail__r.Queue_User__c}"/></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Hospital__c}"/></td>
                   <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Campaign__c}"/></td>
               </tr>
               </apex:repeat>
               </tbody>
           </table>
      </div>
      </apex:pageBlock>
        <div class="" id="table-head">
            <table class="list" border="0" cellpadding="0" cellspacing="0" width="100%" >
                <colgroup>
                <col width="4%" />
                <col width="4%" />
                <col width="10%" />
                <col width="10%"/>
                <col width="8%"/>
                <col width="8%"/>
                <col width="7%"/>
                <col width="10%"/>
                <col width="8%"/>
                <col width="5%"/>
                <col width="13%"/>
                <col width="13%"/>
                </colgroup>
                <thead>
                <tr class="headerRow" >
                    <th style="padding-bottom: 6px;">序列号</th>
                    <th style="padding-bottom: 6px;">排队NO.</th> 
                    <th style="padding-bottom: 6px;">申请单NO.</th> 
                    <th style="padding-bottom: 6px;">排队时间</th>
                    <th style="padding-bottom: 6px;">申请者办事处</th> 
                    <th style="padding-bottom: 6px;">备品出借担当</th> 
                    <th style="padding-bottom: 6px;">希望到货日</th>
                    <th style="padding-bottom: 6px;">批准时间</th> 
                    <th style="padding-bottom: 6px;">使用目的2</th> 
                    <th style="padding-bottom: 6px;">负责人</th>
                    <th style="padding-bottom: 6px;">医院</th> 
                    <th style="padding-bottom: 6px;">学会</th> 
                </tr>
                </thead>
                </table>
            </div>
            <div class="table-body" id="table-body" style="height: 270px;overflow-y:auto;">
            <table class="list" border="0" cellpadding="0" cellspacing="0" id="tablebody">
                <colgroup>
                <col width="4%" />
                <col width="4%" />
                <col width="10%" />
                <col width="10%"/>
                <col width="8%"/>
                <col width="8%"/>
                <col width="7%"/>
                <col width="10%"/>
                <col width="8%"/>
                <col width="5%"/>
                <col width="13%"/>
                <col width="13%"/>
                </colgroup>
                <tbody>
                <apex:repeat value="{!raqList}" var="info"  id="info">
                <tr height="48px">
                <!-- <apex:outputLink value="/{!info.Id}">{!info.Series_No__c}</apex:outputLink>-->
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Series_No__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Apply_Set_Detail__r.Queue_Number__c}"/></td>            
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Apply_Set_Detail__r.Queue_Time_F__c}"/></td>
                    <apex:outputPanel layout="none"> 
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.WorkPlace__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Person_In_Charge__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Request_shipping_day__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Request_approval_time__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.demo_purpose2__c}"/></td>
                    </apex:outputPanel>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Apply_Set_Detail__r.Queue_User__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Hospital__c}"/></td>
                    <td style="white-space: pre-wrap;"><apex:outputField value="{!info.Rental_Apply__r.Campaign__c}"/></td>
                </tr>
                </apex:repeat>
                </tbody>
            </table>
        </div>
        </apex:pageBlock>
    </apex:form>
</apex:page>