From efb401888800347f66f7ab04ad925db9def1af47 Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期五, 26 五月 2023 18:02:22 +0800
Subject: [PATCH] 备品出借 分配画面 部分代码 和框架代码
---
force-app/main/default/pages/RentalFixtureSetAssign.page | 10 ++++++++--
force-app/main/default/staticresources/RelationListPagingCmpCss.css | 8 ++++++++
force-app/main/default/staticresources/RentalFixtureSetAssignCss.css | 17 +++++++++++++++++
3 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/RentalFixtureSetAssign.page b/force-app/main/default/pages/RentalFixtureSetAssign.page
index 42946a5..9915642 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssign.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssign.page
@@ -511,11 +511,17 @@
<apex:inputField id="campaignType" value="{!parentObj.CampaignType__c}" />
</td>
</apex:outputPanel>
- <td colspan="2" style="text-align:end;">
+ <!-- 20230526 ljh lightning start-->
+ <!-- <td colspan="2" style="text-align:end;"> -->
+ <td style="text-align:end;">
+ <!-- 20230526 ljh lightning end-->
<apex:commandButton action="{!defaultScheduel}" disabled="{!parentObj.Demo_purpose1__c=='鍏朵粬'||parentObj.Status__c!='宸叉壒鍑�'}" onclick="if(!defualtconfirm()) return false;blockme();" oncomplete="unblockUI();" value="榛樿鎺掗槦" rerender="message,campaignType"/>
<!-- 20220105 ljh rerender add cmpid -->
</td>
- <td style="width:190px;">
+ <!-- 20230526 ljh lightning start-->
+ <!-- <td style="width:190px;"> -->
+ <td>
+ <!-- 20230526 ljh lightning end-->
<apex:outputPanel rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤'||parentObj.Status__c!='宸叉壒鍑�')}">
<apex:commandButton style="margin-left:20px;" onclick="if(!confirmSpecial()) return false;blockme();" action="{!specialScheduel}" disabled="{parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤'||parentObj.Status__c!='宸叉壒鍑�'}" value="鐗规畩鎺掗槦" rerender="cmpid,checEventFrame,message,campaignType" oncomplete="unblockUI();" />
</apex:outputPanel>
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpCss.css b/force-app/main/default/staticresources/RelationListPagingCmpCss.css
index 5414c08..d949557 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpCss.css
+++ b/force-app/main/default/staticresources/RelationListPagingCmpCss.css
@@ -12,6 +12,7 @@
overflow: hidden;
float:left;
/* width:32768px; */ /* 20230523 ljh lightning */
+ width: 1100px;
}
div#out_Div_L {
position:relative;
@@ -24,6 +25,7 @@
float:left;
/* width:32768px; */ /* 20230523 ljh lightning */
height: 100px; /* tbody銈掕〃绀恒仚銈嬮珮銇曘�佸緦銇s銇仸瑾挎暣 */
+ width: 1100px;
}
div#in_Div_L {
position:relative;
@@ -108,4 +110,10 @@
color: #000;
white-space:normal;
}
+table#tableData{
+ width: 1000px;
+}
+table#tableHeader{
+ width: 1000px;
+}
/* 20230508 ljh lightning鍒囨崲 start */
diff --git a/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css b/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css
index e69de29..62d1ee4 100644
--- a/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css
+++ b/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css
@@ -0,0 +1,17 @@
+/* 20230526 ljh start lightning */
+table.list .col_First_RAESD_Model_No_F__c {width:120px;}
+table.list .col_Loaner_name_F__c {width:120px;}
+table.list .col_Zhu_Ti_Fen_Pei_Jia__c {width:120px;}
+table.list .col_Fu_Shu_Pin_Fen_Pei_Jia__c {width:100px;}
+table.list .col_Irreplaceable_flag__c {width:100px;}
+table.list .col_Substitute_flag__c {width:100px;}
+table.list .col_Body_Queue_Number__c {width:100px;}
+table.list .col_Pai_Dui_Jia__c {width:100px;}
+table.list .col_Ke_Yi_Fen_Pei_Zhu_Ti_Jia__c {width:100px;}
+table.list .col_Bie_Cun_Fang_Di_Ku_Cun_Jia__c {width:100px;}
+table.list .col_Bie_Yong_Tu_Ku_Cun_Jia__c {width:100px;}
+table.list .col_Bie_Ben_Bu_Ku_Cun_Jia__c {width:100px;}
+table.list .col_Bie_Chan_Pin_Fen_Lei_Jia__c {width:100px;}
+table.list .col_Rental_Start_Date__c {width:100px;}
+table.list .col_Rental_End_Date__c {width:100px;}
+table.list .col_Jie_Chu_Shi_Jian_Jia__c {width:100px;}
\ No newline at end of file
--
Gitblit v1.9.1