From 07390e2fcb4adf27c928335bf27ae7939c5a80ad Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 23 五月 2023 11:28:12 +0800
Subject: [PATCH] bakcup20230523
---
force-app/main/default/pages/NewQuoteIrai.page | 68 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/force-app/main/default/pages/NewQuoteIrai.page b/force-app/main/default/pages/NewQuoteIrai.page
index 6283c2c..1bbe34f 100644
--- a/force-app/main/default/pages/NewQuoteIrai.page
+++ b/force-app/main/default/pages/NewQuoteIrai.page
@@ -29,12 +29,7 @@
var Confirm_ChangedAfterPrint = '鎵撳嵃鍚庤淇℃伅鏈夊彉鍖栵紝鏄惁缁х画鎿嶄綔锛堟姤浠风紪鐮佷細鍙樻柊锛夛紵';
var Confirm_PriceRefresh = '鎶ヤ环浣滄垚鍚巤!$Label.Price_Valid_Period}澶�,杩樻病鏈夋洿鏂拌繃浠锋牸锛岄渶瑕佹墽琛寋!$Label.Status_Update}锛�';
var Confirm_saveBtn = '鎮ㄩ�夋嫨浜嗗鎵樹汉鍛橈紝纭畾鍙槸淇濆瓨鍚楋紙涓嶈繘琛屽鎵橈級锛�';
- if(window.sfdcPage && window.sfdcPage.appendToOnloadQueue){
- window.sfdcPage.appendToOnloadQueue(
- function() { calonLoad() }
- );
- };
-
+ window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });
var openQuoteExcelImportWindow = null;
function vpClear2_delay(){
@@ -55,7 +50,16 @@
function vpClear2(){
resetValue('Page:mainForm:block:idVisitorPlace');
}
-
+ function show(s){
+ console.log(s);
+ console.log(j$(escapeVfId('Page:mainForm:block:lists:' + 0 + ':Name__c')).value());
+ console.log(j$(escapeVfId('Page:mainForm:block:lists:' + 0 + ':url__c')).value());
+ let a=j$(escapeVfId('Page:mainForm:block:lists:' + 0 + ':Name__c')).value();
+ let linkElement=document.getElementById("Page:mainForm:block:lists:0:NameLink");
+ console.log(linkElement);
+ let b=linkElement.getAttribute('href');
+ console.log(b);
+ }
//瑷晱鍫存墍銈ゃ兂銈广偪銉炽儓妞滅储
function setVisitorPlace(){
try{
@@ -200,12 +204,10 @@
</script>
<style type="text/css">
div#iframelike {
-
height: 300px;
overflow: auto;
}
div#iframelikeheader {
-
height: 23px;
overflow: auto;
}
@@ -282,7 +284,7 @@
<tr>
<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>
+ <div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="idVisitorPlace" value="{!quo.IraiSubject__c}" onblur="vpClear2_delay();" onfocus="setVisitorPlace();" style="width:210px;"/></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}" />
@@ -303,7 +305,7 @@
<tr>
<td> </td>
<!-- <th style="text-align:right">{!IF(displayFlg,'浜у搧鏍囧噯瀹氫环鎬婚','')}</th> -->
- <th style="text-align:right;width:50px;white-space:nowrap;padding:10px;">浜у搧鏍囧噯瀹氫环鎬婚 : </th>
+ <th style="text-align:right;width:50px;white-space:nowrap;padding:20px;">浜у搧鏍囧噯瀹氫环鎬婚 : </th>
<td style="width:176px;padding:10px;">
<apex:outputText id="Estimation_Price" value="{0, number, ###,##0.00}"
style="text-align:right;width:100px;">
@@ -375,12 +377,12 @@
</tr>
<tr>
<td style="text-align:right;width:50px;margin:10px;"></td>
- <th style="text-align:right;width:50px;margin:10px;" rowspan="2">
+ <th style="text-align:right;width:50px;margin:10px;" rowspan="3">
{!$ObjectType.QuoteIrai__c.fields.MultiYearWarrantyTotalPrice__c.Label}
: </th>
<!-- <td style="width:470px;"> -->
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
- <td style="width:100px;" rowspan="2">
+ <td style="width:100px;" rowspan="3">
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
<apex:outputtext style="width: :100px" id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}"
>
@@ -394,7 +396,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;margin:10px;">{!$Label.Sales_Name}</th>
+ <th colspan="2" style="width:260px;text-align:center;">{!$Label.Sales_Name}</th>
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
<!-- <apex:variable id="contractWarranty" value="{!1}" var="abc" rendered="{!IF(trade == '鍐呰部',true,false)}">
@@ -418,16 +420,27 @@
<td ></td>
<td ></td>
<td ></td>
- <th style="width:100px;text-align:right;margin:10px;">{!$Label.Sales_Name1}</th>
+ <th style="width:100px;text-align:right;">{!$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:200px;text-align:right;margin:10px;">澶氬勾淇� :</th>
+ <th style="width:100px;text-align:right;">澶氬勾淇�</th>
<!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
- <td colspan="2" style="width:120px;text-align:left;margin:10px;"><apex:inputField id="cancelMultiyearInsurance" value="{!quo.cancelMultiyearInsurance__c}" onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
+ <td colspan="2" style="text-align:left;"><apex:inputField id="cancelMultiyearInsurance" value="{!quo.cancelMultiyearInsurance__c}" onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
<!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
<!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
</tr>
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
+ <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start-->
+ <tr>
+ <td ></td>
+ <td ></td>
+ <td ></td>
+ <th style="width:100px;text-align:right;margin:10px;">{!$Label.Sales_Name2}</th>
+ <td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName2" value="{!quo.Agency2_entrust__c}" onChange=""/></td>
+ <th style="width:100px;text-align:right;margin:10px;"></th>
+ <td colspan="2" style="width:120px;text-align:left;margin:10px;"></td>
+ </tr>
+ <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end-->
<tr>
<td> </td>
</tr>
@@ -463,11 +476,11 @@
<apex:pageblocktable value="{!activities}" var="s" id="lists" style="width:1165px;">
<apex:column style="width:20px;" >
- <input type="checkbox" name="checklist" value="{!s.lineNo}" style="width:15px;"/>
+ <input type="checkbox" name="checklist" value="{!s.lineNo}" style="width:10px;"/>
</apex:column>
<!-- No -->
<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:outputLabel id="indexNo" value="{!IF(s.PageObject.Product2__c==null,null,s.lineNo + 1)}" style="width:10px;"/>
</apex:column>
<!-- 浜у搧缂栧彿-->
<apex:column style="text-align:center;width:150px;">
@@ -483,12 +496,15 @@
</apex:column>
<!-- 浜у搧鍚嶇О -->
<apex:column style="width:300px;">
- <div id="Page:mainForm:block:lists:{!s.lineNo}:NameLink"><apex:outputLink style="width:300px;" value="{!baseUrl}/{!s.PageObject.Product2__c}" id="Nametext1" target="_blank">{!s.PageObject.Name__c}</apex:outputLink></div>
+ <div id="Page:mainForm:block:lists:{!s.lineNo}:NameLink">
+ <apex:outputLink style="width:300px;" value="{!baseUrl}/{!s.PageObject.Product2__c}" id="Nametext1" target="_blank">{!s.PageObject.Name__c}</apex:outputLink>
+ </div>
<apex:inputHidden id="Name__c" value="{!s.PageObject.Name__c}"/>
+ <apex:inputHidden id="url__c" value="{!s.PageObject.Product2__c}"/>
</apex:column>
<!-- 鏁伴噺 -->
<apex:column style="text-align:center;width:100px;">
- <apex:inputField id="Quantity" style="width:70px;text-align:right;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}')"/>
+ <apex:inputField id="Quantity" style="width:50px;text-align:right;" value="{!s.PageObject.Quantity__c}" onclick="show('{!s.PageObject.GuaranteePeriod__c}')" onChange="calPrice('{!s.lineNo}')"/>
</apex:column>
<!-- 2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6 start -->
<apex:column style="width:50px;text-align:right;" >
@@ -496,7 +512,7 @@
</apex:column>
<!-- 2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6 end -->
<!-- ListPrice-->
- <apex:column style="width:85px;text-align:right;">
+ <apex:column style="width:85px;text-align:center;">
<apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
<apex:outputText style="width:85px;" id="ListPricetext" value="{0, number, ###,##0.00}">
<apex:param value="{!s.ListPrice_Page}" />
@@ -511,7 +527,7 @@
</apex:outputPanel>
</apex:column>
<!-- 灏忚 -->
- <apex:column style="width:100px;text-align:right;">
+ <apex:column style="width:100px;text-align:center;">
<apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
<apex:outputText style="width:80px;" id="ListPriceTotalText" value="{0, number, ###,##0.00}">
<apex:param value="{!s.ListPriceTotal_Page}" />
@@ -528,7 +544,7 @@
<apex:inputHidden id="lineNo" value="{!s.lineNo}"/>
</apex:column>
<!-- CHAN-BHNBX6 NodisCount 灏忚 2019/11/20 START -->
- <apex:column style="width:100px;text-align:right;">
+ <apex:column style="width:100px;text-align:center;">
<apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ServicePrice__c.accessible}" >
<apex:outputText style="width:80px;" id="NoDiscountTotalText" value="{0, number, ###,##0.00}">
<apex:param value="{!s.NoDiscountTotal_Page}" />
@@ -578,9 +594,9 @@
<tr>
<th style="width:15px"> </th>
<!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
- <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>
+ <td style="width:100px;" align="right"><apex:commandButton id="QuoteIraiBtn" action="{!checkIraiUser}" reRender="IraiUserId,message1" onclick="blockme();" oncomplete="iraiJs();return false;" value="鍙戦�佸鎵橀偖浠�" style="width:100px;white-space:nowrap;" disabled="{!Save_button}"/></td>
<!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
- <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>
+ <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:100px;" 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