From ba1c90575c47f9cb5c2ce0a20da90d3b1739b5fa Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 26 四月 2022 11:47:45 +0800
Subject: [PATCH] 0425 Commit

---
 force-app/main/default/pages/SearchProduct.page |  644 +++++++++++++++------------------------------------------
 1 files changed, 173 insertions(+), 471 deletions(-)

diff --git a/force-app/main/default/pages/SearchProduct.page b/force-app/main/default/pages/SearchProduct.page
index 656dcc7..b559e10 100644
--- a/force-app/main/default/pages/SearchProduct.page
+++ b/force-app/main/default/pages/SearchProduct.page
@@ -1,420 +1,131 @@
-<apex:page id="Page" standardController="Product2" extensions="SearchProductController" sidebar="false" showHeader="false" >
-    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:page id="Page" Controller="SearchProductController" sidebar="false" showHeader="false" action="{!init}">
+  <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
     <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-        
+    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+    <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+
     <script>
-        var QuoteEntryMaxLine = window.opener.QuoteEntryMaxLine;
-        function setProductList() {
+       var QuoteEntryMaxLine = 150;
+         
+       function setProductList() {
             var nextLine = top.window.opener.getLastLineNoNext(window.opener.document);
             var hasCheckedCnt = 0;
             var checklist = j$("input[name='checklist']");
+
+            // var is_hidden_all = j$(escapeVfId("isHiddenAllsearch")).val();
+            //alert('is_hidden_all=====>'+ is_hidden_all);
+
             for(var i=0; i<checklist.length; i++){
-                if (checklist[i].checked) {
-                    hasCheckedCnt++;
-                    //HWAG-BLWB9F 璇环鎶ヤ环锛氬骞翠繚浜у搧鏈櫥褰曡鎻愰噾棰濇椂涓嶅彲鎶ヤ环 绮剧悽鎶�鏈�  20200224 start
-                     var Intra_Trade_Gurantee_RMB = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Gurantee_RMB__c")).val();
-                     var GuranteeType = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":GuranteeType")).val();
-
-                     //鏄惁鐧诲綍鎶ヤ环
-                     var Estimation_Entry_Possibility =j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Estimation_Entry_Possibility")).val();
-                     //鍐呰锤鎴愭湰
-                     var CostFlag = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":CostFlag")).val();
-
-                     //鍐呭璐�
-                     var trade = window.opener.j$(escapeVfId("Page:mainForm:block:CurrencyIsoCode")).val();
-
-                     //鍐呰锤鎶ヤ环閲戦
-                     var Intra_Trade_List_RMB__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_List_RMB__c")).text();
-                     //澶栬锤鎶ヤ环閲戦
-                     var Foreign_Trade_List_US__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Foreign_Trade_List_US__c")).text();
-                     //澶栬锤鎴愭湰
-                     var Foreign_Trade_Cost_US__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Foreign_Trade_Cost_US__c")).val();
-
-                     //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦浠ュ強鎶ヤ环 绮剧悽鎶�鏈� wql  start 
-                     var Intra_Trade_Gurantee_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Gurantee_USD__c")).val();
-
-                     var Intra_Trade_Service_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_USD__c")).val();
-
-                     var Maintenance_Price_Year_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Maintenance_Price_Year_USD__c")).val();
-                     //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦浠ュ強鎶ヤ环 绮剧悽鎶�鏈� wql  end
-
-
-                     //鍐呰锤
-                      if(trade == "CNY") {
-                        //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 start 
-                        // if((GuranteeType == '甯傚満'||GuranteeType == '鏈嶅姟' ) &&Intra_Trade_Gurantee_RMB <=0){
-                           
-                        //     alert('澶氬勾淇濅骇鍝佹湭鐧诲綍璁℃彁閲戦鏃朵笉鍙姤浠�!');
-                        // }else
-                        //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 end
-                        if(Estimation_Entry_Possibility == 'true'){
-                            alert('浜у搧鏈櫥褰曟姤浠锋椂涓嶅彲鎶ヤ环!');
-                        }else if(CostFlag == 'true'){
-                            alert('浜у搧鐨勬垚鏈负绌烘椂涓嶅彲鎶ヤ环锛�');
-                        }else if(Intra_Trade_List_RMB__c == ''||Intra_Trade_List_RMB__c<0){
-                            alert('浜у搧鐨勬姤浠烽噾棰濅负绌烘椂涓嶅彲鎶ヤ环锛�');
-                        }else{
-                            if (nextLine < QuoteEntryMaxLine) {
-                                    SetProductId(nextLine, i);
-                                    nextLine++;
-                                 } else {
-                                         alert('Over Max Line ' + QuoteEntryMaxLine);
-                                             return false;
-                            }
+                    if (checklist[i].checked) {
+                        hasCheckedCnt++;
+                        if (nextLine < QuoteEntryMaxLine) {
+                            SetProductId(nextLine, i);
+                            nextLine++;
+                        } else {
+                            //alert('Over Max Line ' + QuoteEntryMaxLine);
+                            return false;
                         }
-                        //澶栬锤
-                      }else if(trade == "USD"){
-                        //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 start 
-                        //澶栬锤澶氬勾淇� 澧炲姞鍒ゆ柇鍚屽唴璐� 绮剧悽鎶�鏈� wql 2021/01/21 start
-                        // if((GuranteeType == '甯傚満'||GuranteeType == '鏈嶅姟' ) &&Intra_Trade_Gurantee_USD <=0){
-                           
-                        //     alert('澶氬勾淇濅骇鍝佹湭鐧诲綍璁℃彁閲戦鏃朵笉鍙姤浠�!');
-                        // }else
-                        //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 end 
-                        if(Estimation_Entry_Possibility == 'true'){
-                            alert('浜у搧鏈櫥褰曟姤浠锋椂涓嶅彲鎶ヤ环!');
-                        } 
-                        //澶栬锤澶氬勾淇� 澧炲姞鍒ゆ柇鍚屽唴璐� 绮剧悽鎶�鏈� wql 2021/01/21 end
-                        else if(Foreign_Trade_List_US__c ==''||Foreign_Trade_List_US__c<0 ){
-                                alert('浜у搧鐨勬姤浠烽噾棰濅负绌烘椂涓嶅彲鎶ヤ环锛�');
-                            }else if(Foreign_Trade_Cost_US__c == ''||Foreign_Trade_Cost_US__c<0){
-                                 alert('浜у搧鐨勬垚鏈负绌烘椂涓嶅彲鎶ヤ环锛�');
-                            }else{
-                                if (nextLine < QuoteEntryMaxLine) {
-                                    SetProductId(nextLine, i);
-                                    nextLine++;
-                                 } else {
-                                         alert('Over Max Line ' + QuoteEntryMaxLine);
-                                             return false;
-                            }
-                            }
-                      }
-
-                    
-                    //HWAG-BLWB9F 璇环鎶ヤ环锛氬骞翠繚浜у搧鏈櫥褰曡鎻愰噾棰濇椂涓嶅彲鎶ヤ环 绮剧悽鎶�鏈�  20200224 end
-                }
+                    }
             }
             if (hasCheckedCnt == 0) {
                 alert(top.window.opener.Error_Message34);
                 return false;
             }
