From ddb0231ef7c5cf2bad9d3f1afc2f733674ad38a5 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 24 八月 2023 14:50:51 +0800
Subject: [PATCH] 再修理按钮

---
 force-app/main/default/pages/MainFixtureSelect.page |   68 ++++++++++------------------------
 1 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/force-app/main/default/pages/MainFixtureSelect.page b/force-app/main/default/pages/MainFixtureSelect.page
index b9ca65b..13fc4df 100644
--- a/force-app/main/default/pages/MainFixtureSelect.page
+++ b/force-app/main/default/pages/MainFixtureSelect.page
@@ -5,6 +5,7 @@
 <title>涓讳綋澶囧搧閫夋嫨</title>
 <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
 <apex:stylesheet value="{!URLFOR($Resource.MainFixtureSelectCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->    
 <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
 <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
 <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
@@ -22,7 +23,7 @@
     .nav {
         width: 170px;/*20230606 ljh*/
         line-height: 30px;/*20230606 ljh*/
-        border: 1px solid #000;
+        /* border: 1px solid #000; *//*20230610 ljh lightning*/
         -webkit-user-select: none;
         -moz-user-select: none;
         -ms-user-select: none;
@@ -32,10 +33,11 @@
         right: 0;
         left: 0;
         margin: 0;
-        z-index: 9999;
+        z-index: 2;
         display: inline-block;
         background-color: white;
-        /*display: none;*/
+        border-radius: 0.25rem;/*20230607 ljh lightning*/
+        border: 1px solid rgb(201, 201, 201);/*20230610 ljh lightning*/
     }
     ul,
     li {
@@ -67,42 +69,10 @@
         overflow: hidden;
         text-overflow: ellipsis;
     }
-    .nav_close {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 9990;
-        display: none;
+    /* 20230628 ljh */
+    .menu ul li:first-child{
+        padding-left: 0.75rem;
     }
-    .nav_close_a {
-        position: fixed;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        z-index: 9999;
-        display: none;
-        background-color: red;
-    }
-    /*浠ヤ笅鏄笅鎷夊閫夋鐨勬牱寮�  end*/
-    /*.transparent_class { 
-        filter:alpha(opacity=50);
-        -moz-opacity:0.5;
-        -khtml-opacity: 0.5;
-        opacity: 0.5;
-    }
-    .checks_div_select { 
-        width: 150px; 
-        background-color: #e9fbfb; 
-        border: 1px solid #18cbcd; 
-        font-family: 'Verdana', '瀹嬩綋'; 
-        font-size: 12px; 
-        position:absolute; 
-        left:2px; 
-        top:25px; 
-    }  */ 
 </style>
 
 <script type="text/javascript">
@@ -184,8 +154,10 @@
             hint +=optioncheck[i].innerText;
         }
     }
-    // console.log(hint);
-    j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyBB:bieBenBu')).val(hint);
+    console.log(hint);
+    // j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyBB:bieBenBu')).val(hint);
+    j$(escapeVfId('allPage:allForm:searchBlock:bieBenBu')).val(hint);
+    
 }
 function navClose(){
     j$("#selectCheckId").toggle();
@@ -215,7 +187,8 @@
             hint +=optioncheck[i].innerText;
         }
     }
-    j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyAA:bieBeiPinFenLei')).val(hint);
+    // j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyAA:bieBeiPinFenLei')).val(hint);
+    j$(escapeVfId('allPage:allForm:searchBlock:bieBeiPinFenLei')).val(hint);
 }
 function navClose_a(){
     j$("#selectCheckId_a").toggle();
@@ -406,19 +379,19 @@
                         <col width="10%"/>
                     </colgroup>
                     <tr>
-                        <td align="right">澶囧搧瀛樻斁鍦�</td>
+                        <td align="right" style="padding-right:5px;" >澶囧搧瀛樻斁鍦�</td>
                         <td align="left">
                             <apex:selectList value="{!bieCunFangDi}" onchange="blockme(); changebenbu(); reloadBenBu(this);return false" size="1" style="margin-left: 0px; width:110px" id="bieCunFangDi">
                                 <apex:selectOptions value="{!bieCunFangDiOps}"/>
                             </apex:selectList>
                         </td>
-                        <td align="right">浜у搧鍒嗙被(GI/SP)</td>
+                        <td align="right" style="padding-right:5px;">浜у搧鍒嗙被(GI/SP)</td>
                         <td align="left">
                             <apex:selectList value="{!bieChanPinFenLei}" size="1" style="margin-left: 0px; width:60px" id="bieChanPinFenLei">
                                 <apex:selectOptions value="{!bieChanPinFenLeiOps}"/>
                             </apex:selectList>
                         </td>
-                        <td align="right">鏈儴</td>
+                        <td align="right" style="padding-right:5px;" >鏈儴</td>
                         <td align="left">
                             <apex:outputPanel style="position: absolute;" id="S_bieBenBuApply">
                             <apex:inputHidden id="bieBenBu" value="{!bieBenBu}" />
@@ -439,8 +412,6 @@
                                     </ul>
                                 </li>
                             </ul>
-                            <div class="nav_close"></div>
-
                             <script>
                                 initShowBenbu();
                                 function initShowBenbu() {
@@ -467,7 +438,7 @@
                             </script>
                         </apex:outputPanel>
                         </td>
-                        <td align="right">澶囧搧鍒嗙被</td>
+                        <td align="right" style="padding-right:5px;" >澶囧搧鍒嗙被</td>
                         <td align="left" >
                             <apex:outputPanel style="position: absolute;" id="S_AgencyApply">
                             <apex:inputHidden id="bieBeiPinFenLei" value="{!bieBeiPinFenLei}" />
@@ -515,7 +486,7 @@
                             </script>
                         </apex:outputPanel>
                         </td>
-                        <td  align="right">鍏抽敭瀛�</td>
+                        <td  align="right" style="padding-right:5px;">鍏抽敭瀛�</td>
                         <td align="left" ><apex:inputText value="{!keyword}"/></td>
                         <td style="padding-left:20px;"><apex:commandButton value="妞滅储" onclick=" searchOppJs(); return false;"/></td>
                     </tr>
@@ -536,6 +507,7 @@
                         </td>
                         <td style="width:50%">
                             <div style="text-align: center;">
+                                <input type="hidden" name="hidden" /> <!-- 20230706 ljh 涓轰簡鎸夐挳瀵归綈 -->
                                 <apex:commandButton action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" />
                                 <apex:commandButton style="margin-left:20px;" onclick="clickunassign(); return false;" value="鍙栨秷鍒嗛厤" rerender="allForm,checEventFrame"/>
                                 <apex:commandButton style="margin-left:20px;" value="鍙栨秷" onclick="clickCancel(); return false;"/>

--
Gitblit v1.9.1