LiJinHuan
2023-05-25 52321010086ac12b441f77e0798c5eee528174cb
备品出借 排队查看序列信息 及公用css:listTable和之前修改改为公用css文件
3个文件已修改
2个文件已添加
76 ■■■■■ 已修改文件
force-app/main/default/pages/ReantalApplySeriesNo.page 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalApplySequence.page 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalFixtureSetAssignAgency.page 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/listTable.css 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/listTable.resource-meta.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ReantalApplySeriesNo.page
@@ -1,9 +1,12 @@
<apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="序列查看">
    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<!-- <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">
<!-- 20230525 ljh lightning -->
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
    <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
    <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning  -->
    <style type="text/css">
    .bPageBlock .detailList .dataCol {
        width: auto;
@@ -24,7 +27,8 @@
    </script>
    <apex:form id="allForm">
        <apex:pageBlock id="searchBlock" title="序列信息">
            <apex:pageBlockSection columns="3" id="mainSection">
            <!-- 20230525 ljh lightning start -->
            <!-- <apex:pageBlockSection columns="3" id="mainSection">
                <apex:pageBlockSectionItem >
                    <apex:outputLabel value="型号:" />
                    <apex:outputField value="{!raq.Fixture_Model_No__c}"/>
@@ -47,11 +51,28 @@
                </apex:pageBlockSectionItem>
                <apex:pageBlockSectionItem >
                    <apex:outputLabel value="序列类型:"/>
                    <!-- {!Isadmix} -->
                    <apex:outputText value="{!IF(Isadmix,'混合','单一')}"/>
                    <!-- <input name="Isadmix" disabled="true" type="checkbox" value="{!Isadmix}" checked="{!IF(Isadmix,'checked','')}" /> -->
                </apex:pageBlockSectionItem>
            </apex:pageBlockSection>
            </apex:pageBlockSection> -->
            <table style="width:100%;margin:10px 0;" >
                <tr>
                    <td>型号:</td>
                    <td>{!raq.Fixture_Model_No__c}</td>
                    <td>备品存放地:</td>
                    <td>{!raq.Internal_asset_location__c}</td>
                    <td>本部:</td>
                    <td>{!raq.Salesdepartment__c}</td>
                </tr>
                <tr>
                    <td>备品分类:</td>
                    <td>{!raq.Equipment_Type__c}</td>
                    <td>产品分类:</td>
                    <td>{!raq.Product_category__c}</td>
                    <td>序列类型:</td>
                    <td>{!IF(Isadmix,'混合','单一')}</td>
                </tr>
            </table>
            <!-- 20230525 ljh lightning end -->
        </apex:pageBlock>
        <apex:outputPanel id="message">
            <apex:pageMessages />
force-app/main/default/pages/RentalApplySequence.page
@@ -6,7 +6,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning  -->
<style type="text/css">
    .hideDropdown select{
        display: none
@@ -14,19 +14,6 @@
    .table-head{padding-right:17px;}
    .tablehead0{padding-right:0;}
    .table-body table tr:nth-child(2n){background-color:#f2f2f2;}
    /* 20230524 ljh lightning start  */
    body .pbBody table.list tr th, body .pbBody table.list tr td {
        border: 1px solid #ededed;
        white-space: normal;
    }
    body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
        background: #f2f3f3;
        border-width: 0 0 1px 1px;
        border-color: #e0e3e5;
        font-size: .9em;
        font-weight: bold;
    }
    /* 20230524 ljh lightning end  */
    /*以下是下拉复选框的样式  start*/
    * {
        margin: 0;
force-app/main/default/pages/RentalFixtureSetAssignAgency.page
@@ -7,6 +7,7 @@
    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
    <apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
    <apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
    <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning  -->
<style type="text/css">
    .hideDropdown select{
        display: none
@@ -59,17 +60,6 @@
    /* body .pbBody table.list tr.headerRow td, body .pbBody table.list tr.headerRow th {
        border-width: 1px;
    } */
    body .pbBody table.list tr th, body .pbBody table.list tr td {
        border: 1px solid #ededed;
        white-space: normal;
    }
    body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
        background: #f2f3f3;
        border-width: 0 0 1px 1px;
        border-color: #e0e3e5;
        font-size: .9em;
        font-weight: bold;
    }
    /* 20230524 ljh lightning end  */
</style>
<script type="text/javascript">
force-app/main/default/staticresources/listTable.css
New file
@@ -0,0 +1,11 @@
body .pbBody table.list tr th, body .pbBody table.list tr td {
    border: 1px solid #ededed;
    white-space: normal;
}
body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
    background: #f2f3f3;
    border-width: 0 0 1px 1px;
    border-color: #e0e3e5;
    font-size: .9em;
    font-weight: bold;
}
force-app/main/default/staticresources/listTable.resource-meta.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<StaticResource xmlns="http://soap.sforce.com/2006/04/metadata">
    <cacheControl>Public</cacheControl>
    <contentType>text/css</contentType>
</StaticResource>