-            top.window.opener.calPriceAll();
+            window.opener.doReroad();
             top.window.close();
         }
+
         function setProductOne(lineno, i) {
-            //lineno = getLastLineNo();
-            //HWAG-BLWB9F 璇环鎶ヤ环锛氬骞翠繚浜у搧鏈櫥褰曡鎻愰噾棰濇椂涓嶅彲鎶ヤ环 绮剧悽鎶�鏈�  20200224 start
-            var Intra_Trade_Gurantee_RMB = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Gurantee_RMB__c")).val();
-            var GuranteeType = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":GuranteeType")).val();
-            //鏄惁鐧诲綍鎶ヤ环
-            var Estimation_Entry_Possibility =j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Estimation_Entry_Possibility")).val();
-            //鍐呰锤鎴愭湰
-             var CostFlag = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":CostFlag")).val();
-              //鍐呭璐�
-             var trade = window.opener.j$(escapeVfId("Page:mainForm:block:CurrencyIsoCode")).val();
-
-             //鍐呰锤鎶ヤ环閲戦
-             var Intra_Trade_List_RMB__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_List_RMB__c")).text();
-             //澶栬锤鎶ヤ环閲戦
-             var Foreign_Trade_List_US__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Foreign_Trade_List_US__c")).text();
-             //澶栬锤鎴愭湰
-             var Foreign_Trade_Cost_US__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Foreign_Trade_Cost_US__c")).val();  
-             //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦浠ュ強鎶ヤ环 绮剧悽鎶�鏈� wql  start 
-             var Intra_Trade_Gurantee_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Gurantee_USD__c")).val();
-
-             var Intra_Trade_Service_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_USD__c")).val();
-
-             var Maintenance_Price_Year_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Maintenance_Price_Year_USD__c")).val();
-             //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦浠ュ強鎶ヤ环 绮剧悽鎶�鏈� wql  end
-
-             //鍐呰锤
-              if(trade == "CNY") {
-                //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 start 
-                // if((GuranteeType == '甯傚満'||GuranteeType == '鏈嶅姟' ) &&Intra_Trade_Gurantee_RMB <=0){
-                   
-                //     alert('澶氬勾淇濅骇鍝佹湭鐧诲綍璁℃彁閲戦鏃朵笉鍙姤浠�!');
-                // }else 
-                //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 end 
-                if(Estimation_Entry_Possibility == 'true'){
-                    alert('浜у搧鏈櫥褰曟姤浠锋椂涓嶅彲鎶ヤ环!');
-                }else if(CostFlag == 'true'){
-                    alert('浜у搧鐨勬垚鏈负绌烘椂涓嶅彲鎶ヤ环锛�');
-                }else if(Intra_Trade_List_RMB__c == ''||Intra_Trade_List_RMB__c<0){
-                    alert('浜у搧鐨勬姤浠烽噾棰濅负绌烘椂涓嶅彲鎶ヤ环锛�');
-                }else{
-                     SetProductId(lineno, i);
-                }
-                //澶栬锤
-              }else if(trade == "USD"){
-              //澶栬锤澶氬勾淇� 澧炲姞鍒ゆ柇鍚屽唴璐� 绮剧悽鎶�鏈� wql 2021/01/21 start 
-              //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 start 
-              // if((GuranteeType == '甯傚満'||GuranteeType == '鏈嶅姟' ) &&Intra_Trade_Gurantee_USD <=0){
-                   
-              //       alert('澶氬勾淇濅骇鍝佹湭鐧诲綍璁℃彁閲戦鏃朵笉鍙姤浠�!');
-              //   }else 
-              //WLIG-BXVB6M 銆愬鎵樸�戙�愮揣鎬ャ�戝彇娑堟姤浠峰崟涓骞翠繚璁℃彁閲戦涓�0鐨勬鏌� 绮剧悽鎶�鏈� 2021/02/03 end 
-                if(Estimation_Entry_Possibility == 'true'){
-                    alert('浜у搧鏈櫥褰曟姤浠锋椂涓嶅彲鎶ヤ环!');
-                }
-              //澶栬锤澶氬勾淇� 澧炲姞鍒ゆ柇鍚屽唴璐� 绮剧悽鎶�鏈� wql 2021/01/21 end 
-                else if(Foreign_Trade_List_US__c ==''||Foreign_Trade_List_US__c<0 ){
-                        alert('浜у搧鐨勬姤浠烽噾棰濅负绌烘椂涓嶅彲鎶ヤ环锛�');
-                    }else if(Foreign_Trade_Cost_US__c == ''||Foreign_Trade_Cost_US__c<0){
-                         alert('浜у搧鐨勬垚鏈负绌烘椂涓嶅彲鎶ヤ环锛�');
-                    }else{
-                         SetProductId(lineno, i);
-                    }
-              }
-           //HWAG-BLWB9F 璇环鎶ヤ环锛氬骞翠繚浜у搧鏈櫥褰曡鎻愰噾棰濇椂涓嶅彲鎶ヤ环 绮剧悽鎶�鏈�  20200224 end
-            top.window.opener.calPriceAll();
+            SetProductId(lineno, i);
+            window.opener.doReroad();
             top.window.close();
         }
