D C
2023-08-07 5ddfce2bc1c37265902b8f61d6e1c298b94a7091
force-app/main/default/pages/RentalFixtureSetAssign.page
@@ -3,6 +3,7 @@
<title>备品出借分配设备</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.RentalFixtureSetAssignCss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
@@ -71,7 +72,7 @@
    .nav {
        width: 180px;/*20230606 ljh*/
        line-height: 30px;/*20230606 ljh*/
        border: 1px solid #000;
        /* border: 1px solid #000; *//*20230610 ljh*/
        -webkit-user-select: none;
        -moz-user-select: none;
        -ms-user-select: none;
@@ -81,9 +82,11 @@
        right: 0;
        left: 0;
        margin: 0;
        z-index: 9999;
        /* z-index: 9999; */
        z-index: 2;
        display: inline-block;
        border-radius: 0.25rem;
        border-radius: 0.25rem;/*20230607 ljh lightning*/
        border: 1px solid rgb(201, 201, 201);/*20230610 ljh lightning*/
    }
    ul,li {
        list-style: none;
@@ -421,12 +424,12 @@
                    <apex:inputField rendered="{!!(parentObj.Demo_purpose1__c=='维修代用'||parentObj.Demo_purpose1__c=='协议借用')}" id="product_category" value="{!parentObj.Product_category_Sys__c}" />
                    <!-- 20220106 ljh 放开 服务培训/学会 parentObj.CampaignType__c=='服务培训/学会'|| -->
                </apex:pageBlockSection>
                <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" >
                    <!-- <tr>
                        <td></td>
                    </tr> -->
                 <!-- 20230526 ljh lightning start-->
                <!-- <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" > -->
                <table style="width: 450px;margin: auto;float: left;" >
                    <tr><td colspan="{!IF(parentObj.demo_purpose2__c == '学会展会'&&!(contains(parentObj.Salesdepartment__c,'MA本部')||contains(parentObj.Salesdepartment__c,'产品培训')),4,2)}">
                        &nbsp;</td>
                    </tr>
                    <tr>
                        <apex:outputPanel rendered="{!parentObj.demo_purpose2__c == '学会展会'&&!(contains(parentObj.Salesdepartment__c,'MA本部')||contains(parentObj.Salesdepartment__c,'产品培训'))}">
                            <td style="width:50px;font-weight: bold;font-family: Arial,Helvetica,sans-serif;font-size: 91%;color: #4a4a56;">