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/RentalApplySequence.page | 171 ++++++++------------------------------------------------
1 files changed, 25 insertions(+), 146 deletions(-)
diff --git a/force-app/main/default/pages/RentalApplySequence.page b/force-app/main/default/pages/RentalApplySequence.page
index d13c962..d6c1e6c 100644
--- a/force-app/main/default/pages/RentalApplySequence.page
+++ b/force-app/main/default/pages/RentalApplySequence.page
@@ -1,12 +1,17 @@
+<!--
+ * @Description: 澶囧搧鎺掗槦灞曠ず鍖呭惈闃熷垪淇℃伅鍜屽簭鍒椾俊鎭�
+ * @Author: [lijinhuan]
+ * @Date: 2021-10-26 14:15:03
+ * @LastEditors: [lijinhuan]
+ * @LastEditTime: 2023-06-06 13:04:33
+-->
<!-- 20230522 ljh lightning -->
<!-- <apex:page controller="RentalApplySequenceController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鎺掗槦鏌ョ湅"> -->
<apex:page controller="RentalApplySequenceController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鎺掗槦鏌ョ湅" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
-<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
-
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230525 ljh lightning -->
<style type="text/css">
.hideDropdown select{
display: none
@@ -14,19 +19,6 @@
.table-head{padding-right:17px;}
.tablehead0{padding-right:0;}
.table-body table tr:nth-child(2n){background-color:#f2f2f2;}
- /* 20230524 ljh lightning start */
- body .pbBody table.list tr th, body .pbBody table.list tr td {
- border: 1px solid #ededed;
- white-space: normal;
- }
- body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
- background: #f2f3f3;
- border-width: 0 0 1px 1px;
- border-color: #e0e3e5;
- font-size: .9em;
- font-weight: bold;
- }
- /* 20230524 ljh lightning end */
/*浠ヤ笅鏄笅鎷夊閫夋鐨勬牱寮� start*/
* {
margin: 0;
@@ -34,9 +26,9 @@
box-sizing: border-box;
}
.nav {
- width: 160px;
- line-height: 20px;
- border: 1px solid #000;
+ width: 180px;/*20230606 ljh*/
+ line-height: 30px;/*20230606 ljh*/
+ /* border: 1px solid #000; *//*20230610 ljh*/
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@@ -48,7 +40,8 @@
margin: 0;
z-index: 9999;
display: inline-block;
- /*display: none;*/
+ border-radius: 0.25rem;/*20230607 ljh*/
+ border: 1px solid rgb(201, 201, 201);/*20230610 ljh lightning*/
}
ul,
li {
@@ -80,31 +73,9 @@
overflow: hidden;
text-overflow: ellipsis;
}
- .nav_close {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9990;
- display: none;
- }
- .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;*/
+ /* 20230802 ljh */
+ body .bPageBlock .detailList .dataCol{
+ width: 8%;
}
</style>
<script>
@@ -239,8 +210,7 @@
</apex:actionFunction>
<apex:inputHidden id="checkEventId" value="{!checkEventId}" />
<apex:pageBlock id="searchBlock" title="鏌ョ湅鎺掗槦鎯呭喌">
- <!-- 20230523 ljh lightning start -->
- <!-- <apex:pageBlockSection title="妫�绱�" id="mainSection" columns="4" >
+ <apex:pageBlockSection title="妫�绱�" id="mainSection" columns="4" >
<apex:pageBlockSectionItem >
<apex:outputLabel value="鐢宠鍗曞彿" />
<apex:inputText id="S_raName" value="{!S_raName}"/>
@@ -267,14 +237,14 @@
<apex:pageBlockSectionItem rendered="{!!isEquipmentCenter}"></apex:pageBlockSectionItem>
<apex:pageBlockSectionItem id="ApplyBB">
<apex:outputLabel for="S_bieBenBuApply" value="鐢宠浜烘墍灞炴湰閮�" />
- <apex:outputPanel style="position: relative; " id="S_bieBenBuApply">
+ <apex:outputPanel style="position: absolute; " id="S_bieBenBuApply">
<apex:inputHidden id="S_ApplyBenBu" value="{!S_ApplyBenBu}" />
<ul class="nav" id="nav" style="background-color: #FFFFFF;left:0px;">
- <li id="classification" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose();return false;">
+ <li id="classification" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose();return false;">
<span id="initial">--鏃�--</span>
</li>
<li id="selectCheckId" style="margin-left:0px;display: none;">
- <ul>
+ <ul style="margin-left:0px;">
<apex:repeat value="{!SApplyBenBu}" var="orr" id="selSD">
<li class="sdclass" style="margin-left:0px">
<p class="ul-nav" name="cate_id[]" >
@@ -286,19 +256,18 @@
</ul>
</li>
</ul>
- <div class="nav_close"></div>
</apex:outputPanel>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem id="ApplyAA" >
<apex:outputLabel for="S_AgencyApply" value="鐢宠鑰呭姙浜嬪" />
- <apex:outputPanel style="position: relative; " id="S_AgencyApply">
+ <apex:outputPanel style="position: absolute; " id="S_AgencyApply">
<apex:inputHidden id="S_Agency" value="{!S_Agency}" />
<ul class="nav" id="nav_a" style="background-color: #FFFFFF;left:0px;">
- <li id="classification_a" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose_a();return false;">
+ <li id="classification_a" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_a();return false;">
<span id="initial_a">--鏃�--</span>
</li>
<li id="selectCheckId_a" style="margin-left:0px;display: none;">
- <ul>
+ <ul style="margin-left:0px;">
<apex:repeat value="{!SApplyAgency}" var="orr" id="selSD">
<li class="sdclass" style="margin-left:0px">
<p class="ul-nav" name="cate_id[]" >
@@ -328,98 +297,9 @@
<apex:pageBlockSectionItem >
<apex:commandButton style="" value="妫�绱�" onclick="searchJs(); return false;"/>
</apex:pageBlockSectionItem>
- </apex:pageBlockSection> -->
- <div class="pbSubheader brandTertiaryBgr first tertiaryPalette" >
- <h3>妫�绱�</h3>
- </div>
- <table style="width:100%;margin:10px 0;" >
- <tr style="height:40px;">
- <td>鐢宠鍗曞彿</td>
- <td><apex:inputText id="S_raName" value="{!S_raName}"/></td>
- <td>鍨嬪彿</td>
- <td><apex:inputText id="S_Fixture_Model_No" value="{!S_Fixture_Model_No}"/></td>
- <td>澶囧搧鍑哄�熸媴褰�</td>
- <td>
- <apex:inputField id="S_Person_In_Charge" value="{!S_Ra_Person.Person_In_Charge__c}" styleClass="hideDropdown" />
- </td>
- <td>闃熷垪鎵�鍦ㄥ湴鍖烘湰閮�</td>
- <td><apex:inputText id="S_bieBenBu" value="{!S_bieBenBu}"/></td>
- </tr>
- <tr style="height:40px;">
- <td>澶囧搧瀛樻斁鍦�</td>
- <td>
- <apex:selectList value="{!S_bieCunFangDi}" onchange="blockme(); changeCunfangdi();selectCunFangDiJs(this);return false;" size="1" style="width:160px" id="S_bieCunFangDi">
- <apex:selectOptions value="{!bieCunFangDiOps}"/>
- </apex:selectList>
- </td>
- <td>鐢宠浜烘墍灞炴湰閮�</td>
- <td>
- <apex:outputPanel style="position: relative; " id="S_bieBenBuApply">
- <apex:inputHidden id="S_ApplyBenBu" value="{!S_ApplyBenBu}" />
- <ul class="nav" id="nav" style="background-color: #FFFFFF;left:0px;">
- <li id="classification" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose();return false;">
- <span id="initial">--鏃�--</span>
- </li>
- <li id="selectCheckId" style="margin-left:0px;display: none;">
- <ul style="margin-left: 0;" >
- <apex:repeat value="{!SApplyBenBu}" var="orr" id="selSD">
- <li class="sdclass" style="margin-left:0px">
- <p class="ul-nav" name="cate_id[]" >
- <input type="checkbox" value="{!orr.parameterName}" class="li-input" onclick="selectBenBu(this,'{!orr.parameterName}');" style="display: inline-block;vertical-align: middle;" />
- <font style="">{!orr.parameterName}</font>
- </p>
- </li>
- </apex:repeat>
- </ul>
- </li>
- </ul>
- <div class="nav_close"></div>
- </apex:outputPanel>
- </td>
- <td>鐢宠鑰呭姙浜嬪</td>
- <td>
- <apex:outputPanel style="position: relative; " id="S_AgencyApply">
- <apex:inputHidden id="S_Agency" value="{!S_Agency}" />
- <ul class="nav" id="nav_a" style="background-color: #FFFFFF;left:0px;">
- <li id="classification_a" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose_a();return false;">
- <span id="initial_a">--鏃�--</span>
- </li>
- <li id="selectCheckId_a" style="margin-left:0px;display: none;">
- <ul style="margin-left: 0;" >
- <apex:repeat value="{!SApplyAgency}" var="orr" id="selSA">
- <li class="sdclass" style="margin-left:0px">
- <p class="ul-nav" name="cate_id[]" >
- <input type="checkbox" value="{!orr.parameterName}" class="li-input" onclick="selectAgency(this,'{!orr.parameterName}');" style="display: inline-block;vertical-align: middle;" />
- <font style="">{!orr.parameterName}</font>
- </p>
- </li>
- </apex:repeat>
- </ul>
- </li>
- </ul>
- </apex:outputPanel>
- </td>
- <td>澶囧搧鍒嗙被</td>
- <td>
- <apex:selectList value="{!S_bieBeiPinFenLei}" size="1" id="bieBeiPinFenLei" style="width:180px">
- <apex:selectOptions value="{!bieBeiPinFenLeiOps}"/>
- </apex:selectList>
- </td>
-
- </tr>
- <tr style="height:40px;">
- <td>浜у搧鍒嗙被(GI/SP)</td>
- <td>
- <apex:selectList value="{!S_Product_category}" size="1" style="width:60px" id="S_Product_category">
- <apex:selectOptions value="{!bieChanPinFenLeiOps}"/>
- </apex:selectList>
- </td>
- <td colspan="6"> <apex:commandButton style="" value="妫�绱�" onclick="searchJs(); return false;"/> </td>
- </tr>
- </table>
+ </apex:pageBlockSection>
<!-- 鏁版嵁 -->
- <!-- </apex:pageBlock> -->
- <!-- 20230523 ljh lightning end -->
+ </apex:pageBlock>
<apex:pageBlock id="MySequence">
<apex:outputPanel id="message">
<apex:pageMessages />
@@ -568,7 +448,6 @@
</table>
</div>
</apex:pageBlock>
-</apex:pageBlock> <!-- 20230523 ljh lightning -->
</apex:form>
<apex:outputPanel id="checEventFrame">
--
Gitblit v1.9.1