+
+        function doSearch() {
+            blockme();
+            serContact.call();
+        }
+
         function SetProductId(lineno, i) {
-            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();
-            var SFDA_Status = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":SFDA_Status")).val();
 
-            //SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add start
-            var Estimated_ConsumptionDueDate__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Estimated_ConsumptionDueDate")).text();
-            //SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add end
-
-            var name = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Name")).text();
-            var Intra_Trade_List_RMB__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_List_RMB__c")).text();
-            var Foreign_Trade_List_US__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Foreign_Trade_List_US__c")).text();
-            var NameCode = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":NameCode")).val();
-            var Sales_Possibility = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Sales_Possibility")).val();
-            var Intra_Trade_Cost_RMB__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Cost_RMB__c")).val();
-            var Foreign_Trade_Cost_US__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Foreign_Trade_Cost_US__c")).val();
-            var Packing_list_manual__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Specifications")).value();
-            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();
-            var StorageStatus__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":StorageStatus__c")).val();
-            //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦浠ュ強鎶ヤ环 绮剧悽鎶�鏈� wql  start 
-             var Intra_Trade_Gurantee_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Gurantee_USD__c")).val();
-
-             var Intra_Trade_Service_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_USD__c")).val();
-
-             var Maintenance_Price_Year_USD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Maintenance_Price_Year_USD__c")).val();
-             //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦浠ュ強鎶ヤ环 绮剧悽鎶�鏈� wql  end
-            // Packing_list_manual__c = parseFloat(Packing_list_manual__c).toFixed(1);
-
-            //搴撳瓨鐘舵��
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Storagestatustext")).text(StorageStatus__c);
-
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Storagestatus")).val(StorageStatus__c);
-
-            //No
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":indexNo")).text(parseInt(lineno)+1);
-
-            //瑁藉搧鍨嬬暘
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Assert")).val(Asset_Model_No__c);
-
-             //Status__c
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Status__c")).text(SFDA_Status__c);
-            
-            //SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add start
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Estimated_ConsumptionDueDate")).text(Estimated_ConsumptionDueDate__c);
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Estimated_ConsumptionDueDate1")).text(Estimated_ConsumptionDueDate__c);
-            //SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add end
-
-            //SFDA hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":SFDA")).val(SFDA_Status);
-
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Specifications")).val(Packing_list_manual__c);
-
-            //鍝佺洰鍚�
-            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);
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Nametext1")).text(name);
-            //鍝佺洰鍚峢idden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Name__c")).val(name);
-
-            //ListPrice
-            var ListPrice = 0;
-            var Cost_c = 0;
-            //澶氬勾淇濅慨 start
-            var Extend_new_product_gurantee = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Extend_new_product_gurantee__c")).val();
-
-            var Extend_new_product_gurantee_MD = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Extend_new_product_gurantee_MD__c")).val();
-
-            var GuranteeType = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":GuranteeType")).val();
-
-            var Entend_gurantee_period_all = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Entend_gurantee_period_all__c")).val();
-            var Intra_Trade_Gurantee_RMB = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Gurantee_RMB__c")).val();
-
-            var Intra_Trade_Service_RMB = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_RMB__c")).val();
-
-            var Maintenance_Price_Year  = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Maintenance_Price_Year__c")).val();
-            // 渚涘簲鍟嗗悕绉� 
-            var VenderName = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":VenderName")).val();
-            //涓嶅彲鍙栨秷澶氬勾淇�
-            var CanNotCancelledGurantee = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":CanNotCancelledGurantee")).val();
-
-            //闃胯タ璧涘
-            var Is_DangerousChemicals = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Is_DangerousChemicals")).val();
-
-            var ProductGuranteePrice = 0;
-            var ProductServicePrice = 0;
-            var productMaintenance_Price_Year = 0;
-            //澶氬勾淇濅慨 end
-            if(trade == "CNY") {
-               //澶氬勾淇濅慨 start
-               ProductGuranteePrice                  = Intra_Trade_Gurantee_RMB;
-               ProductServicePrice                   = Intra_Trade_Service_RMB;
-               productMaintenance_Price_Year         = Maintenance_Price_Year;
-               //澶氬勾淇濅慨 end
-               ListPrice = Intra_Trade_List_RMB__c;
-               Cost_c = Intra_Trade_Cost_RMB__c;
-
-            } else if(trade == "USD"){
-               //澶氬勾淇濅慨 start
-               //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦 浠ュ強 鎶ヤ环 绮剧悽鎶�鏈� wql start
-               ProductGuranteePrice                  = Intra_Trade_Gurantee_USD;
-               ProductServicePrice                   = Intra_Trade_Service_USD;
-               productMaintenance_Price_Year         = Maintenance_Price_Year_USD;
-               //澶栬锤澶氬勾淇� 鍙栦骇鍝佷富鏁版嵁涓婄殑閲戦 浠ュ強 鎶ヤ环 绮剧悽鎶�鏈� wql end
-               //澶氬勾淇濅慨 end
-               ListPrice = Foreign_Trade_List_US__c;
-               Cost_c = Foreign_Trade_Cost_US__c;
+          var ProductCode = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":ProductCode")).text();
+            if (ProductCode.indexOf('0000000000') == 0) {
+                ProductCode = ProductCode.substring(10);
             }
