From 5e96c498e70f390d6d5926148ea026d569921b57 Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期三, 24 五月 2023 10:57:58 +0800
Subject: [PATCH] 备品查看排队
---
force-app/main/default/pages/RentalApplySequence.page | 127 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 114 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/RentalApplySequence.page b/force-app/main/default/pages/RentalApplySequence.page
index fb1edd2..d13c962 100644
--- a/force-app/main/default/pages/RentalApplySequence.page
+++ b/force-app/main/default/pages/RentalApplySequence.page
@@ -1,4 +1,6 @@
-<apex:page controller="RentalApplySequenceController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鎺掗槦鏌ョ湅">
+<!-- 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)}"/>
@@ -12,6 +14,19 @@
.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;
@@ -224,8 +239,9 @@
</apex:actionFunction>
<apex:inputHidden id="checkEventId" value="{!checkEventId}" />
<apex:pageBlock id="searchBlock" title="鏌ョ湅鎺掗槦鎯呭喌">
- <apex:pageBlockSection title="妫�绱�" id="mainSection" columns="4" >
- <apex:pageBlockSectionItem >
+ <!-- 20230523 ljh lightning start -->
+ <!-- <apex:pageBlockSection title="妫�绱�" id="mainSection" columns="4" >
+ <apex:pageBlockSectionItem >
<apex:outputLabel value="鐢宠鍗曞彿" />
<apex:inputText id="S_raName" value="{!S_raName}"/>
</apex:pageBlockSectionItem>
@@ -242,8 +258,6 @@
<apex:outputLabel for="S_bieBenBu" value="闃熷垪鎵�鍦ㄥ湴鍖烘湰閮�" />
<apex:inputText id="S_bieBenBu" value="{!S_bieBenBu}"/>
</apex:pageBlockSectionItem>
- <!-- onchange="blockme(); changebenbu()" -->
- <!-- changebenbu(); -->
<apex:pageBlockSectionItem rendered="{!isEquipmentCenter}">
<apex:outputLabel for="S_bieCunFangDi" value="澶囧搧瀛樻斁鍦�" />
<apex:selectList value="{!S_bieCunFangDi}" onchange="blockme(); changeCunfangdi();selectCunFangDiJs(this);return false;" size="1" style="width:160px" id="S_bieCunFangDi">
@@ -271,7 +285,6 @@
</apex:repeat>
</ul>
</li>
- <!-- style="display: none;" -->
</ul>
<div class="nav_close"></div>
</apex:outputPanel>
@@ -296,7 +309,6 @@
</apex:repeat>
</ul>
</li>
- <!-- style="display: none;" -->
</ul>
</apex:outputPanel>
</apex:pageBlockSectionItem>
@@ -314,12 +326,100 @@
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem >
- <apex:commandButton style="" value="妫�绱�" onclick="searchJs(); return false;"/>
- </apex:pageBlockSectionItem>
- </apex:pageBlockSection>
-
+ <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:pageBlock>
+ <!-- </apex:pageBlock> -->
+ <!-- 20230523 ljh lightning end -->
<apex:pageBlock id="MySequence">
<apex:outputPanel id="message">
<apex:pageMessages />
@@ -387,7 +487,7 @@
<col width="10%"/>
</colgroup>
<thead>
- <tr class="headerRow" >
+ <tr class="headerRow">
<th style="padding-bottom: 6px;">鐢宠鍗曞彿No.</th>
<th style="padding-bottom: 6px;">涓�瑙圢o.</th>
<th style="padding-bottom: 6px;">鍨嬪彿</th>
@@ -468,6 +568,7 @@
</table>
</div>
</apex:pageBlock>
+</apex:pageBlock> <!-- 20230523 ljh lightning -->
</apex:form>
<apex:outputPanel id="checEventFrame">
--
Gitblit v1.9.1