From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/pages/RentalFixtureSetAssign.page |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/force-app/main/default/pages/RentalFixtureSetAssign.page b/force-app/main/default/pages/RentalFixtureSetAssign.page
index 01cf21e..8a88a16 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssign.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssign.page
@@ -132,17 +132,17 @@
         j$("#classification_f").children("#initial_f").remove();
         var idTemp = j$(obj).value().trim();
         idTemp = 'Id'+idTemp.split('.')[0];
-        j$("#classification_f").append("<span class='valClass' id='" + (idTemp) + "'>" + (j$(obj)
+        j$("#classification_f").append("<span class='valClassf' id='" + (idTemp) + "'>" + (j$(obj)
             .value().trim() + ",") + "</span>");
     } else {
         var idTemp = 'Id'+name.split('.')[0];
         j$("#classification_f").children("#" + (idTemp)).remove();
         var length = j$("#classification_f").html().length;
         if (length === 0) {
-            j$("#classification_f").append("<span class='valClass' id='initial_f'>--鏃�--</span>");
+            j$("#classification_f").append("<span class='valClassf' id='initial_f'>--鏃�--</span>");
         }
     }
-    var optioncheck = j$(".valClass");
+    var optioncheck = j$(".valClassf");
     var hint = '';
     for(var i = 0;i<optioncheck.length;i++){
         if(optioncheck[i].innerText != '--鏃�--'){
@@ -377,7 +377,8 @@
                     <apex:outputField value="{!parentObj.Product_category__c}"/>
                     <apex:pageBlockSectionItem id="SelectOP"  rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}">
                     <!-- 20220106 ljh 鏀惧紑 鏈嶅姟鍩硅/瀛︿細 parentObj.CampaignType__c=='鏈嶅姟鍩硅/瀛︿細'|| -->
-                    <apex:outputLabel for="bieBeiPinFenLei" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="澶囧搧鍒嗙被" />
+                    <!-- <apex:outputLabel for="bieBeiPinFenLei" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="澶囧搧鍒嗙被" /> -->
+                    <apex:outputLabel for="bieBeiPinFenLei" value="澶囧搧鍒嗙被" />
                     <apex:outputPanel style="position:absolute; " id="S_bieFenLei">
                         <ul class="nav" id="nav_f" style="background-color: #FFFFFF;left:0px;top:-5px;">
                             <li id="classification_f" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_f();return false;">
@@ -400,7 +401,8 @@
                     </apex:pageBlockSectionItem>
                     <apex:pageBlockSectionItem id="Selectsalesd" rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}">
                         <!-- 20220106 ljh 鏀惧紑 鏈嶅姟鍩硅/瀛︿細 parentObj.CampaignType__c=='鏈嶅姟鍩硅/瀛︿細'|| -->
-                        <apex:outputLabel for="salesd" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="鏈儴" />
+                        <!-- <apex:outputLabel for="salesd" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="鏈儴" /> -->
+                        <apex:outputLabel for="salesd"  value="鏈儴" />
                         <apex:outputPanel style="position:absolute; " id="S_bieBenBu">
                             <ul class="nav" id="nav_b" style="background-color: #FFFFFF;left:0px;">
                                 <li id="classification_b" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_b();return false;">
@@ -426,7 +428,7 @@
                 </apex:pageBlockSection>
                  <!-- 20230526 ljh lightning start-->
                 <!-- <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" > -->
-                <table style="width: 450px;margin: auto;float: left;" >
+                <table style="width: 550px;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>
@@ -459,11 +461,10 @@
                         </td>
                     </tr>
                 </table>
-                <table style="width:800px;float:right;" >
+                <table style="width:700px;float:right;" >
                   <tr>
                     
-                      <td style="width:450px;">
-                    </td>
+                    <td style="width:350px;"></td>
                     <!-- <td style="width:180px;">
                     </td> -->
                     <th>{!$ObjectType.Rental_Apply__c.fields.Asset_loaner_start_day__c.label}</th>
@@ -471,7 +472,7 @@
                   </tr>
                   <tr>
                     
-                    <td style="width:450px;">
+                    <td style="width:350px;">
                       <apex:commandButton action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();"  />
                       <apex:commandButton style="margin-left:150px;" action="{!cancel}" value="杩斿洖" />
                     </td>

--
Gitblit v1.9.1