-            Cost_c = top.window.opener.toNum(Cost_c);
-            ListPrice = top.window.opener.toNum(ListPrice);
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ListPricetext")).text(top.window.opener.toNumComma(ListPrice));
-            //ListPrice hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ListPrice")).val(ListPrice);
+            var ProductECCode = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":ProductECCode")).text();
+          var name = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Name")).text();
 
-            //鏁伴噺
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Quantity")).val(1);
+          var PbeId = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":hidId")).text();
+            var pId = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":pId")).text();
+            //XHL-20190428-UpdateStart
+            // var productSet = j$(escapeVfId("Page:mainForm:idSearchSetProduct:productSet")).val();
+            // var productSetLabel = j$(escapeVfId("Page:mainForm:idSearchSetProduct:productSet") + ' option:selected').text();
+            //XHL-20190428-UpdateEnd
+            var salesprice = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Salesprice")).text();
+            var salespriceA = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":SalespriceA")).text();
+            var salespriceB = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":SalespriceB")).text();
+            var salespriceC = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":SalespriceC")).text();
+            var pm = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":ProductModel")).text();
+            var productDescription = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":ProductDescription")).text();
+            var salespriceR = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":SalespriceR")).text();
+            var hiddenflg = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Hiddenflg")).text();
+            var is_hidden_all = j$(escapeVfId("isHiddenAllsearch")).val();
+            var specialDealer = j$(escapeVfId("specialDealer")).val();
+            //alert('Salesprice=====>'+ salesprice);
+            var openFlag = j$(escapeVfId("openFlag")).val();
+            if (openFlag == 'opp') {
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:" + (lineno - 1) + ":product")).val(name);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:" + (lineno - 1) + ":productId")).val(pId);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:" + (lineno - 1) + ":isProductModel")).val(pm);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":price0")).val(salesprice);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":unitPrice")).val(salespriceR);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":hiddenflg")).val(hiddenflg);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":description")).val(productDescription);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":productCode")).text(ProductCode);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":productCodeHidden")).val(ProductCode);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":productEC")).text(ProductECCode);
+                window.opener.j$(escapeVfId("allPage:allForm:allBlock:records:"+ (lineno - 1) +":productECHidden")).val(ProductECCode);
+                if (specialDealer == 'true') {
+                    window.opener.j$(escapeVfId("isHiddenAll")).val(is_hidden_all);
+                }
+                
+                
+            } else {
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":indexNo")).text(parseInt(lineno)+1);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ProductName")).val(name);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ProductCode")).text(ProductCode);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ProductCodeHidden")).val(ProductCode);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ProductEC")).text(ProductECCode);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ProductECHidden")).val(ProductECCode);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":PbeId")).val(PbeId);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ProId")).val(pId);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":UnitPrice")).val(salespriceR);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":hiddenflg")).val(hiddenflg);
+                //window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":UnitPriceHidden")).val(salesprice);
+                //XHL-20190428-UpdateStart
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Set")).text('{!$Label.SingleProduct}');
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":SetName")).val('{!$Label.SingleProduct}');
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":SingleProduct")).val('true');
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":hidSet")).val('{!$Label.SingleProduct}');
+                //XHL-20190428-UpdateEnd
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":price0")).val(salesprice);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":price1")).val(salespriceA);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":price2")).val(salespriceB);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":price3")).val(salespriceC);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Distingush")).val(null);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":isProductModel")).val(pm);
+                window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Description")).val(productDescription);
 
