新品收货样式、颜色、显示margin

张宇恒

2023-08-08 e15f4679a2b71a186aa9e87cd49b4ab9c249cc63

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

@@ -7,7 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
<apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/>
<!-- <apex:stylesheet value="{!URLFOR($Resource.EquipmentSetShippmentReceivedcss)}"/> -->
<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
<script type="text/javascript">
@@ -98,18 +98,120 @@

</script>
<style type="text/css">
    .detail {
       margin-left:5px;
       width:310px;
    }

    .menu {
       padding:0px;
       border-left:1px solid #D1D1D1;
       border-right:1px solid #D1D1D1;
    }

    .menu h2{
       margin:0;
       padding:0;
       font-size:14px;
    }

    .menu h2 div {
        width: 308px;
        text-align: left;
        margin: 0;
        background:#DCDCDC;
    }
        
    .menu ul{
       margin:0;
       padding:1px;
       list-style: none;
       border-top:1px solid #ddd;
    }

    .menu li {
       padding:0;
       font-size:14px;
       line-height:1.0;
       height:23px;
       clear:both;
       /*border-bottom: 1px dotted #999;*/
    }

    .menu li span {
        width: 140px;
        text-align: right;
        float: left;
        margin: 5px 0px 0px 0px;
    }

    .menu li span span{
        text-align: left;
        margin-left: 3px;
        margin-top: 0px;
    }

    .commandbutton {
       font-size: 13px !important;
    }

    .tabsize {
       font-size: 14px !important;
    }

    .detailtab {
       font-size: 14px;
       margin-top: 0;
    }

    .detailhander {
       font-size: 16px;
    }

    .deliveryslip {
       font-size: 15px;
    }

    .modal {
       display:none;
       position: fixed; /* Stay in place */
       z-index: 10; /* Sit on top */
       left: 0;
       top: 0;
       width: 100%; /* Full width */
       height: 100%; /* Full height */
       overflow: auto; /* Enable scroll if needed */
       background-color: rgb(0,0,0); /* Fallback color */
       background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
    }

    /* Modal Content/Box */
    .modal-content {
       background-color: #fefefe;
       margin-left: 6px;
       margin-top: 100px;
       padding: 20px;
       border: 1px solid #888;
       width: 265px; /* Could be more or less, depending on screen size */
    }

    .freezehander {
       position: fixed;
       top: 0px;
       background-color:
       white;
       width: 320px;
       z-index: 1;
    }

    .menu div.m_title{
        border-top-left-radius:10px;
        border-top-right-radius:10px;
        text-align: left;
        margin: 0;
        /* lightning改造   zyh   start */
        /* padding: 1%; */
        /* width: 98%; */
        /* background:#DCDCDC; */
        background:#95aee5;
        padding-left: 0.75rem;
        /* lightning改造   zyh   end */
        padding: 1%;
        width: 100%;
        background:#DCDCDC;
        position: relative;
    }
    .checkintitle{
@@ -127,20 +229,13 @@
    }
    #Step_tab li {
        position: relative;
        /* lightning改造   zyh   start */
        /* width: 20%; */
        width: 50%;
        /* lightning改造   zyh   end */
        width: 20%;
        float: left;
        margin: 0;
        padding: 0;
        text-align: center;
        cursor: pointer;
        /* lightning改造   zyh   start */
        /* height: 25px; */
        height: 30px;
        line-height: 30px;
        /* lightning改造   zyh   end */
        height: 25px;
    }
    #Step_tab li span {
        margin: 0;
@@ -151,10 +246,8 @@
        line-height: 1;
    }
    div.detail {
        /* lightning改造   zyh   start */
        /* margin-left: 5px; */
        /* width: 400px; */
        /* lightning改造   zyh   start */
        margin-left: 5px;
        width: 400px;
    }
    #Step_tab li.selected {
        background: #3b5998;
@@ -164,9 +257,7 @@
    }
    div.menu{
        margin-bottom: 20px; 
        /* lightning改造   zyh   start */
        /* width: 490px; */
        /* lightning改造   zyh   end */
        width: 490px;
    }

    hr {
@@ -198,34 +289,32 @@
    .menu{
        border:1px solid #a1a1a1;
        border-radius:10px;
        /* lightning改造   zyh   start */
        /* width: 400px; */
        /* lightning改造   zyh   end */
        width: 400px;
    }
    .menu li .fieldname {
        width: 30%;
        /* text-align: right; */
        text-align: left;
        /* float: left; */
        width: 35%;
        text-align: right;
        float: left;
    }
    .menu li .fieldvalue{
        width: 45%;
            width: 45%;
        text-align: left;
        margin-left: 10px;

    }
    .menu li {
        vertical-align: middle;
        margin: 5px 0;
        margin: 15px 0;
    }
    .commandbutton{
        width: 100px !important;
        margin-left: 20px !important;
    }
    div.freezehander{
        /* lightning改造   zyh   start */
        /* width:500px; */
        /* lightning改造   zyh   end */
        width:500px;
    }
    .checkBox1{
        margin-bottom: 4px; 
    }
</style>

@@ -293,13 +382,12 @@
                
                <apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rnd.ReceivingNoteSummary__r.Id, false, true)}">
                    <hr/>
                    <apex:inputCheckbox id="summaryCheck" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><h3 style="padding: 5px;" class="detailtab">{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>&nbsp;&nbsp;&nbsp;到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>&nbsp;&nbsp;&nbsp;汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
                    <h3 style="padding: 5px;" class="detailtab"><apex:inputCheckbox id="summaryCheck" styleClass="checkBox1" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/>{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>&nbsp;&nbsp;&nbsp;到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>&nbsp;&nbsp;&nbsp;汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
                    <apex:variable var="SetName" value="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" />
                </apex:outputPanel>
                    
                <apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}" >
                    <!-- <apex:inputCheckbox id="summaryCheckS" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><h3 style="padding: 5px;" class="detailtab">{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>&nbsp;&nbsp;&nbsp;到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>&nbsp;&nbsp;&nbsp;汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3> -->
                    <apex:inputCheckbox id="summaryCheckS" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/><span style="padding: 5px; font-weight: bold;" class="detailtab">{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>&nbsp;&nbsp;&nbsp;到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>&nbsp;&nbsp;&nbsp;汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</span>
                    <h3 style="padding: 5px;" class="detailtab"><apex:inputCheckbox id="summaryCheckS" styleClass="checkBox1" html-data-sumId="{!esdInfo.rnd.ReceivingNoteSummary__r.Id}" value="{!esdInfo.isChecked}"/>{!esdInfo.rnd.ReceivingNoteSummary__r.ReceivingNoteSummaryNo__c}：{!esdInfo.rnd.ReceivingNoteSummary__r.Fixture_Set__r.Name}<br/>&nbsp;&nbsp;&nbsp;到货日期： <apex:outputtext value="{0, date, yyyy/MM/dd}"><apex:param value="{!esdInfo.rnd.ReceivingNoteSummary__r.Received_Confirm_Date__c}" /></apex:outputtext>&nbsp;&nbsp;&nbsp;汇总结果： {!esdInfo.rnd.ReceivingNoteSummary__r.Inspection_result_F__c}</h3>
                </apex:outputPanel>
                    
                <div class="menu">
@@ -435,7 +523,10 @@
            userAgent = window.navigator.userAgent.toLowerCase(),
            safari = /safari/.test( userAgent ),
            ios = /iphone|ipod|ipad/.test( userAgent ),
            ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
            ver = '';
            if (ios) {
                ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
            }
        let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false});
        scanner.addListener('scan', function (content) {
          filljsQR(content);