From 212967a5a65a12f9673170b80e3d8c766dcee5d0 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 06 七月 2023 10:46:18 +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 | 205 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 151 insertions(+), 54 deletions(-)
diff --git a/force-app/main/default/pages/MainFixtureSelect.page b/force-app/main/default/pages/MainFixtureSelect.page
index e36c21e..9598fcd 100644
--- a/force-app/main/default/pages/MainFixtureSelect.page
+++ b/force-app/main/default/pages/MainFixtureSelect.page
@@ -1,8 +1,11 @@
-<apex:page controller="MainFixtureSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<!-- 20230529 ljh lightning -->
+<!-- <apex:page controller="MainFixtureSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
+<apex:page controller="MainFixtureSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<head>
<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)}"/>
@@ -18,22 +21,23 @@
box-sizing: border-box;
}
.nav {
- width: 180px;
- line-height: 20px;
- border: 1px solid #000;
+ width: 170px;/*20230606 ljh*/
+ line-height: 30px;/*20230606 ljh*/
+ /* border: 1px solid #000; *//*20230610 ljh lightning*/
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
position: absolute;
- top: 0;
+ top: -15px;/*20230606 ljh*/
right: 0;
left: 0;
margin: 0;
z-index: 9999;
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 {
@@ -65,42 +69,6 @@
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;
- }
- .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">
@@ -182,8 +150,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();
@@ -213,7 +183,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();
@@ -248,7 +219,6 @@
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
-
<apex:pageBlockSection title="涓讳綋澶囧搧閫夋嫨" id="mainSection">
<apex:outputField value="{!parentObj.Rental_Apply__r.Name}"/>
<apex:outputField value="{!parentObj.Rental_Apply__r.Demo_purpose1__c}"/>
@@ -266,8 +236,8 @@
<apex:outputField value="{!parentObj.Rental_End_Date__c}"/>
<apex:outputField value="{!parentObj.Fu_Shu_Pin_Fen_Pei_Jia__c}"/>
<apex:outputField value="{!parentObj.Rental_Start_Date__c}"/>
-
- <apex:pageBlockSectionItem >
+ <!-- 20230605 ljh lightning start -->
+ <!-- <apex:pageBlockSectionItem >
<apex:outputLabel for="salesd" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="澶囧搧瀛樻斁鍦�" />
<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}"/>
@@ -378,20 +348,146 @@
}
</script>
</apex:outputPanel>
- </apex:pageBlockSectionItem>
- </apex:pageBlockSection>
+ </apex:pageBlockSectionItem>-->
+ </apex:pageBlockSection>
+
- <table>
- <tr/><tr/><tr/><tr/><tr/><tr/><tr/><tr/>
+ <table style="width:100%;margin:10px 0;">
+ <!-- <tr/><tr/><tr/><tr/><tr/><tr/><tr/><tr/>
<tr>
<td width="50px">鍏抽敭瀛�</td>
<td><apex:inputText value="{!keyword}" style="width:200px"/></td>
<td width="20px"/>
<td><apex:commandButton value="妞滅储" onclick=" searchOppJs(); return false;"/></td>
</tr>
- <tr/><tr/><tr/><tr/><tr/><tr/>
- </table>
+ <tr/><tr/><tr/><tr/><tr/><tr/> -->
+ <colgroup>
+ <col width="6%" />
+ <col width="12%" />
+ <col width="12%" />
+ <col width="6%" />
+ <col width="6%"/>
+ <col width="12%"/>
+ <col width="6%"/>
+ <col width="12%"/>
+ <col width="6%"/>
+ <col width="12%"/>
+ <col width="10%"/>
+ </colgroup>
+ <tr>
+ <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" 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" style="padding-right:5px;" >鏈儴</td>
+ <td align="left">
+ <apex:outputPanel style="position: absolute;" id="S_bieBenBuApply">
+ <apex:inputHidden id="bieBenBu" value="{!bieBenBu}" />
+ <ul class="nav" id="nav" style="left:0px;">
+ <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 style="background-color: #FFFFFF;margin-left: 0;">
+ <apex:repeat value="{!bieBenBuOps}" var="orr" id="selSDBB">
+ <li class="sdclass" style="margin-left:0px">
+ <p class="ul-nav" name="cate_id[]" >
+ <input type="checkbox" value="{!orr.label}" class="li-input" onclick="selectBenBu(this,'{!orr.label}');" style="display: inline-block;vertical-align: middle;" />
+ <font style="">{!orr.label}</font>
+ </p>
+ </li>
+ </apex:repeat>
+ </ul>
+ </li>
+ </ul>
+ <script>
+ initShowBenbu();
+ function initShowBenbu() {
+ var bieBenBuTemp = '{!bieBenBu}';
+ if (bieBenBuTemp != null && bieBenBuTemp != undefined && bieBenBuTemp != "") {
+ j$("#classification").children("#initial").remove();
+ var bieBenBuList = bieBenBuTemp.split(',');
+ for(var i=0; i< bieBenBuList.length; i++) {
+ var idTemp = bieBenBuList[i].trim();
+ idTemp = 'Id'+idTemp.split('.')[0];
+ j$("#classification").append("<span class='valClass' id='" + (idTemp) + "'>" + (bieBenBuList[i].trim() + ",") + "</span>");
+ }
+ var inputObj = j$(".li-input");
+ if(inputObj != null){
+ for(var i = 0; i < inputObj.length;i++){
+ if(bieBenBuTemp.includes(inputObj[i].value)){
+ inputObj[i].checked = true;
+ }
+ }
+ }
+ }
+ }
+ </script>
+ </apex:outputPanel>
+ </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}" />
+ <ul class="nav" id="nav_a" style="left:0px;">
+ <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 style="background-color: #FFFFFF;margin-left: 0;">
+ <apex:repeat value="{!bieBeiPinFenLeiOps}" var="orr" id="selSD">
+ <li class="sdclass" style="margin-left:0px">
+ <p class="ul-nav" name="cate_id[]" >
+ <input type="checkbox" value="{!orr.label}" class="li-input_a" onclick="selectAgency(this,'{!orr.label}');" style="display: inline-block;vertical-align: middle;" />
+ <font style="">{!orr.label}</font>
+ </p>
+ </li>
+ </apex:repeat>
+ </ul>
+ </li>
+ </ul>
+
+ <script>
+ initShowFenlei();
+ function initShowFenlei() {
+ var bieBeiPinFenLeiTemp = '{!bieBeiPinFenLei}';
+ if (bieBeiPinFenLeiTemp != null && bieBeiPinFenLeiTemp != undefined && bieBeiPinFenLeiTemp != "") {
+ j$("#classification_a").children("#initial_a").remove();
+ var bieBeiPinFenLeiList = bieBeiPinFenLeiTemp.split(',');
+ for(var i=0; i< bieBeiPinFenLeiList.length; i++) {
+ var idTemp = bieBeiPinFenLeiList[i].trim();
+ idTemp = 'Id'+idTemp.split('.')[0];
+ j$("#classification_a").append("<span class='valClass_a' id='" + (idTemp) + "'>" + (bieBeiPinFenLeiList[i].trim() + ",") + "</span>");
+ }
+
+ var inputObj = j$(".li-input_a");
+ if(inputObj != null){
+ for(var i = 0; i < inputObj.length;i++){
+ if(bieBeiPinFenLeiTemp.includes(inputObj[i].value)){
+ inputObj[i].checked = true;
+ }
+ }
+ }
+ }
+ }
+ </script>
+ </apex:outputPanel>
+ </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>
+ </table>
+ <!-- 20230605 ljh lightning end -->
<table style="width:100%">
<tr>
<td style="width:40%">
@@ -425,6 +521,7 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
+
</apex:pageBlock>
<c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true" isRadio="true"/>
</apex:outputPanel>
--
Gitblit v1.9.1