-            //渚℃牸
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":UnitPrice")).val(top.window.opener.toNumComma(ListPrice));
-
-            //瑙勬牸
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Specifications")).text(Packing_list_manual__c);
-
-            //灏忚▓
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":TotalPrice")).text(top.window.opener.toNumComma(ListPrice));
-
-            //Subtotal__c hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Subtotal__c")).val(ListPrice);
-
-            //NameCode hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NameCode")).val(NameCode);
-
-            //Specifications hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Specifications")).val(Packing_list_manual__c);
-
-            //Product_Name hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Name")).val(name);
-
-            //SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add start
-            //浜у搧 棰勮娑堣�楁棩
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Estimated_ConsumptionDueDate")).val(Estimated_ConsumptionDueDate__c);
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Estimated_ConsumptionDueDate1")).val(Estimated_ConsumptionDueDate__c);
-            MarkRedFLG(lineno,Estimated_ConsumptionDueDate__c);
-            //SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add end
-
-            //Product_SFDA hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_SFDA")).val(SFDA_Status__c);
-
-            //Sales_Possibility hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Sales_Possibility")).val(Sales_Possibility);
-
-            //Product_ListPrice hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_ListPrice")).val(ListPrice);
-
-            //Product_Cost hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Cost")).val(Cost_c);
-
-            //Cost hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Cost")).val(Cost_c);
-
-            //CostSubTotal hidden Cost_c * Quantity;
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":CostSubTotal")).val(Cost_c);
-
-            //Bsscategory hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Bsscategory")).val(Bsscategory);
-
-            //Product_Id hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Id")).val(Product2Id);
-
-            //PricebookEntryId hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":PricebookEntryId")).val(PricebookEntryId);
-
-            //lineNo hidden
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":lineNo")).val(parseInt(lineno));
-            // 澶氬勾淇濅慨 2019/07/25 start
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":ProductEntend_gurantee_period_all__c")).val(Entend_gurantee_period_all);
-
-            // 缁翠慨鍚堝悓鎶ヤ环
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":Maintenance_Price_Year__c")).val(productMaintenance_Price_Year);
-            // 鏈�鏂扮淮淇悎鍚屾姤浠�
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":latestMaintenance_Price_Year")).val(productMaintenance_Price_Year);
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":GuranteeType")).val(GuranteeType);
-            // 渚涘簲鍟嗗悕绉�
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":VenderName")).text(VenderName);
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":VenderName__c")).val(VenderName);
-            //涓嶅彲鍙栨秷澶氬勾淇�
-            
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":CanNotCancelledGurantee__c")).val(CanNotCancelledGurantee);
-
-            //闃胯タ璧涘
-            
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                +":Is_DangerousChemicals__c")).val(Is_DangerousChemicals);
-
-            if(VenderName != 'OSH'&&VenderName != ''){
-                window.opener.j$(escapeVfId('Page:mainForm:block:lists:'+lineno+':UnitPrice')).attr('disabled','disabled');
+                if (specialDealer == 'true') {
+                    window.opener.j$(escapeVfId("isHiddenAll")).val(is_hidden_all);
+                }
             }
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                + ":ProductGuranteePrice__c")).val(ProductGuranteePrice);
-            window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno
-                + ":productServicePrice__c")).val(ProductServicePrice);
-            // 澶氬勾淇濅慨 2019/07/25 end
+
         }
-
-        // //SFDC鍋滄棰勮 lt 20211008 start
-        function MarkRedFLG(lineno,Estimated_ConsumptionDueDate__c){
-            
-            //鑾峰彇褰撳墠鏃ユ湡(currentdate)
-            var date1 = new Date();
-            var seperator = "/";
-            var year = date1.getFullYear();
-            var month = date1.getMonth() + 1;
-            var day = date1.getDate();
-            if (month >= 1 && month <= 9) {
-                month = "0" + month;
-            }
-            if (day >= 0 && day <= 9) {
-                day = "0" + day;
-            }
-            var currentdate = year + seperator + month + seperator + day;
-
-            //棰勮娑堣�楀埌鏈熸棩  -  褰撳墠鏃�  鐩稿樊澶╂暟(difDate)
-            var ndate = new Date(currentdate);
-            var nowDate = ndate.getTime();
-            var edate = new Date(Estimated_ConsumptionDueDate__c);
-            var endDate = edate.getTime();
-            var difDate = (endDate - nowDate)/((1000 * 60 * 60 * 24));
-
-            //鍒ゆ柇
-            if(difDate < 90){
-                window.opener.document.getElementById('Page:mainForm:block:lists:' + lineno + ':Estimated_ConsumptionDueDate').style.color = "red";
-            }
-        }
-        //SFDC鍋滄棰勮 lt 20211008 end
 
     </script>
