From 52f362a9efd067ba31e24b30754681aabe8f991e Mon Sep 17 00:00:00 2001
From: fuyu <fuyu@prec-tech.com>
Date: 星期一, 06 三月 2023 13:28:09 +0800
Subject: [PATCH] 备份进口单证
---
force-app/main/default/pages/NewQuoteIrai.page | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/pages/NewQuoteIrai.page b/force-app/main/default/pages/NewQuoteIrai.page
index b55d6d4..f538e97 100644
--- a/force-app/main/default/pages/NewQuoteIrai.page
+++ b/force-app/main/default/pages/NewQuoteIrai.page
@@ -1,4 +1,4 @@
-<apex:page controller="NewQuoteIraiController" sidebar="false" action="{!init}" id="Page" >
+<apex:page controller="NewQuoteIraiController" sidebar="false" action="{!init}" id="Page" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.jquerysuggestcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
@@ -126,10 +126,14 @@
alert('璇烽�夋嫨瀵瑰簲鐨勮惀涓氬姪鐞�.');
unblockUI();
}
- else if (window.confirm('纭畾瑕佸鎵樿浜哄憳鍚楋紵\n' + mail)) {
- QuoteIrai();
- } else {
- unblockUI();
+ // 20230104 lt DB202212427301 start 娉ㄩ噴
+ // else if (window.confirm('纭畾瑕佸鎵樿浜哄憳鍚楋紵\n' + mail)) {
+ // QuoteIrai();
+ // }
+ // 20230104 lt DB202212427301 end
+ else {
+ QuoteIrai(); // 20230104 lt DB202212427301 end
+ // unblockUI(); // 20230104 lt DB202212427301 end
}
} else {
alert('璇烽�夋嫨濮旀墭浜哄憳.');
@@ -340,9 +344,16 @@
<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>
</apex:variable>
+ <!-- 20230104 lt DB202212427301 start-->
+ <!-- <th style="text-align:right;width:80px;">{!$ObjectType.QuoteIrai__c.fields.LastIraiUser__c.Label}</th>
+ <td style="text-align:center;width:70px;"><apex:outputField id="LastIraiUser" value="{!quo.LastIraiUser__c}"/></td> -->
+ <!-- 20230104 lt DB202212427301 end-->
- <th style="text-align:right;width:80px;">{!$ObjectType.QuoteIrai__c.fields.LastIraiUser__c.Label}</th>
- <td style="text-align:center;width:70px;"><apex:outputField id="LastIraiUser" value="{!quo.LastIraiUser__c}"/></td>
+ <!-- 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>
+ <!-- 20230104 lt DB202212427301 end-->
+
<!-- 2020/02/18 绮剧悽鎶�鏈� 闊╅儴闀挎彁鍑哄厛闅愯棌 娌″繀瑕� Start-->
<!-- <th style="text-align:right;width:70px;">鎬昏</th>
<td style="text-align:right;width:80px;">
@@ -359,14 +370,14 @@
</tr>
<tr>
<td style="text-align:right;width:50px;"></td>
- <th style="text-align:right;width:50px;" rowspan="2">
+ <th style="text-align:right;width:50px;" rowspan="3">
{!$ObjectType.QuoteIrai__c.fields.MultiYearWarrantyTotalPrice__c.Label}
: </th>
<!-- <td style="width:470px;"> -->
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
- <td style="width:10px;" rowspan="2">
+ <td style="width:100px;" rowspan="3">
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
- <apex:outputtext id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}"
+ <apex:outputtext style="width: :100px" id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}"
>
<!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
<!-- style="text-align:right;width:180px;"> -->
@@ -405,11 +416,24 @@
<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:100px;text-align:right;">鍙栨秷澶氬勾淇�</th>
- <td colspan="2" style="text-align:left;"><apex:inputField id="cancelMultiyearInsurance" value="{!quo.cancelMultiyearInsurance__c}" /></td>
+ <th style="width:100px;text-align:right;">澶氬勾淇�</th>
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+ <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;">{!$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;"></th>
+ <td colspan="2" style="text-align:left;"></td>
+ </tr>
+ <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end-->
<tr>
<td> </td>
</tr>
@@ -454,6 +478,9 @@
<!-- 浜у搧缂栧彿-->
<apex:column style="text-align:center;width:150px;">
<apex:inputText id="Assert" style="width:120px;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value)" />
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+ <apex:inputHidden id="CanNotCancelledGurantee__c" value="{!s.CanNotCancelledGurantee}" />
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
</apex:column>
<!-- NMPA鐘舵�� -->
<apex:column style="width:100px;text-align:center;">
@@ -518,12 +545,30 @@
<apex:outputPanel layout="none" rendered="{!!$ObjectType.QuoteIraiLineItem__c.fields.ServicePrice__c.accessible}" >
<span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:NoDiscountTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
<script type="text/javascript">
+ debugger
j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':NoDiscountTotal')).val(toNum(0));
</script>
</apex:outputPanel>
</apex:column>
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+ <!-- <apex:column style="width:100px;text-align:right;">
+ <apex:outputPanel layout="none" rendered="{!IF(quo.cancelMultiyearInsurance__c =='瑕�' ||(quo.cancelMultiyearInsurance__c =='涓嶈' && s.CanNotCancelledGurantee == 'true' ),true,false)}" >
+ <apex:outputText style="width:80px;" id="NoDiscountTotalText" value="{0, number, ###,##0.00}">
+ <apex:param value="{!s.NoDiscountTotal_Page}" />
+ </apex:outputText>
+ </apex:outputPanel>
+ <apex:inputHidden id="NoDiscountTotal" value="{!s.NoDiscountTotal_Page}"/>
+ <apex:inputHidden id="NoDiscount" value="{!s.NoDiscount_Page}"/>
+ <apex:outputPanel layout="none" rendered="{!IF(quo.cancelMultiyearInsurance__c =='涓嶈'&& s.CanNotCancelledGurantee == 'false' ,true,false)}" >
+ <span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:NoDiscountTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
+ <script type="text/javascript">
+ j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':NoDiscountTotal')).val(toNum(0));
+ </script>
+ </apex:outputPanel>
+ </apex:column> -->
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
<!-- CHAN-BHNBX6 NodisCount 灏忚 2019/11/20 END -->
</apex:pageBlockTable>
</div>
@@ -542,10 +587,12 @@
<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>
<!-- 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:100px;" align="right"><apex:commandButton onclick="oppReflection2btn();return false;" rerender="hiddenQuoid" value="{!$Label.Opp_Button}" style="width:90px;" 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>
<td style="width:100px;" align="right"><apex:commandButton value="浜у搧璇曠敤璇勪环OPD" style="width:95px;" onclick="openpdf('OPD');return false;" disabled="{!pdf_button}"/></td>
- <td style="width:100px;" align="right"><apex:commandButton value="浜у搧璇曠敤璇勪环SIS" style="width:95px;" onclick="openpdf('SIS');return false;" disabled="{!pdf_button}"/></td>
+ <td style="width:100px;" align="right"><apex:commandButton value="浜у搧璇曠敤璇勪环SIS" style="width:95px;" onclick="openpdf('SIS');return false;" disabled="{!pdf_button}"/></td> -->
+ <!-- 20230109 lt DB202212427301 end 娉ㄩ噴 -->
</tr>
</table>
</td>
--
Gitblit v1.9.1