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/DirectAssign.page | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/pages/DirectAssign.page b/force-app/main/default/pages/DirectAssign.page
index 7c4da83..138ea7a 100644
--- a/force-app/main/default/pages/DirectAssign.page
+++ b/force-app/main/default/pages/DirectAssign.page
@@ -1,4 +1,4 @@
-<apex:page controller="DirectAssignController" showHeader="false" sidebar="false" id="allPage">
+<apex:page controller="DirectAssignController" showHeader="false" sidebar="false" id="allPage" lightningStylesheets="true">
<script type="text/javascript">
function confirmAssign() {
return confirm("纭鎸囧畾璇ョ敵璇峰崟鐨勬殏瀹氬垎閰嶏紵");
@@ -7,7 +7,7 @@
</script>
<style type="text/css">
.bPageBlock .detailList .dataCol {
- width: 15%;
+ width: 15%!important;
}
</style>
<head>
@@ -17,7 +17,6 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
</head>
-<!-- note -->
<apex:form id="allForm">
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
@@ -29,7 +28,7 @@
<apex:pageBlockSection columns="3" collapsible="false" title="鎶㈠ず鏆傚畾鍒嗛厤鐢婚潰" rendered="{!targetId!=''}" >
<apex:outputField value="{!raesd.Fixture_Model_No_text__c}" />
<apex:outputField value="{!raesd.Asset__c}" />
- <apex:outputField label="鍘熺敵璇峰崟鍙�" value="{!raesd.Rental_Apply__r.Name}" />
+ <!-- <apex:outputField label="鍘熺敵璇峰崟鍙�" value="{!raesd.Rental_Apply__r.Name}" /> -->
</apex:pageBlockSection>
<div style="padding-left: 70px;margin: 10px;">
@@ -53,13 +52,13 @@
<apex:column headerValue="閫夋嫨">
<apex:inputCheckbox value="{!rased.selected}"/>
</apex:column>
- <apex:column value="{!rased.detail.Rental_Apply__r.Name}" ></apex:column>
+ <!-- <apex:column value="{!rased.detail.Rental_Apply__r.Name}" ></apex:column> -->
<apex:column value="{!rased.detail.Rental_Apply_Equipment_Set__r.Name}"></apex:column>
<apex:column value="{!rased.detail.Queue_Day__c}"></apex:column>
<apex:column value="{!rased.detail.Queue_Number__c}"></apex:column>
- <apex:column value="{!rased.detail.Rental_Apply__r.WorkPlace__c}"></apex:column>
- <apex:column value="{!rased.detail.Rental_Apply__r.Person_In_Charge__r.Name}"></apex:column>
- <apex:column value="{!rased.detail.Rental_Apply__r.demo_purpose2__c}"></apex:column>
+ <!-- <apex:column value="{!rased.detail.Rental_Apply__r.WorkPlace__c}"></apex:column> -->
+ <!-- <apex:column value="{!rased.detail.Rental_Apply__r.Person_In_Charge__r.Name}"></apex:column> -->
+ <!-- <apex:column value="{!rased.detail.Rental_Apply__r.demo_purpose2__c}"></apex:column> -->
<apex:column value="{!rased.detail.Allow_Adjust_Queue_Flag__c}"></apex:column>
<apex:column value="{!rased.detail.jumpReason__c}"></apex:column>
<apex:column value="{!rased.detail.Queue_Conment__c}"></apex:column>
--
Gitblit v1.9.1