+    
     <style type="text/css">
         div#iframelike {
             color: #fff;
@@ -428,8 +139,13 @@
             <apex:messages styleClass="editListError"/>
         </apex:outputPanel>
         <apex:form id="mainForm">
+
+            <apex:actionFunction action="{!serContact}" name="serContact" reRender="mainForm,message1" oncomplete="unblockUI();"/>
+
+            <input type="hidden" id="openFlag" value="{!openFlag}"/>
+            <input type="hidden" value="{!is_hidden_all}" id="isHiddenAllsearch"/>
+            <input type="hidden" value="{!specialDealer}" id="specialDealer"/>
             <apex:pageBlock id="idSearchSetProduct" title="{!$Label.Product_Search}">
-                <apex:inputHidden id="Trade" value="{!Trade}"/>
                 <table width="900" border="0" style="background-color:#DCDCDC">
                     <colgroup>
                         <col width="12" />
@@ -437,115 +153,101 @@
                         <col width="20" />
                         <col width="200" />
                         <col width="20" />
-                        <col width="428" />
+                        <col width="100" />
+                        <col width="120" />
+                        <col width="208" />
                     </colgroup>
                     <tr>
-                        <td>&nbsp;</td>
+                        <td> </td>
                         <th>{!$Label.Search_Condition}</th>
-                        <td>&nbsp;</td>
+                        <td> </td>
                         <th>{!$Label.Asset_No}</th>
-                        <td>&nbsp;</td>
-                        <td>&nbsp;</td>
+                        <td> </td>
+                        <td> </td>
+                        <td> </td>
+                        <td> </td>
                     </tr>
                     <tr>
-                        <td>&nbsp;</td>
-                        <td>&nbsp;</td>
-                        <td>&nbsp;</td>
+                        <td> </td>
+                        <td> </td>
+                        <td> </td>
                         <td><apex:inputText id="searchName" value="{!SearchName}" style="width:200px" required="false"/></td>
-<!--                        <td><apex:commandButton value="{!$Label.Search}" action="{!serContact}" style="width:100px" rerender="all,message1" onclick="blockme();" oncomplete="unblockUI();"/></td>-->
-                        <!-- xudan Enter銈兗銈掑蹇溿仚銈嬨仧銈併�乺erender銆乷nclick銆乷ncomplete鍏ㄩ儴銇仐 -->
-                        <td><apex:commandButton value="{!$Label.Search}" action="{!serContact}" style="width:100px" /></td>
-                        <td>&nbsp;<apex:commandButton value="{!$Label.Add_Product}" style="width:100px;float:right;" disabled="{!Hascl}" rerender="dummy" onclick="setProductList();return false;"/></td>
+                        <td><apex:commandButton value="{!$Label.Search}" onclick="doSearch();return false;" style="width:100px" /></td>
+                        <!-- XHL-20190428-UpdateStart -->
+             <!--            <th style="text-align:right;width:90px;"><apex:outputLabel value="{!$ObjectType.QuoteLineItem.fields.Set__c.label}" rendered="{!oppflg}"/></th>
+                        <td><apex:selectList id="productSet" value="{!productSetVal}" rendered="{!oppflg}" size="1" style="width:100px;float:right;">
+                            <apex:selectOptions value="{!productSet}"/>
+                            </apex:selectList>
+                        </td> -->
+                        <!-- XHL-20190428-UpdateEnd -->
+                        <td> <apex:commandButton value="{!$Label.Add_Product}" rendered="{!oppflg}" style="width:100px;float:right;" disabled="{!Hascl}" rerender="dummy" onclick="setProductList();return false;"/></td>
                     </tr>
                     <tr>
-                        <td style="border-bottom: 1px solid #888;" colspan="15">&nbsp;</td>
+                        <td style="border-bottom: 1px solid #888;" colspan="15"> </td>
                     </tr>
                 </table>
                 <table width="900" border="0" style="background-color:#DCDCDC">
                     <tr>
-                        <td width="12">&nbsp;</td>
+                        <td width="12"> </td>
                         <th valign="top">{!$Label.Search_Result}</th>
-                        <td width="20">&nbsp;</td>
+                        <td width="20"> </td>
                         <td>
                             <table border="0">
                                 <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">
+                                    <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="7" columnsWidth="25px,125px,125px,90px,95px,130,210px">
+
                                         <apex:column style="width:15px;" >
+                                            <apex:outputText style="display: none;" id="hidId" value="{!c.pbeId}"/>
+                                            <apex:outputText style="display: none;" id="pId" value="{!c.pbe.Product__c}"/>
                                             <apex:facet name="header">{!$Label.Selected}</apex:facet>
                                             <input type="checkbox" name="checklist" value="" style="width:10px;"/>
                                         </apex:column>
