Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

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

@@ -1,4 +1,4 @@
<apex:page standardController="Sample_order_list__c" extensions="OrdergoodsController" showheader="false" sidebar="false" action="{!init}" id="Page" title="样本订货">
<apex:page standardController="Sample_order_list__c" extensions="OrdergoodsController" showheader="false" sidebar="false" action="{!init}" id="Page" title="样本订货" lightningStylesheets="true">
   <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -95,6 +95,7 @@
               }
            }
         }
            
       </script>
       <!-- 样式 -->
      <style type="text/css">
@@ -224,11 +225,12 @@
   </head>
   <apex:form id="mainForm">
      <h1 style ="font-size: 30px; margin-left: 45%;">样本订货</h1>
      <apex:actionFunction name="save" action="{!save}" rerender="message,mainForm,listsTable" onComplete="SaveAllChecktime();unblockUI();">
      <apex:actionFunction name="save" action="{!save}" rerender="message" onComplete="SaveAllChecktime();unblockUI();">
      </apex:actionFunction>
      <!-- 确认按钮 -->
      <apex:actionFunction name="confirmBtn" action="{!confirmBtn}" rerender="message,mainForm,listsTable" onComplete="SaveAllChecktime();unblockUI();">
      <apex:actionFunction name="confirmBtn" action="{!confirmBtn}" rerender="message" onComplete="SaveAllChecktime();unblockUI();">
      </apex:actionFunction>
      <apex:actionFunction name="changeProvice" rerender="cityid" oncomplete="unblockUI();"/>
      <apex:outputPanel id="listsTable">
         <!-- <apex:pageBlock id="block1"> -->
            <div style="width: 100%;text-align:center;margin:0 auto;">
@@ -270,7 +272,8 @@
                  </tr>
                  <!-- 20211115 lt end -->
                  <tr style="background-color:#f2f3f3;width:900px;">
                     <th style="text-align: left;">送达方联系人:</th>
                     <th style="text-align: left;">送达方联系人:<font color="red">*</font>
                     </th>
                     <td style="text-align:left;">
                        <apex:outputPanel rendered="{!IF(sampleOrder.Status__c='订单已发送',true,false)}" >
                           <apex:outputField value="{!sampleOrder.DeliveryContact__c}"/>
@@ -279,7 +282,7 @@
                           <apex:inputField id="Contact" value="{!sampleOrder.DeliveryContact__c}" />
                        </apex:outputPanel>
                     </td>
                     <th style="text-align:right;">送达方电话:</th>
                     <th style="text-align:right;">送达方电话:<font color="red">*</font></th>
                     <td style="text-align:left;">
                        <apex:outputPanel rendered="{!IF(sampleOrder.Status__c='订单已发送',true,false)}" >
                           <apex:outputField value="{!sampleOrder.DeliveryPhone__c}"/>
@@ -289,6 +292,28 @@
                        </apex:outputPanel>
                     </td>
                  </tr>
                  <tr style="background-color:#f2f3f3;width:900px;">
                     <th style="text-align: left;">省:
                        <apex:outputPanel rendered="{!provinceName=''}">
                           <font color="red">*</font>
                        </apex:outputPanel>
                     </th>
                     <td style="text-align:left;">
                        <apex:selectList value="{!provinceName}" size="1" onchange="blockme(); changeProvice();return false">
                                   <apex:selectOptions value="{!provinceop}"/>
                                </apex:selectList>
                     </td>
                     <th style="text-align:right;">市:
                        <apex:outputPanel rendered="{!cityName=''}">
                           <font color="red">*</font>
                        </apex:outputPanel>
                     </th>
                     <td style="text-align:left;">
                        <apex:selectList value="{!cityName}" size="1" id="cityid" >
                                   <apex:selectOptions value="{!cityop}"/> 
                                </apex:selectList>
                     </td>
                  </tr>
               </table>
            </div>
            <!-- 后台报错信息显示的关键 -->