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/ReceivingNoteDetailSelect.page | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/ReceivingNoteDetailSelect.page b/force-app/main/default/pages/ReceivingNoteDetailSelect.page
index 73e15a9..2f1143c 100644
--- a/force-app/main/default/pages/ReceivingNoteDetailSelect.page
+++ b/force-app/main/default/pages/ReceivingNoteDetailSelect.page
@@ -1,4 +1,4 @@
-<apex:page controller="ReceivingNoteDetailSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page controller="ReceivingNoteDetailSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<head>
<apex:outputPanel rendered="{!isAcceptance}">
<meta name="viewport" content="width=device-width,initial-scale=1"/>
@@ -11,7 +11,12 @@
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
-
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
+<!-- lightning鏀归�� zyh start -->
+<style type="text/css">
+ table.list td input[type="text"]{width:55%;}
+</style>
+<!-- lightning鏀归�� zyh end -->
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
@@ -90,10 +95,16 @@
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
<apex:pageBlockButtons location="bottom">
- <apex:commandButton style="float:left;" action="{!save}" value="纭畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
- <apex:commandButton style="float:left;" value="鏃犻厤濂楁槑缁嗘彁閱掗偖浠�" onclick="setEmailBody();" rerender="allForm, checEventFrame"/>
- <apex:commandButton style="float:right;" value="{!IF(isAcceptance, '杩斿洖', '杩斿洖涓婁竴绾�')}" action="{!goBack}"/>
- <apex:commandButton rendered="{!isAcceptance == false}" style="float:right;" value="杩斿洖鏁版嵁纭鐢婚潰" action="{!cancel}"/>
+ <!-- lightning鏀归�� zyh start -->
+ <!-- <apex:commandButton style="float:left;" action="{!save}" value="纭畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> -->
+ <!-- <apex:commandButton style="float:left; margin-left:12px;" action="{!save}" value="纭畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> -->
+ <!-- lightning鏀归�� zyh end -->
+ <!-- <apex:commandButton style="float:left;" value="鏃犻厤濂楁槑缁嗘彁閱掗偖浠�" onclick="setEmailBody();" rerender="allForm, checEventFrame"/> -->
+ <!-- lightning鏀归�� zyh start -->
+ <!-- <apex:commandButton style="float:right;" value="{!IF(isAcceptance, '杩斿洖', '杩斿洖涓婁竴绾�')}" action="{!goBack}"/> -->
+ <!-- <apex:commandButton style="float:right; margin-right:12px;" value="{!IF(isAcceptance, '杩斿洖', '杩斿洖涓婁竴绾�')}" action="{!goBack}"/> -->
+ <!-- lightning鏀归�� zyh end -->
+ <!-- <apex:commandButton rendered="{!isAcceptance == false}" style="float:right;" value="杩斿洖鏁版嵁纭鐢婚潰" action="{!cancel}"/> -->
</apex:pageBlockButtons>
<div style="clear:both;"></div>
@@ -121,6 +132,14 @@
<!--TODO 鍚屼竴闄勫睘鍝侊細銉� -->
</table>
+ <!-- lightning鏀归�� zyh start -->
+ <div style="margin-top: 15px;">
+ <apex:commandButton style="float:left; margin-left:12px;" action="{!save}" value="纭畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:left;" value="鏃犻厤濂楁槑缁嗘彁閱掗偖浠�" onclick="setEmailBody();" rerender="allForm, checEventFrame"/>
+ <apex:commandButton style="float:right; margin-right:12px;" value="{!IF(isAcceptance, '杩斿洖', '杩斿洖涓婁竴绾�')}" action="{!goBack}"/>
+ <apex:commandButton rendered="{!isAcceptance == false}" style="float:right;" value="杩斿洖鏁版嵁纭鐢婚潰" action="{!cancel}"/>
+ </div>
+ <!-- lightning鏀归�� zyh end -->
</apex:pageBlock>
<c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="false" noSort="true"/>
</apex:outputPanel>
@@ -130,6 +149,16 @@
table.list .col_Fixture_Set_New_Quantity__c input {width:55%;}
/*娌℃壘鐫�杩欎釜杈撳叆妗嗗湪鍝缃殑 灏辩洿鎺ヨ缃殣钘忎簡 */
table.list .col_Rental_Num__c input { display: none;}
+ /* table.list .col_SortInt_F__c{height: 40px;} */
+ /* <!-- lightning鏀归�� zyh start --> */
+ table.list .col_Fixture_Set_New_Quantity__c {width: 200px;}
+ table.list .col_Fixture_Set_Detail__r_Fixture_Model_No_F__c {width: 150px;}
+ table.list .col_Fixture_Set_Detail__r_Name_CHN__c {width: 100px;}
+ table.list .col_Is_Optional_F__c {width: 100px;}
+ table.list .col_OneToOne_Flag__c {width: 150px;}
+ table.list .col_Fixture_Set_Detail__r_Fixture_Set_New__c {width: 100px;}
+ /* table.list .col_Fixture_Set_New_Quantity__c {width: 100px;} */
+ /* <!-- lightning鏀归�� zyh end --> */
</style>
<!-- add by rentx 20210729 end 鏂板搧鏀惰揣_闆嗕腑澶囧搧_寤虹珛鏂板搧鍏ュ簱鏍囧噯閰嶅 -->
<apex:outputPanel id="checEventFrame">
@@ -189,7 +218,10 @@
j$(this).find("input[type=text]")[0].style.display = "None";
}else{
j$(this).find("input[type=text]")[0].readonly = true;
- j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" /> <input type="hidden" style="width: auto;" class="dec btn" value="'+oldValue+'" />');
+ // lightning鏀归�� zyh start
+ // j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" /> <input type="hidden" style="width: auto;" class="dec btn" value="'+oldValue+'" />');
+ j$(this).append('<input type="button" style="width: 1.5rem; height: 22px; font-size: 18px; line-height: 20px; margin-top: 5px;" class="inc btn" value="+" /><input type="button" style="width: 22px; height: 22px; font-size: 18px; line-height: 20px; margin-top: 5px;" class="dec btn" value="-" /> <input type="hidden" style="width: auto;" class="dec btn" value="'+oldValue+'" />');
+ // lightning鏀归�� zyh end
}
i ++;
});
--
Gitblit v1.9.1