-                                        <apex:column >
-                                            <apex:facet name="header">{!$Label.Asset_No}</apex:facet>
-                                            <apex:outputLink id="Asset_Model_No__c" value="{!c.pbe.Product2.Asset_Model_No__c}" onclick="setProductOne('{!lineno}','{!c.idx}');return false;">{!c.pbe.Product2.Asset_Model_No__c}</apex:outputLink>
-                                            <apex:inputHidden id="NameCode" value="{!c.NameCode}"/>
-                                            <apex:inputHidden id="Sales_Possibility" value="{!c.Sales_Possibility}"/>
-                                            <apex:inputHidden id="Bsscategory" value="{!c.Bsscategory}"/>
-                                            <apex:inputHidden id="Product_Id" value="{!c.Product_Id}"/>
-                                            <apex:inputHidden id="PricebookEntryId" value="{!c.PricebookEntryId}"/>
-                                            <apex:inputHidden id="Intra_Trade_Cost_RMB__c" value="{!c.Intra_Trade_Cost_RMB}"/>
-                                            <apex:inputHidden id="Foreign_Trade_Cost_US__c" value="{!c.Foreign_Trade_Cost_US}"/>
-                                            <apex:inputHidden id="StorageStatus__c" value="{!c.pbe.Product2.StorageStatus__c}"/>
-                                            <apex:inputHidden id="SFDA_Status" value="{!c.pbe.Product2.SFDA_Status__c}"/>
-                                            <!-- SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add start -->
-                                            <div hidden = "hidden">
-                                                <apex:outputField id="Estimated_ConsumptionDueDate" value="{!c.pbe.Product2.Estimated_ConsumptionDueDate__c}"/>
-                                            </div>
-                                            <!-- SFDC鍋滄棰勮锛堥璁℃秷鑰楀埌鏈熸棩锛� lt 20210929 add end -->
-                                            <!-- 澶氬勾淇濅慨 start -->
-                                            <apex:inputHidden id="GuranteeType" value="{!c.GuranteeType}" />
-                                            <apex:inputHidden id="Entend_gurantee_period_all__c" value="{!c.Entend_gurantee_period_all}"  />
-                                            <apex:inputHidden id="Intra_Trade_Gurantee_RMB__c" value="{!c.Intra_Trade_Gurantee_RMB}" />
-                                            <!-- 澶栬锤澶氬勾淇� start -->
-                                            <apex:inputHidden id="Intra_Trade_Gurantee_USD__c" value="{!c.Intra_Trade_Gurantee_USD}" />
-                                            <apex:inputHidden id="Intra_Trade_Service_USD__c" value="{!c.Intra_Trade_Service_USD}" />
-                                            <apex:inputHidden id="Maintenance_Price_Year_USD__c" value="{!c.Maintenance_Price_Year_USD}" />
-                                            <!-- 澶栬锤澶氬勾淇� end -->
 
-                                            <apex:inputHidden id="VenderName" value="{!c.VenderName}" />
-                                            <!-- 澧炲姞浜у搧涓嶅彲鍙栨秷澶氬勾淇濋�昏緫 绮剧悽鎶�鏈� wql 2020/09/02 start -->
-                                            <apex:inputHidden id="CanNotCancelledGurantee" value="{!c.CanNotCancelledGurantee}" />
-                                            <!-- 澧炲姞浜у搧涓嶅彲鍙栨秷澶氬勾淇濋�昏緫 绮剧悽鎶�鏈� wql 2020/09/02 end -->
-                                            <!-- 澧炲姞闃胯タ璧涘閫昏緫 绮剧悽鎶�鏈� wql 2020/12/29 start -->
-                                            <apex:inputHidden id="Is_DangerousChemicals" value="{!c.Is_DangerousChemicals}" />
-                                            <!-- 澧炲姞闃胯タ璧涘閫昏緫 绮剧悽鎶�鏈� wql 2020/12/29 end -->
-                                            <!-- HWAG-BLWB9F 璇环鎶ヤ环锛氬骞翠繚浜у搧鏈櫥褰曡鎻愰噾棰濇椂涓嶅彲鎶ヤ环 绮剧悽鎶�鏈� 2020/03/03 start -->
-                                            <apex:inputHidden id="Estimation_Entry_Possibility" value="{!c.Estimation_Entry_Possibility}" />
-                                            <apex:inputHidden id="CostFlag" value="{!c.CostFlag}" />
-                                            <!-- HWAG-BLWB9F 璇环鎶ヤ环锛氬骞翠繚浜у搧鏈櫥褰曡鎻愰噾棰濇椂涓嶅彲鎶ヤ环 绮剧悽鎶�鏈� 2020/03/03 end -->
-                                            <apex:inputHidden id="Intra_Trade_Service_RMB__c" value="{!c.Intra_Trade_Service_RMB}"  />
-                                            <apex:inputHidden id="Maintenance_Price_Year__c" value="{!c.Maintenance_Price_Year}"  />
-                                            <!--  澶氬勾淇濅慨 end -->
-                                        </apex:column>
                                         <apex:column >
