比较文本

查找两个文本文件之间的差异

实时编辑器

折叠未更改行

关闭换行

视图

比对精度

语法高亮

Diffchecker Desktop 运行Diffchecker最安全的方式。获取Diffchecker桌面应用：您的差异永远不会离开您的电脑！获取桌面版

Untitled diff

创建于 11年前差异永不过期

2 删除

行
总计
删除

字符
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

53 行

1 添加

行
总计
添加

字符
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

52 行

<!-------------------------------------------------------------------------------------------

Created By: Soumya

Created Date: 25/10/2013

Description: This page is used as an Inline VF in Service Order to display related LineItems

-------------------------------------------------------------------------------------------->

<apex:page standardController="PPS_Service_Order__c" extensions="lineItemsListCntrl2" sidebar="true">

<apex:page standardController="PPS_Service_Order__c" extensions="lineItemsListCntrl" sidebar="true">

<apex:form >

<apex:pageMessages />

<apex:pageBlock rendered="{!displayTable}">

<apex:pageblockButtons >

<apex:commandButton value="Submit" action="{!submit}"/>

</apex:pageblockButtons>

<apex:outputPanel rendered="{!displayTable}">

<apex:pageBlockTable value="{!LineItemsList}" var="SO">

<apex:column headerValue="Service Name" >

<apex:outputfield value="{!SO.lineItem.Service_Name__c}" />

</apex:column>

<apex:column headerValue="Service Type" >

<apex:outputfield value="{!SO.lineItem.Service_Type__c}" />

</apex:column>

<apex:column headerValue="Service Description" >

<apex:outputfield value="{!SO.lineItem.DetailDescription__c}" />

</apex:column>

<apex:column headerValue="Part Number" rendered="{!partFlag}">

<apex:outputfield value="{!SO.lineItem.Part_Number__c}" />

</apex:column>

<apex:column headerValue="Part Description" rendered="{!partFlag}">

<apex:outputfield value="{!SO.lineItem.Part_Description__c}" />

</apex:column>

<apex:column headerValue="Driver Number" rendered="{!driverFlag}">

<apex:outputfield value="{!SO.lineItem.Driver_Number__c}"/>

</apex:column>

<apex:column headerValue="Driver Description" rendered="{!driverFlag}">

<apex:outputfield value="{!SO.lineItem.Driver_Description__c}" />

</apex:column>

<apex:column headerValue="PudoFlag" >

<apex:outputfield value="{!SO.lineItem.Pudo_Flag__c}" />

</apex:column>

<apex:column headerValue="Ext Reference" >

<apex:outputfield value="{!SO.lineItem.Ext_Reference__c}" />

</apex:column>

<apex:column headerValue="Status" >

<apex:selectList size="1" value="{!SO.status}">

<apex:selectOptions value="{!options}" />

</apex:selectList>

</apex:column>

</apex:pageBlockTable>

</apex:outputPanel>

</apex:pageBlock>

</apex:form>

</apex:page>

已保存差异

原始文本

打开文件

<apex:page standardController="PPS_Service_Order__c" extensions="lineItemsListCntrl" sidebar="true">
    <apex:form >
    <apex:pageMessages />
        <apex:pageBlock rendered="{!displayTable}">
           <apex:pageblockButtons >
               <apex:commandButton value="Submit" action="{!submit}"/>
           </apex:pageblockButtons>
           <apex:outputPanel rendered="{!displayTable}">
              <apex:pageBlockTable value="{!LineItemsList}" var="SO">
              
              <apex:column headerValue="Service Name" > 
                    <apex:outputfield value="{!SO.lineItem.Service_Name__c}" /> 
                </apex:column>
                <apex:column headerValue="Service Type" > 
                    <apex:outputfield value="{!SO.lineItem.Service_Type__c}" /> 
                </apex:column>
                 <apex:column headerValue="Service Description" > 
                    <apex:outputfield value="{!SO.lineItem.DetailDescription__c}" /> 
                </apex:column>
                 <apex:column headerValue="Part Number" rendered="{!partFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Part_Number__c}" /> 
                </apex:column>
                 <apex:column headerValue="Part Description" rendered="{!partFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Part_Description__c}" /> 
                </apex:column>
                 <apex:column headerValue="Driver Number" rendered="{!driverFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Driver_Number__c}"/> 
                </apex:column>
                <apex:column headerValue="Driver Description" rendered="{!driverFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Driver_Description__c}" /> 
                </apex:column>
                <apex:column headerValue="PudoFlag" > 
                    <apex:outputfield value="{!SO.lineItem.Pudo_Flag__c}" /> 
                </apex:column>
                 <apex:column headerValue="Ext Reference" > 
                    <apex:outputfield value="{!SO.lineItem.Ext_Reference__c}" /> 
                </apex:column>
                <apex:column headerValue="Status" >
                    <apex:selectList size="1" value="{!SO.status}">
                       <apex:selectOptions value="{!options}" />                       
                    </apex:selectList>
                </apex:column>
         </apex:pageBlockTable>
       </apex:outputPanel>
      </apex:pageBlock>
  </apex:form>
  </apex:page>

更改后文本

打开文件

<apex:page standardController="PPS_Service_Order__c" extensions="lineItemsListCntrl2" sidebar="true">
    <apex:form >
    <apex:pageMessages />
        <apex:pageBlock rendered="{!displayTable}">
           <apex:pageblockButtons >
               <apex:commandButton value="Submit" action="{!submit}"/>
           </apex:pageblockButtons>
           <apex:outputPanel rendered="{!displayTable}">
              <apex:pageBlockTable value="{!LineItemsList}" var="SO">
              
              <apex:column headerValue="Service Name" > 
                    <apex:outputfield value="{!SO.lineItem.Service_Name__c}" /> 
                </apex:column>
                <apex:column headerValue="Service Type" > 
                    <apex:outputfield value="{!SO.lineItem.Service_Type__c}" /> 
                </apex:column>
                 <apex:column headerValue="Service Description" > 
                    <apex:outputfield value="{!SO.lineItem.DetailDescription__c}" /> 
                </apex:column>
                 <apex:column headerValue="Part Number" rendered="{!partFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Part_Number__c}" /> 
                </apex:column>
                 <apex:column headerValue="Part Description" rendered="{!partFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Part_Description__c}" /> 
                </apex:column>
                 <apex:column headerValue="Driver Number" rendered="{!driverFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Driver_Number__c}"/> 
                </apex:column>
                <apex:column headerValue="Driver Description" rendered="{!driverFlag}"> 
                    <apex:outputfield value="{!SO.lineItem.Driver_Description__c}" /> 
                </apex:column>
                <apex:column headerValue="PudoFlag" > 
                    <apex:outputfield value="{!SO.lineItem.Pudo_Flag__c}" /> 
                </apex:column>
                 <apex:column headerValue="Ext Reference" > 
                    <apex:outputfield value="{!SO.lineItem.Ext_Reference__c}" /> 
                </apex:column>
                <apex:column headerValue="Status" >
                    <apex:selectList size="1" value="{!SO.status}">
                       <apex:selectOptions value="{!options}" />                       
                    </apex:selectList>
                </apex:column>
         </apex:pageBlockTable>
       </apex:outputPanel>
      </apex:pageBlock>
  </apex:form>
  </apex:page>