From 71b93327e8f3fb3bffffc7c033c1f782e7b6ab32 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 22 五月 2023 17:37:16 +0800
Subject: [PATCH] test
---
force-app/main/default/pages/NewQuoteIrai.page | 97 +++++++++++++++++++++++++-----------------------
1 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/force-app/main/default/pages/NewQuoteIrai.page b/force-app/main/default/pages/NewQuoteIrai.page
index 60f0819..6283c2c 100644
--- a/force-app/main/default/pages/NewQuoteIrai.page
+++ b/force-app/main/default/pages/NewQuoteIrai.page
@@ -29,7 +29,12 @@
var Confirm_ChangedAfterPrint = '鎵撳嵃鍚庤淇℃伅鏈夊彉鍖栵紝鏄惁缁х画鎿嶄綔锛堟姤浠风紪鐮佷細鍙樻柊锛夛紵';
var Confirm_PriceRefresh = '鎶ヤ环浣滄垚鍚巤!$Label.Price_Valid_Period}澶�,杩樻病鏈夋洿鏂拌繃浠锋牸锛岄渶瑕佹墽琛寋!$Label.Status_Update}锛�';
var Confirm_saveBtn = '鎮ㄩ�夋嫨浜嗗鎵樹汉鍛橈紝纭畾鍙槸淇濆瓨鍚楋紙涓嶈繘琛屽鎵橈級锛�';
- window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });
+ if(window.sfdcPage && window.sfdcPage.appendToOnloadQueue){
+ window.sfdcPage.appendToOnloadQueue(
+ function() { calonLoad() }
+ );
+ };
+
var openQuoteExcelImportWindow = null;
function vpClear2_delay(){
@@ -195,12 +200,12 @@
</script>
<style type="text/css">
div#iframelike {
- color: #fff;
+
height: 300px;
overflow: auto;
}
div#iframelikeheader {
- color: #fff;
+
height: 23px;
overflow: auto;
}
@@ -272,25 +277,25 @@
</tr>
</table>
</apex:outputPanel>
- <div>
+ <div style="background:rgb(240 238 238);white-space:nowrap;padding:10px">
<table border="0">
<tr>
- <th style="text-align:right;width:60px;">{!$ObjectType.QuoteIrai__c.fields.IraiSubject__c.Label}</th>
- <td style="text-align:left;width:220px;">
- <div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="idVisitorPlace" value="{!quo.IraiSubject__c}" onblur="vpClear2_delay();" onfocus="setVisitorPlace();" style="width:210px;"/></div>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiSubject__c.Label}</th>
+ <td style="text-align:left;width:220px;margin:10px">
+ <div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="idVisitorPlace" value="{!quo.IraiSubject__c}" onblur="vpClear2_delay();" onfocus="setVisitorPlace();" style="width:210px;margin:10px"/></div>
<apex:inputHidden id="idVisitorPlaceId" value="{!quo.Account__c}"/>
<apex:inputHidden id="idVisitorPlaceHidden" value="{!quo.IraiSubject__c}" />
<apex:inputHidden id="idVisitorPlaceHiddenId" value="{!quo.Account__c}" />
</td>
- <th style="text-align:right;width:60px;">{!$ObjectType.QuoteIrai__c.fields.IraiName__c.Label}</th>
- <td style="text-align:left;width:220px;"><apex:inputField value="{!quo.IraiName__c}" style="width:220px;"/></td>
- <th style="text-align:right;width:60px;">{!$ObjectType.QuoteIrai__c.fields.IraiComment__c.Label}</th>
- <td style="text-align:left;width:220px;"><apex:inputField value="{!quo.IraiComment__c}" style="width:220px;"/></td>
- <th style="text-align:right;width:60px;">{!$ObjectType.QuoteIrai__c.fields.QuoteProportion__c.Label}</th>
- <td style="text-align:left;width:60px;"><apex:inputField value="{!quo.QuoteProportion__c}" style="width:50px;text-align:right;"/></td>
- <th style="text-align:left;width:20px;">%</th>
- <th style="text-align:right;width:60px;">{!$ObjectType.QuoteIrai__c.fields.QuoteIrai_Status__c.Label}</th>
- <td style="text-align:left;width:80px;"><apex:outputField value="{!quo.QuoteIrai_Status__c}" style="width:80px;"/></td>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiName__c.Label}</th>
+ <td style="text-align:left;width:220px;margin:10px;"><apex:inputField value="{!quo.IraiName__c}" style="width:220px;"/></td>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiComment__c.Label}</th>
+ <td style="text-align:left;width:220px;margin:10px;"><apex:inputField value="{!quo.IraiComment__c}" style="width:220px;"/></td>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.QuoteProportion__c.Label}</th>
+ <td style="text-align:left;width:60px;margin:10px;"><apex:inputField value="{!quo.QuoteProportion__c}" style="width:70px;text-align:right;"/></td>
+ <th style="text-align:left;width:20px;margin:10px;">%</th>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.QuoteIrai_Status__c.Label}</th>
+ <td style="text-align:left;width:80px;margin:10px;"><apex:outputField value="{!quo.QuoteIrai_Status__c}" style="width:80px;"/></td>
</tr>
</table>
<!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start -->
@@ -298,16 +303,16 @@
<tr>
<td> </td>
<!-- <th style="text-align:right">{!IF(displayFlg,'浜у搧鏍囧噯瀹氫环鎬婚','')}</th> -->
- <th style="text-align:right;width:50px;">浜у搧鏍囧噯瀹氫环鎬婚 : </th>
- <td style="width:176px;">
+ <th style="text-align:right;width:50px;white-space:nowrap;padding:10px;">浜у搧鏍囧噯瀹氫环鎬婚 : </th>
+ <td style="width:176px;padding:10px;">
<apex:outputText id="Estimation_Price" value="{0, number, ###,##0.00}"
style="text-align:right;width:100px;">
<apex:param value="{!qb.Estimation_List_Price}" />
</apex:outputText>
</td>
- <th style="text-align:right;width:50px;">鎶ヤ环鎬婚 : </th>
+ <th style="text-align:right;width:100px;white-space:nowrap;padding:10px;">鎶ヤ环鎬婚 : </th>
<!-- <th style="text-align:right;">{!IF(displayFlg,$Label.Total_Price,'')}</th> -->
- <td style="width:180px;">
+ <td style="width:180px;margin:10px;">
<apex:outputtext id="quoTotalPrice" value="{0, number, ###,##0.00}"
style="text-align:right;width:100px;">
<apex:param value="{!qb.QuoteTotal_Page}"/>
@@ -319,29 +324,29 @@
<!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 End -->
<table border="0">
<tr>
- <th style="width:50px;"> </th>
+ <th style="width:50px;margin:10px;"> </th>
<!-- 浜у搧閰嶅妫�绱㈡寜閽� -->
- <td style="width:100px;"><apex:commandButton id="SetProduct" onclick="searchSetProduct();return false;" value="{!$Label.Set_Product}" rerender="dummy"/></td>
+ <td style="width:150px;margin:10px;"><apex:commandButton id="SetProduct" onclick="searchSetProduct();return false;" value="{!$Label.Set_Product}" rerender="dummy"/></td>
<!-- excel 瀵煎嚭鎸夐挳 -->
- <td style="width:100px;"><apex:commandButton onclick="openQuoteExcelImport(event);return false;" value="{!$Label.Excel_Import}" rerender="dummy"/></td>
- <td style="text-align:right;width:80px;"><apex:commandButton rerender="dummy" id="Btn_RowDelete" onclick="radioChecker2('del');return false;" value="{!$Label.deleteLabel}" style="width:60px;"/></td>
- <td style="width:150px;">
- <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:60px;"/>
- <apex:commandButton rerender="dummy" id="Btn_RowDown" onclick="radioChecker2('down');return false;" value="{!$Label.Row_Down}" style="width:60px;"/>
+ <td style="width:150px;margin:10px;"><apex:commandButton onclick="openQuoteExcelImport(event);return false;" value="{!$Label.Excel_Import}" rerender="dummy"/></td>
+ <td style="text-align:right;width:80px;margin:10px;"><apex:commandButton rerender="dummy" id="Btn_RowDelete" onclick="radioChecker2('del');return false;" value="{!$Label.deleteLabel}" style="width:60px;"/></td>
+ <td style="width:300px;margin:10px;">
+ <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:100px;"/>
+ <apex:commandButton rerender="dummy" id="Btn_RowDown" onclick="radioChecker2('down');return false;" value="{!$Label.Row_Down}" style="width:100px;"/>
</td>
- <th style="text-align:right;width:80px;">{!$ObjectType.QuoteIrai__c.fields.IraiUser__c.Label}</th>
+ <th style="text-align:right;width:80px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiUser__c.Label}</th>
<!-- fy 20220512 -->
<!-- <apex:variable value="identif1" var="identif1" rendered="{!!(loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&&(loginUser.Salesdepartment_text__c == '5.鍗庝笢' || loginUser.Salesdepartment_text__c == '6.鍗庡崡'))}" > -->
<apex:variable value="identif1" var="identif1" rendered="{!!(loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&& obsflag)}" >
- <td style="width:150px;"><apex:outputPanel id="IraiUserId"><apex:inputField id="IraiUser" value="{!quo.IraiUser__c}"/></apex:outputPanel></td>
+ <td style="width:150px;margin:10px;"><apex:outputPanel id="IraiUserId"><apex:inputField id="IraiUser" value="{!quo.IraiUser__c}"/></apex:outputPanel></td>
</apex:variable>
<!-- fy 20220512 -->
<!-- <apex:variable value="identif" var="identif" rendered="{!loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&&(loginUser.Salesdepartment_text__c == '5.鍗庝笢' || loginUser.Salesdepartment_text__c == '6.鍗庡崡')}" > -->
<apex:variable value="identif" var="identif" rendered="{!loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&& obsflag}" >
<!-- <th style="text-align:right;width:20px;">obsap浜哄憳</th> -->
- <td style="text-align:center;width:20px;"><apex:selectList value="{!quo.IraiUser__c}" size="1" style="width:120px" id="IraiUser" onchange="ObsapUsersChange()"><apex:selectOptions value="{!ObsapUsers}" id="obsapUsersList"/></apex:selectList></td>
+ <td style="text-align:center;width:20px;margin:10px;"><apex:selectList value="{!quo.IraiUser__c}" size="1" style="width:120px" id="IraiUser" onchange="ObsapUsersChange()"><apex:selectOptions value="{!ObsapUsers}" id="obsapUsersList"/></apex:selectList></td>
</apex:variable>
<!-- 20230104 lt DB202212427301 start-->
@@ -350,8 +355,8 @@
<!-- 20230104 lt DB202212427301 end-->
<!-- 20230104 lt DB202212427301 start-->
- <th style="text-align:right;width:190px;">绱ф�ワ細</th>
- <td style="text-align:center;width:10px;"><apex:inputField id="Urgent" value="{!quo.Urgent__c}"/></td>
+ <th style="text-align:right;width:190px;margin:10px;">绱ф�ワ細</th>
+ <td style="text-align:center;width:10px;margin:10px;"><apex:inputField id="Urgent" value="{!quo.Urgent__c}"/></td>
<!-- 20230104 lt DB202212427301 end-->
<!-- 2020/02/18 绮剧悽鎶�鏈� 闊╅儴闀挎彁鍑哄厛闅愯棌 娌″繀瑕� Start-->
@@ -369,8 +374,8 @@
<td> </td>
</tr>
<tr>
- <td style="text-align:right;width:50px;"></td>
- <th style="text-align:right;width:50px;" rowspan="2">
+ <td style="text-align:right;width:50px;margin:10px;"></td>
+ <th style="text-align:right;width:50px;margin:10px;" rowspan="2">
{!$ObjectType.QuoteIrai__c.fields.MultiYearWarrantyTotalPrice__c.Label}
: </th>
<!-- <td style="width:470px;"> -->
@@ -389,7 +394,7 @@
<th style="width:100px;"> </th>
<td style="text-align:right;width:50px;"></td>
<td style="text-align:right;width:50px;"></td>
- <th colspan="2" style="width:260px;text-align:center;">{!$Label.Sales_Name}</th>
+ <th colspan="2" style="width:260px;text-align:center;margin:10px;">{!$Label.Sales_Name}</th>
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
<!-- <apex:variable id="contractWarranty" value="{!1}" var="abc" rendered="{!IF(trade == '鍐呰部',true,false)}">
@@ -413,12 +418,12 @@
<td ></td>
<td ></td>
<td ></td>
- <th style="width:100px;text-align:right;">{!$Label.Sales_Name1}</th>
+ <th style="width:100px;text-align:right;margin:10px;">{!$Label.Sales_Name1}</th>
<td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName1" value="{!quo.Agency1_entrust__c}" onChange=""/></td>
<!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
- <th style="width:100px;text-align:right;">澶氬勾淇�</th>
+ <th style="width:200px;text-align:right;margin:10px;">澶氬勾淇� :</th>
<!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
- <td colspan="2" style="text-align:left;"><apex:inputField id="cancelMultiyearInsurance" value="{!quo.cancelMultiyearInsurance__c}" onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
+ <td colspan="2" style="width:120px;text-align:left;margin:10px;"><apex:inputField id="cancelMultiyearInsurance" value="{!quo.cancelMultiyearInsurance__c}" onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
<!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
<!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
</tr>
@@ -434,7 +439,7 @@
<td> </td>
</tr>
</table>
- <table style="width:1165px;" border="0">
+ <table style="width:1165px;background:rgb(240 238 238);" border="0">
<tr>
<th style="text-align:center;width:15px;"> <input type="checkbox" id="checkAll" onclick="selectAll()" style="width:10px;"/></th>
<th style="text-align:center;width:15px;">No</th>
@@ -457,12 +462,12 @@
<input type="hidden" id="UnitPriceTotal" value="0" />
<apex:pageblocktable value="{!activities}" var="s" id="lists" style="width:1165px;">
- <apex:column style="width:15px;" >
- <input type="checkbox" name="checklist" value="{!s.lineNo}" style="width:10px;"/>
+ <apex:column style="width:20px;" >
+ <input type="checkbox" name="checklist" value="{!s.lineNo}" style="width:15px;"/>
</apex:column>
<!-- No -->
- <apex:column style="width:15px;text-align:right;" >
- <apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Product2__c==null,null,s.lineNo + 1)}" style="width:10px;"/>
+ <apex:column style="width:20px;text-align:right;" >
+ <apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Product2__c==null,null,s.lineNo + 1)}" style="width:15px;"/>
</apex:column>
<!-- 浜у搧缂栧彿-->
<apex:column style="text-align:center;width:150px;">
@@ -483,7 +488,7 @@
</apex:column>
<!-- 鏁伴噺 -->
<apex:column style="text-align:center;width:100px;">
- <apex:inputField id="Quantity" style="width:50px;text-align:right;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}')"/>
+ <apex:inputField id="Quantity" style="width:70px;text-align:right;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}')"/>
</apex:column>
<!-- 2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6 start -->
<apex:column style="width:50px;text-align:right;" >
@@ -573,9 +578,9 @@
<tr>
<th style="width:15px"> </th>
<!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
- <td style="width:100px;" align="right"><apex:commandButton id="QuoteIraiBtn" action="{!checkIraiUser}" reRender="IraiUserId,message1" onclick="blockme();" oncomplete="iraiJs();return false;" value="鍙戦�佸鎵橀偖浠�" style="width:90px;" disabled="{!Save_button}"/></td>
+ <td style="width:120px;" align="right"><apex:commandButton id="QuoteIraiBtn" action="{!checkIraiUser}" reRender="IraiUserId,message1" onclick="blockme();" oncomplete="iraiJs();return false;" value="鍙戦�佸鎵橀偖浠�" style="width:120px;white-space:nowrap;" disabled="{!Save_button}"/></td>
<!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
- <td style="width:100px;" align="right"><apex:commandButton action="{!checkIraiUser}" reRender="IraiUserId,hiddenQuoid,message1" onclick="blockme();" oncomplete="save2btn();return false;" value="{!$Label.Save_Button}" style="width:90px;" disabled="{!Save_button}" /></td>
+ <td style="width:120px;" align="right"><apex:commandButton action="{!checkIraiUser}" reRender="IraiUserId,hiddenQuoid,message1" onclick="blockme();" oncomplete="save2btn();return false;" value="{!$Label.Save_Button}" style="width:120px;" disabled="{!Save_button}" /></td>
<!-- 20230109 lt DB202212427301 start 娉ㄩ噴 -->
<!-- <td style="width:100px;" align="right"><apex:commandButton onclick="oppReflection2btn();return false;" rerender="hiddenQuoid" value="{!$Label.Opp_Button}" style="width:90px;" disabled="{!Save_button}"/></td>
<td style="width:100px;" align="right"><apex:commandButton action="{!Back}" rerender="hiddenQuoid" value="涓嶄繚瀛橈紙杩斿洖锛�" style="width:90px;"/></td>
--
Gitblit v1.9.1