-                                            <apex:facet name="header">{!$ObjectType.Product2.fields.OT_CODE_no_link__c.Label}</apex:facet>
-                                            <apex:outputField id="OT_CODE_no_link__c" value="{!c.pbe.Product2.OT_CODE_no_link__c}" />
-                                        </apex:column>
+                                            <apex:facet name="header">{!$ObjectType.Product_Search__c.fields.name.label}</apex:facet>
+                                            <apex:outputText style="display: none;" id="Name" value="{!c.pbe.Name}" />
+                                            <apex:outputLink id="NameLink" value="#" onclick="setProductOne('{!lineno}','{!c.idx}');return false;">{!c.pbe.Name}</apex:outputLink>
+                                        </apex:column> 
+
                                         <apex:column >
-                                            <apex:facet name="header">{!$Label.Product_Name}</apex:facet>
-                                            <apex:outputField id="Name" value="{!c.pbe.Product2.Name}" />
+                                            <apex:facet name="header">{!$ObjectType.Product_Search__c.fields.ProductCode__c.Label}</apex:facet>
+                                            <apex:outputField id="ProductCode" value="{!c.pbe.ProductCode__c}" />
                                         </apex:column>
+
                                         <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}" />
+                                            <apex:facet name="header">{!$ObjectType.Product_Search__c.fields.Product_ECCode__c.Label}</apex:facet>
+                                            <apex:outputField id="ProductECCode" value="{!c.pbe.Product_ECCode__c}" />
                                         </apex:column>
+
                                         <apex:column >
-                                            <apex:facet name="header">{!$Label.SFDA_Status}</apex:facet>
-                                            <apex:outputField id="SFDA_Status__c" value="{!c.pbe.Product2.SFDA_Status__c}" />
+                                            <apex:facet name="header">{!$ObjectType.Product_Search__c.fields.ProductModels1__c.Label}</apex:facet>
+                                            <apex:outputField id="ProductModels" value="{!c.pbe.ProductModels1__c}" />
+                                            <apex:outputText id="ProductModel" value="{!c.pbe.ProductModels1__c}" style="display: none;"/>
                                         </apex:column>
-                                        <apex:column style="text-align:right;">
-                                            <apex:facet name="header">{!$Label.ListPrice_In}</apex:facet>
-                                            <apex:outputField id="Intra_Trade_List_RMB__c" value="{!c.pbe.Product2.Intra_Trade_List_RMB__c}" />
-                                        </apex:column>
-                                        <apex:column style="text-align:right;">
-                                            <apex:facet name="header">{!$Label.ListPrice_Out}</apex:facet>
-                                            <apex:outputField id="Foreign_Trade_List_US__c" value="{!c.pbe.Product2.Foreign_Trade_List_US__c}" />
-                                        </apex:column>
-                                        <apex:column style="text-align:right;">
-                                            <apex:facet name="header">{!$Label.Specifications}</apex:facet>
-                                            <apex:outputField id="Specifications" value="{!c.pbe.Product2.Packing_list_manual__c}" />
-                                        </apex:column>
+
+                                        <apex:column >
+                                            <apex:facet name="header">{!$ObjectType.PricebookEntry.fields.SalesPrice__c.label}</apex:facet>
+                                            <apex:outputText id="SalespriceR" value="{!c.salespriceR}" />
+                                            <apex:outputText id="Salesprice" value="{!c.salesprice}" style="display: none;"/>
+                                            <apex:outputText id="SalespriceA" value="{!c.salespriceA}" style="display: none;"/>
+                                            <apex:outputText id="SalespriceB" value="{!c.salespriceB}" style="display: none;"/>
+                                            <apex:outputText id="SalespriceC" value="{!c.salespriceC}" style="display: none;"/>
+                                            <apex:outputText id="Hiddenflg" value="{!c.hiddenflg}" style="display: none;"/>
+                                        </apex:column> 
+
+<!--                                         <apex:column >
+                                         <apex:facet name="header">{!$ObjectType.PricebookEntry.fields.Pricebook2Id.label}</apex:facet>
+                                            <apex:outputText id="Pricebook" value="{!c.pbId}" /> 
+                                        </apex:column> -->
+
+                                         <apex:column >
+                                            <apex:facet name="header">{!$ObjectType.Product_Search__c.fields.ProductDescription__c.label}</apex:facet>
+                                            <apex:outputField id="ProductDescription" value="{!c.pbe.ProductDescription__c}" />
+                                        </apex:column> 
+
+                                         
                                     </apex:pageBlockTable>
                                     </div>
                                     </td>
@@ -561,7 +263,7 @@
         // 銉曘偐銉笺偒銈广偦銉冦儓
         j$(escapeVfId('Page:mainForm:idSearchSetProduct:searchName'))[0].focus();
         j$(escapeVfId('Page:mainForm:idSearchSetProduct:searchName')).val(j$(escapeVfId('Page:mainForm:idSearchSetProduct:searchName')).val());
-        var trade = window.opener.j$(escapeVfId("Page:mainForm:block:CurrencyIsoCode")).val();
-        j$(escapeVfId("Page:mainForm:idSearchSetProduct:Trade")).val(trade);
+
     </script>
+  
 </apex:page>
\ No newline at end of file

--
Gitblit v1.9.1