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/MainFixtureSelect.page |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/pages/MainFixtureSelect.page b/force-app/main/default/pages/MainFixtureSelect.page
index 9598fcd..13fc4df 100644
--- a/force-app/main/default/pages/MainFixtureSelect.page
+++ b/force-app/main/default/pages/MainFixtureSelect.page
@@ -33,7 +33,7 @@
         right: 0;
         left: 0;
         margin: 0;
-        z-index: 9999;
+        z-index: 2;
         display: inline-block;
         background-color: white;
         border-radius: 0.25rem;/*20230607 ljh lightning*/
@@ -68,6 +68,10 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+    }
+    /* 20230628 ljh */
+    .menu ul li:first-child{
+        padding-left: 0.75rem;
     }
 </style>
 
@@ -503,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