From 3b7857b6c7bdd1be18389196c648f4c63c494ae3 Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期三, 14 六月 2023 15:09:05 +0800
Subject: [PATCH] 备品demo修改+-号和分配页面按钮对齐

---
 force-app/main/default/pages/RentalFixtureSetAssign.page |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/pages/RentalFixtureSetAssign.page b/force-app/main/default/pages/RentalFixtureSetAssign.page
index e79cec8..341e4ef 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssign.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssign.page
@@ -71,7 +71,7 @@
     .nav {
         width: 180px;/*20230606 ljh*/
         line-height: 30px;/*20230606 ljh*/
-        border: 1px solid #000;
+        /* border: 1px solid #000; *//*20230610 ljh*/
         -webkit-user-select: none;
         -moz-user-select: none;
         -ms-user-select: none;
@@ -83,7 +83,8 @@
         margin: 0;
         z-index: 9999;
         display: inline-block;
-        border-radius: 0.25rem;
+        border-radius: 0.25rem;/*20230607 ljh lightning*/
+        border: 1px solid rgb(201, 201, 201);/*20230610 ljh lightning*/
     }
     ul,li {
         list-style: none;
@@ -421,12 +422,12 @@
                     <apex:inputField rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}" id="product_category" value="{!parentObj.Product_category_Sys__c}" />
                     <!-- 20220106 ljh 鏀惧紑 鏈嶅姟鍩硅/瀛︿細 parentObj.CampaignType__c=='鏈嶅姟鍩硅/瀛︿細'|| -->
                 </apex:pageBlockSection>
-                
-                <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" >
-                    <!-- <tr>
-                        
-                        <td></td>
-                    </tr> -->
+                 <!-- 20230526 ljh lightning start-->
+                <!-- <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" > -->
+                <table style="width: 450px;margin: auto;float: left;" >
+                    <tr><td colspan="{!IF(parentObj.demo_purpose2__c == '瀛︿細灞曚細'&&!(contains(parentObj.Salesdepartment__c,'MA鏈儴')||contains(parentObj.Salesdepartment__c,'浜у搧鍩硅')),4,2)}">
+                        &nbsp;</td>
+                    </tr>
                     <tr>
                         <apex:outputPanel rendered="{!parentObj.demo_purpose2__c == '瀛︿細灞曚細'&&!(contains(parentObj.Salesdepartment__c,'MA鏈儴')||contains(parentObj.Salesdepartment__c,'浜у搧鍩硅'))}">
                             <td style="width:50px;font-weight: bold;font-family: Arial,Helvetica,sans-serif;font-size: 91%;color: #4a4a56;">

--
Gitblit v1.9.1