From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/SearchProduct.page | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/SearchProduct.page b/force-app/main/default/pages/SearchProduct.page
index 656dcc7..a7e0d8c 100644
--- a/force-app/main/default/pages/SearchProduct.page
+++ b/force-app/main/default/pages/SearchProduct.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" standardController="Product2" extensions="SearchProductController" sidebar="false" showHeader="false" >
+<apex:page id="Page" standardController="Product2" extensions="SearchProductController" sidebar="false" showHeader="false" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -471,7 +471,10 @@
<tr>
<td>
<div id="iframelike" style="width:800px">
- <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="9" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,35px">
+ <!-- 20221020 ljh SWAG-CJ98AJ start-->
+ <!-- <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="9" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,35px"> -->
+ <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="10" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,60px,35px">
+ <!-- 20221020 ljh SWAG-CJ98AJ end-->
<apex:column style="width:15px;" >
<apex:facet name="header">{!$Label.Selected}</apex:facet>
<input type="checkbox" name="checklist" value="" style="width:10px;"/>
@@ -526,6 +529,12 @@
<apex:facet name="header">{!$Label.Product_Name}</apex:facet>
<apex:outputField id="Name" value="{!c.pbe.Product2.Name}" />
</apex:column>
+ <!-- 20221020 ljh SWAG-CJ98AJ start-->
+ <apex:column >
+ <apex:facet name="header">{!$ObjectType.Product2.fields.suitDepartment__c.Label}</apex:facet>
+ <apex:outputField id="suitDepartment__c" value="{!c.pbe.Product2.suitDepartment__c}" />
+ </apex:column>
+ <!-- 20221020 ljh SWAG-CJ98AJ end-->
<apex:column >
<apex:facet name="header">{!$ObjectType.Product2.fields.Alternative_Products__c.Label}</apex:facet>
<apex:outputField id="Alternative" value="{!c.pbe.Product2.Alternative_Products__c}" />
--
Gitblit v1.9.1