From 559771a80cf779dc13a84ecd2f178e6ca5a8353a Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期五, 19 五月 2023 15:52:16 +0800
Subject: [PATCH] 备份省目标录入

---
 force-app/main/default/pages/SearchProductIrai.page |   37 +++++++++++++++++++++++++++++++++++--
 1 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/pages/SearchProductIrai.page b/force-app/main/default/pages/SearchProductIrai.page
index a4554a1..dfe2356 100644
--- a/force-app/main/default/pages/SearchProductIrai.page
+++ b/force-app/main/default/pages/SearchProductIrai.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" standardController="Product2" extensions="SearchProductController" sidebar="false" showHeader="false" >
+<apex:page id="Page" standardController="Product2" extensions="SearchProductController" sidebar="false" showHeader="false"  >
     <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
     <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -34,6 +34,7 @@
             top.window.close();
         }
         function SetProductId(lineno, i) {
+            debugger
             var Asset_Model_No__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Asset_Model_No__c")).text();
             var Product2Id = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Product_Id")).val();
             var SFDA_Status__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":SFDA_Status__c")).text();
@@ -48,6 +49,9 @@
             var Bsscategory = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Bsscategory")).val();
             var PricebookEntryId = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":PricebookEntryId")).val();
             var trade = window.opener.j$(escapeVfId("Page:mainForm:block:CurrencyIsoCode")).val();
+            //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
+            var CanNotCancelledGurantee__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":CanNotCancelledGurantee__c")).val();
+            //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
 
             //CHAN-BHNBX6 2019/11/20 START 
             var GuaranteePeriod =  j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":GuaranteePeriod")).value();    
@@ -65,6 +69,12 @@
             //SFDA hidden
             window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":SFDA")).val(SFDA_Status__c);
             
+            //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
+            //鍙栨秷甯傚満澶氬勾淇�
+            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":CanNotCancelledGurantee__c")).val(CanNotCancelledGurantee__c);
+            //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
+
+
             //鍝佺洰鍚�
             var baseUrl = window.opener.j$(escapeVfId("Page:mainForm:block:baseUrl")).val();
             window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Nametext1")).attr("href", baseUrl + "/" + Product2Id);
@@ -122,6 +132,17 @@
             window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ListPriceTotal")).val(ListPrice);
 
             //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 START 
+            //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
+            // var cancelMultiyearInsurance = top.window.opener.j$(escapeVfId("Page:mainForm:block:cancelMultiyearInsurance")).val();
+            // var NoDiscount1;
+            // if(cancelMultiyearInsurance == '涓嶈' && CanNotCancelledGurantee__c == 'false'){
+            //     NoDiscount1 = 0.00;
+            // }else{
+            //     NoDiscount1 = NoDiscount;
+            // }
+            // window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscountTotalText")).text(top.window.opener.toNumComma(NoDiscount1));
+
+            //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
             window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscountTotalText")).text(top.window.opener.toNumComma(NoDiscount));
             //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 END 
             // window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscountTotal")).val(Intra_Trade_Service_RMB);
@@ -220,7 +241,10 @@
                                 <tr>
                                     <td>
                                     <div id="iframelike" style="width:800px">
-                                    <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="9" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,35px">
+                                    <!-- 20221020 ljh SWAG-CJ98AJ start-->
+                                    <!-- <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="9" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,35px"> -->
+                                    <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="10" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,35px">
+                                    <!-- 20221020 ljh SWAG-CJ98AJ end -->
                                         <apex:column style="width:15px;" >
                                             <apex:facet name="header">{!$Label.Selected}</apex:facet>
                                             <input type="checkbox" name="checklist" value="" style="width:10px;"/>
@@ -239,6 +263,9 @@
                                             <apex:inputHidden id="GuaranteePeriod" value="{!c.Entend_gurantee_period_all}"/>
                                             <apex:inputHidden id="Intra_Trade_Service_RMB" value="{!c.Intra_Trade_Service_RMB}"/>
                                             <!-- CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 END  -->
+                                            <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+                                            <apex:inputHidden id="CanNotCancelledGurantee__c" value="{!c.CanNotCancelledGurantee}"/>
+                                            <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
                                         </apex:column>
                                         <apex:column >
                                             <apex:facet name="header">{!$ObjectType.Product2.fields.OT_CODE_no_link__c.Label}</apex:facet>
@@ -248,6 +275,12 @@
                                             <apex:facet name="header">{!$Label.Product_Name}</apex:facet>
                                             <apex:outputField id="Name" value="{!c.pbe.Product2.Name}" />
                                         </apex:column>
+                                        <!-- 20221020 ljh SWAG-CJ98AJ start-->
+                                        <apex:column >
+                                            <apex:facet name="header">{!$ObjectType.Product2.fields.suitDepartment__c.Label}</apex:facet>
+                                            <apex:outputField id="suitDepartment__c" value="{!c.pbe.Product2.suitDepartment__c}" />
+                                        </apex:column>
+                                        <!-- 20221020 ljh SWAG-CJ98AJ end-->
                                         <apex:column >
                                             <apex:facet name="header">{!$ObjectType.Product2.fields.Alternative_Products__c.Label}</apex:facet>
                                             <apex:outputField id="Alternative" value="{!c.pbe.Product2.Alternative_Products__c}" />

--
Gitblit v1.9.1