From 8475b9f98c8a4c95446f02be4bf2a64e359c359a Mon Sep 17 00:00:00 2001
From: liwentao <1376563863@qq.com>
Date: 星期五, 11 八月 2023 09:10:31 +0800
Subject: [PATCH] 与测试环境对比，部分代码已被人修改，删除其中的alert和部分硬编码，还原测试环境代码逻辑
---
force-app/main/default/pages/SearchProductIrai.page | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/force-app/main/default/pages/SearchProductIrai.page b/force-app/main/default/pages/SearchProductIrai.page
index 856b17e..2fc5e22 100644
--- a/force-app/main/default/pages/SearchProductIrai.page
+++ b/force-app/main/default/pages/SearchProductIrai.page
@@ -1,5 +1,6 @@
<apex:page id="Page" standardController="Product2" extensions="SearchProductController" sidebar="false" showHeader="false" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<script>
@@ -53,22 +54,22 @@
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();
+ //CHAN-BHNBX6 2019/11/20 START
+ var GuaranteePeriod = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":GuaranteePeriod")).value();
//nodiscount 灏忚
- var Intra_Trade_Service_RMB =j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_RMB")).value();
+ var Intra_Trade_Service_RMB =j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_RMB")).value();
//CHAN-BHNBX6 2019/11/20 END
//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);
//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);
@@ -85,9 +86,9 @@
//ListPrice
var ListPrice = 0;
var Cost_c = 0;
- //CHAN-BHNBX6 2019/11/20 START
+ //CHAN-BHNBX6 2019/11/20 START
var NoDiscount = 0;
-
+
if(trade == "CNY") {
ListPrice = Intra_Trade_List_RMB__c;
Cost_c = Intra_Trade_Cost_RMB__c;
@@ -106,10 +107,10 @@
//CHAN-BHNBX6 NoDiscount 2019/11/20 START
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscount")).val(NoDiscount);
//CHAN-BHNBX6 NoDiscount 2019/11/20 END
- //鏁伴噺
+ //鏁伴噺
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Quantity")).val(1);
-
- //CHAN-BHNBX6 淇濅慨骞撮檺 2019/11/20 START
+
+ //CHAN-BHNBX6 淇濅慨骞撮檺 2019/11/20 START
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":itemGuaranteePeriod")).text(GuaranteePeriod);
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":itemGuaranteePeriod")).val(GuaranteePeriod);
//CHAN-BHNBX6 淇濅慨骞撮檺 2019/11/20 END
@@ -118,20 +119,20 @@
//鍗樹綅
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Qty")).text();
-
+
//灏忚▓ 涓荤敾闈D鍙樻洿锛岄�昏緫涓嶅彉璁惧�糏D鍙樻洿
// 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);
//灏忚▓lw
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ListPriceTotalText")).text(top.window.opener.toNumComma(ListPrice));
-
+
//ListPriceTotal hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ListPriceTotal")).val(ListPrice);
- //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 START
+ //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 START
//DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
// var cancelMultiyearInsurance = top.window.opener.j$(escapeVfId("Page:mainForm:block:cancelMultiyearInsurance")).val();
// var NoDiscount1;
@@ -144,50 +145,50 @@
//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
+ //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 END
// window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscountTotal")).val(Intra_Trade_Service_RMB);
//NameCode hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NameCode")).val(NameCode);
-
+
//Product_Name hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Name")).val(name);
-
+
//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));
}
</script>
<style type="text/css">
div#iframelike {
-
+
height: 300px;
overflow-y: auto;
overflow-x: hidden;
@@ -198,9 +199,9 @@
<apex:messages styleClass="editListError"/>
</apex:outputPanel>
<apex:form id="mainForm">
- <apex:pageBlock id="idSearchSetProduct" title="{!$Label.Product_Search}">
+ <apex:pageBlock id="idSearchSetProduct" title="{!$Label.Product_Search}" >
<apex:inputHidden id="Trade" value="{!Trade}"/>
- <table width="900" border="0" style="background-color:#DCDCDC">
+ <table width="1000" border="0" style="background-color:#DCDCDC;">
<colgroup>
<col width="12" />
<col width="50" /> <!-- lighting鍗囩骇 20230210 lt 鍚嶇О涓茶闂 20==50 -->
@@ -231,7 +232,7 @@
<td style="border-bottom: 1px solid #888;" colspan="15"> </td>
</tr>
</table>
- <table width="900" border="0" style="background-color:#DCDCDC">
+ <table width="1000" border="0" style="background-color:#DCDCDC">
<tr>
<td width="12"> </td>
<th valign="top">{!$Label.Search_Result}</th>
@@ -240,14 +241,14 @@
<table border="0">
<tr>
<td>
- <div id="iframelike" style="width:800px">
+ <div id="iframelike" style="width:900px">
<!-- 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">
+ <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="10" columnsWidth="40px,120px,120px,280px,80px,80px,80px,80px,80px,40px">
<!-- 20221020 ljh SWAG-CJ98AJ end -->
- <apex:column style="width:15px;" >
+ <apex:column >
<apex:facet name="header">{!$Label.Selected}</apex:facet>
- <input type="checkbox" name="checklist" value="" style="width:10px;"/>
+ <input type="checkbox" name="checklist" value="" style="width:15px;"/>
</apex:column>
<apex:column >
<apex:facet name="header">{!$Label.Asset_No}</apex:facet>
@@ -319,4 +320,4 @@
var trade = window.opener.j$(escapeVfId("Page:mainForm:block:CurrencyIsoCode")).val();
j$(escapeVfId("Page:mainForm:idSearchSetProduct:Trade")).val(trade);
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1