From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/pages/DealerInquiryModifyState.page | 524 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 524 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/pages/DealerInquiryModifyState.page b/force-app/main/default/pages/DealerInquiryModifyState.page
index 4fc33f6..5fe5a08 100644
--- a/force-app/main/default/pages/DealerInquiryModifyState.page
+++ b/force-app/main/default/pages/DealerInquiryModifyState.page
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<apex:page
controller="DealerInquiryModifyStateController"
docType="html-5.0"
@@ -333,6 +334,174 @@
width: 178px;
} /*娲诲姩璁″垝(閿�鍞�)*/
/*table.list .col_Link1 {width:58px;}
+=======
+<apex:page controller="DealerInquiryModifyStateController" docType="html-5.0" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStyleSheets="true">
+<head>
+<title>缁忛攢鍟嗘壒閲忎慨鏀硅浠风姸鎬�</title>
+
+<apex:stylesheet value="{!URLFOR($Resource.blockUIcssOpp)}"/>
+<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<!-- TODO 鐩墠闄や簡markOpp()鏂规硶锛屽叾浠栨柟娉曢�氱敤锛宩s鏀瑰悕涓哄懆浼氬叡閫歫s锛屽悇涓敾闈釜鍒玧s鍐嶈嚜宸卞垱寤簀s -->
+<apex:includeScript value="{!URLFOR($Resource.Dealer_enquiryJs1)}"/>
+
+<style>
+ td .dateFormat {
+ display: none;
+ }
+
+ div.inline { float:left; }
+
+ .clearBoth { clear:both; }
+
+ div.reportBlock table.list {
+ width:auto;
+ }
+
+ div#out_Div { /* 銇撱亾銇儤銉冦儉銈掓牸绱� */
+ position:relative;
+ overflow: hidden;
+ float:left;
+ width:50% !important;
+ }
+
+ div#out_Div_L {
+ position:relative;
+ overflow:hidden;
+ float:left;
+ width:50% !important;
+ border-right:2px solid #808383
+ }
+
+ div#in_Div {/* tbody銇屽叆銇ｃ仸銇勩倠銆傘亾銇撱亴銈广偗銉兗銉璞�*/
+ position:relative;
+ overflow: auto; /*銈广偗銉兗銉儛銉�*/
+ float:left;
+ width:50% !important;
+ height: 600px;
+ }
+
+ div#in_Div_L {
+ position:relative;
+ overflow-x:auto;
+ overflow-y: hidden;
+ float:left;
+ width:50% !important;
+ height: 600px;
+ border-right:2px solid #808383
+ }
+
+ body .pbBody table.list tr.headerRow td {
+ box-sizing: border-box;
+ text-align:center;font-weight:normal;
+ padding:0px 0px 0px 1px;
+ }
+
+ body .pbBody table.list tr.headerRow td.header1 {
+ text-align:center;font-weight:normal;
+ padding:0px 0px 0px 0px;
+ }
+
+ body .pbBody table.list tr.dataRow td {
+ box-sizing: border-box;
+ padding:0px 0px 0px 1px; border-width: 0px 0px 1px 0px; vertical-align: middle; word-break:break-all;
+ }
+
+ body .pbBody table.list tr.dataRow td.dataCellBorder {
+ /* 銇勩倝銇亜銆佷娇銇ｃ仸銇勩仾銇� */
+ padding:0px 0px 0px 1px; border-width: 0px 0px 1px 0px; vertical-align: middle; word-break:break-all;
+ }
+
+ body .pbBody table.list tr.dataRow td.dataCellBorder1 {
+ padding:0px 0px 0px 1px;
+ border-width: 0px 0px 1px 1px; vertical-align: middle; word-break:break-all;
+ }
+
+ @-moz-document url-prefix() {
+ body .pbBody table.list tr.dataRow td.dataCellBorder1 {padding:0px 0px 0px 0px; border-width: 0px 0px 1px 1px; vertical-align: middle; word-break:break-all;}
+ }
+
+ table.list td {width:100px; }
+
+ table.list td select {width:95%;}
+
+ table.list td input {width:95%;}
+
+ table.list td textarea {
+ height:50px;
+ width:90%;
+ }
+
+ table.list .col_OCSM_Opportunity_No__c {width:120px;}
+ table.list .col_Strategic_department_Class_Name__c{width:80px;}
+ table.list .col_Change_To_Opportunity_T__c {width:155px;}
+ table.list .col_Department_Cateogy__c {width: 90px;}
+ table.list .col_Department_Name_Text__c {width: 80px;}
+ table.list .col_Hospital_City_Master__c {width: 70px;}
+ table.list .col_Agency_Hospital__c {width: 146px;}
+ /*table.list .col_Oly_Forecasted_Date__c {width: 125px;}*/
+ table.list .col_Oly_Forecast_this_month__c {width: 135px;}
+ table.list .col_Oly_NM_Forecast__c {width: 135px;}
+ table.list .col_Oly_Forecast_last_month__c {width: 135px;}
+ table.list .col_Oly_Inquiry_Stage__c {width: 95px;}
+ table.list .col_Oly_Authorized_DB_No__c {width: 95px;}
+ table.list .col_Oly_Inquiry_Status2__c {width: 95px;}
+ table.list .col_Oly_Inquiry_Status1__c {width: 50px;}
+ table.list .col_Name {width:139px;} /*瀹㈡埛鍚�*/
+ table.list .col_Salesdepartment_HP__c {width:95px;} /*閿�鍞湰閮�(鍖婚櫌)*/
+ table.list .col_State_Master__c{width:80px;} /*鐪�*/
+ table.list .col_HP_146POCM_Category_From_Dept__c {width:100px;} /*OCM鍒嗙被(鍏紡)*/
+ table.list .col_Salesdepartment_DeptClass__c{width:120px;} /*閿�鍞湰閮�(绉戝鍒嗙被)*/
+ table.list .col_OCM_man_province_HP__c{width:90px;} /*OCM绠＄悊鐪�*/
+ table.list .col_City_Master__c{width:80px;} /*甯�*/
+ table.list .col_Grade__c {width:70px;} /*鏀垮簻绛夌骇*/
+ table.list .col_Attribute_Type__c{width:90px;} /*鍖婚櫌鎵�灞炴�ц川*/
+ table.list .col_Speciality_Type__c{width:90px;} /*鍖婚櫌涓撲笟鍖哄垎*/
+ table.list .col_Service_customer__c{width:120px;} /*鍙绾︽湇鍔″悎鍚屽鎴�*/
+ table.list .col_BF_owner__c{width:100px;} /*鍛煎惛绉戜富鎷呭綋*/
+ table.list .col_ENT_owner_ID__c{width:100px;} /*鑰抽蓟鍠夌涓绘媴褰�*/
+ table.list .col_GI_Main__c{width:100px;} /*娑堝寲绉戜富鎷呭綋*/
+ table.list .col_URO_owner_ID__c{width:100px;} /*娉屽翱绉戜富鎷呭綋*/
+ table.list .col_SP_Main__c{width:100px;} /*鏅绉戜富鎷呭綋*/
+ table.list .col_GYN_owner__c{width:100px;} /*濡囩涓绘媴褰�*/
+ table.list .col_Hospital_name_link__c{width:100px;} /*鍖婚櫌鍚�(閾炬帴)*/
+ table.list .col_Segment__c{width:90px;} /*OCM绉戝绛夌骇*/
+ table.list .col_Department_Budget_Sum_Price__c {width:128px;} /*绉戝棰勭畻鎬婚噾棰�(鍏�)*/
+ table.list .col_Target_amount_CV290__c {width:118px;} /*鐩爣鏁帮細CV-290*/
+ table.list .col_OPD_CV290__c {width:118px;} /*OPD瀵硅薄锛欳V-290*/
+ table.list .col_Target_amount_EUME2__c {width:118px;} /*鐩爣鏁帮細EU-ME2*/
+ table.list .col_OPD_EUME2__c {width:118px;} /*OPD瀵硅薄锛欵U-ME2*/
+ table.list .col_Target_amount_CV170__c {width:118px;} /*鐩爣鏁帮細CV-170*/
+ table.list .col_OPD_CV170__c {width:118px;} /*OPD瀵硅薄锛欳V-170*/
+ table.list .col_Target_amount_OERAW__c {width:118px;} /*鐩爣鏁帮細OER-AW*/
+ table.list .col_OPD_OERAW__c {width:118px;} /*OPD瀵硅薄锛歄ER-AW*/
+ table.list .col_Target_amount_GW__c {width:118px;} /*鐩爣鏁帮細瀵间笣(GW)*/
+ table.list .col_OPD_GW__c {width:118px;} /*OPD瀵硅薄锛氬涓�(GW)*/
+ table.list .col_Target_amount_OTVS400__c {width:118px;} /*鐩爣鏁帮細OTV-S400*/
+ table.list .col_OPD_OTVS400__c {width:118px;} /*OPD瀵硅薄锛歄TV-S400*/
+ table.list .col_Target_amount_CHS400XZ__c {width:118px;} /*鐩爣鏁帮細CH-S400-XZ*/
+ table.list .col_OPD_CHS400XZ__c {width:118px;} /*OPD瀵硅薄锛欳H-S400-XZ*/
+ table.list .col_Target_amount_3D__c {width:118px;} /*鐩爣鏁帮細3D*/
+ table.list .col_OPD_3D__c {width:118px;} /*OPD瀵硅薄锛�3D*/
+ table.list .col_Target_amount_OTVS190__c {width:118px;} /*鐩爣鏁帮細OTV-S190*/
+ table.list .col_OPD_OTVS190__c {width:118px;} /*OPD瀵硅薄锛歄TV-S190*/
+ table.list .col_Target_amount_CV190__c {width:118px;} /*鐩爣鏁帮細CV-190*/
+ table.list .col_OPD_CV190__c {width:118px;} /*OPD瀵硅薄锛欳V-190*/
+ table.list .col_Target_amount_UCES3__c {width:118px;} /*鐩爣鏁帮細UCES-3*/
+ table.list .col_OPD_UCES3__c {width:118px;} /*OPD瀵硅薄锛歎CES-3*/
+ table.list .col_Target_amount_USG400__c {width:118px;} /*鐩爣鏁帮細USG-400*/
+ table.list .col_OPD_USG400__c {width:118px;} /*OPD瀵硅薄锛歎SG-400*/
+ table.list .col_Hospital_Name__c {width:139px;} /*鍖婚櫌鍚�*/
+ table.list .col_Department_Name__c {width:60px;} /*绉戝鍚嶇О*/
+ table.list .col_Province_formula__c {width:78px;} /*鐪�(鍏紡)*/
+ table.list .col_X2_Largescale_Project__c {width:78px;} /****鏈夋棤涓ゅ勾浠ュ唴澶ч」鐩噰璐�*/
+ table.list .col_Ideal_Image_Sales__c {width:148px;} /****鎷撳睍銉诲紑鎷撹鍒�/钀ラ攢鏂规(閿�鍞�)*/
+ table.list .col_Review_Sales__c {width:148px;} /****杩涘睍鎯呭喌(閿�鍞�)*/
+ table.list .col_Submit_proposal_document__c {width:58px;} /*鏄惁鎻愪氦鎻愭涔�*/
+ table.list .col_OPP_Flag__c {width:58px;}
+ table.list .col_Sales_activity_plan__c {width:178px;} /*娲诲姩璁″垝(閿�鍞�)*/
+ /*table.list .col_Link1 {width:58px;}
+>>>>>>> LEXCommunityLiJun
table.list .col_Link2 {width:58px;}
table.list .col_Link3 {width:58px;}
table.list .col_Link4 {width:58px;}
@@ -340,6 +509,7 @@
table.list .col_Link6 {width:58px;}
table.list .col_Link7 {width:58px;}
table.list .col_Link8 {width:58px;}*/
+<<<<<<< HEAD
body .pbBody table.list tr.headerRow td.colViewing {
/* 銉囥儠銈┿儷銉堝�ゃ�佹渶灏忓寲銈€偆銈炽兂銈掕〃绀� */
background-image: url('{!URLFOR($Resource.IconResizeMinus_5)}');
@@ -391,12 +561,58 @@
role="status"
class="slds-spinner slds-spinner_medium slds-spinner_brand"
>
+=======
+ body .pbBody table.list tr.headerRow td.colViewing {
+ /* 銉囥儠銈┿儷銉堝�ゃ�佹渶灏忓寲銈€偆銈炽兂銈掕〃绀� */
+ background-image:url('{!URLFOR($Resource.IconResizeMinus_5)}') ;
+ background-repeat:no-repeat;
+ }
+ body .pbBody table.list tr.headerRow td.colUnHideIcon {
+ /* 鏈�澶у寲銈€偆銈炽兂銈掕〃绀� */
+ background-image:url('{!URLFOR($Resource.IconResizePlus_5)}');
+ background-repeat:no-repeat;
+ }
+ body .pbBody table.list tr.headerRow td.col_Scroll {width:0px; padding:0px; border-width:0px;}
+ body .pbBody table.list tr.dataRow td.col_Scroll {width:0px; padding:0px; border-width:0px;}
+ /*.zxk{
+ margin-bottom: 3px;
+ }*/
+ .buttonStyle{
+ font-size: 14px !important;
+ font-family: 'sans-serif' !important;
+ font-weight:500 !important;
+ width: 70px !important;
+ height: 32px !important;
+ border-radius: 4px !important;
+ opacity: 1 !important;
+ background:#090F84 !important;
+ color:#FFFFFF !important;
+
+ }
+
+
+</style>
+<script type="text/javascript">
+var heightAjustment = 120;
+var widthAjustment = 30;
+function setChangeFlgRight(cnt) {
+ document.getElementById('allPage:allForm:oppBlock:oppTable:' + cnt + ':changeFlgRt').value = 1;
+
+}
+
+</script>
+</head>
+ <apex:slds />
+ <div id="spinner" class="slds-spinner_container" style="display:none;">
+ <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+>>>>>>> LEXCommunityLiJun
<span class="slds-assistive-text">Loading</span>
<div class="slds-spinner__dot-a"></div>
<div class="slds-spinner__dot-b"></div>
</div>
</div>
<apex:form id="allForm">
+<<<<<<< HEAD
<apex:actionFunction
name="saveAndSearch"
action="{!save}"
@@ -667,10 +883,135 @@
/>
</apex:repeat>
</tr>
+=======
+ <apex:actionFunction name="saveAndSearch" action="{!save}" rerender="allPanel" oncomplete="closeSpinner();expandAll();">
+ <apex:param name="firstParam" assignTo="{!saveType}" value="" />
+ </apex:actionFunction>
+ <apex:actionFunction name="saveAndSort" action="{!save}" rerender="allPanel" oncomplete="closeSpinner();expandAll();">
+ <apex:param name="firstParam" assignTo="{!saveType}" value="" />
+ <apex:param name="secondParam" assignTo="{!sortKey}" value="" />
+ </apex:actionFunction>
+ <apex:actionFunction name="searchOpp" action="{!chick}" rerender="allPanel" oncomplete="closeSpinner();expandAll();"/>
+ <apex:actionFunction name="sortTable" action="{!sortTable}" rerender="allPanel" oncomplete="closeSpinner();expandAll();">
+ <apex:param name="firstParam" assignTo="{!sortKey}" value="" />
+ </apex:actionFunction>
+ <apex:outputPanel id="allPanel">
+ <div id="zxk" style="margin-bottom: -15px;">
+ <apex:pageBlock id="searchBlock" mode="maindetail">
+ <table style="border-bottom-width: 0px; font-size:14px;color:#696969;">
+ <tr>
+ <td width="283px">
+ <div style="color:#696969;">
+ 缁忛攢鍟嗗尰闄�
+ <apex:inputText styleClass="slds-input" value="{!accSearch}" style="width:170px"/>
+ </div>
+ </td>
+ <td width="250px">
+ <div style="color:#696969;">
+ 閿�鍞媴褰�
+ <apex:inputText styleClass="slds-input" value="{!aooSearch}" style="width:150px"/>
+ </div>
+ </td>
+ <td width="230px">
+ <div style="color:#696969;">
+ 鏄剧ず
+ <apex:selectList styleClass="slds-input slds-combobox__input" style="width:100px;" value="{!limits}" size="1" onchange="searchOppJs_Account();return false;">
+ <apex:selectOptions value="{!limitOpts}"/>
+ </apex:selectList>
+ 鏉℃暟鎹�
+ </div>
+ </td>
+ <td><a href="#" onclick="expandAll();return false;" style="text-decoration: underline;color:#696969;">鍏ㄩ儴灞曞紑</a></td>
+ </tr>
+ </table>
+ <p style="height:10px;"></p>
+ <table style="border-bottom-width: 0px; font-size:12px;font-size:14px;color:#696969;">
+ <tr>
+ <td width="220px">
+ <div style="color:#696969;">
+ <font>鏁� 鎹� 瀛� 娈�</font>
+ <apex:selectList styleClass="slds-input slds-combobox__input" value="{!numtext1}" size="1" style="width:110px">
+ <apex:selectOptions value="{!textOpts}"/>
+ </apex:selectList>
+ </div>
+ </td>
+ <td width="130px">
+ <apex:selectList styleClass="slds-input slds-combobox__input" value="{!numtext2}" size="1" style="width:110px">
+ <apex:selectOptions value="{!equalOpts}"/>
+ </apex:selectList>
+ </td>
+ <td width="183px">
+ <apex:inputText styleClass="slds-input" style="width:150px" value="{!numtext}"/>
+ </td>
+ <td width="188px">
+ <!-- slds-button slds-button_brand -->
+ <apex:commandButton styleClass="buttonStyle" value="妫�绱�" onclick="searchOppJs_Account();return false;" style="height:30px;width:70px;"/>
+ <apex:commandButton styleClass="buttonStyle" action="{!save}" value="淇濆瓨" rerender="allPanel" onclick="showSpinner();" oncomplete="closeSpinner();expandAll();" style="height:30px;width:70px;"/>
+ </td>
+ <td>
+ <!-- <apex:pageMessages /> -->
+ <!-- add by Link 2023-6-2 -->
+ <apex:outputPanel rendered="{! remindMsg != '' && remindMsg != null}">
+ <div style="border: 1px solid #D4D4D4;height:32px;border-radius:5px;color:#ff6a00;font-size:18px;">
+ <span class="slds-icon_container slds-icon-custom-custom53 slds-icon-text-default" >
+ <svg aria-hidden="true" class="slds-icon">
+ <use xmlns:xlink="http://www.w3.org/1999/xlink"
+ xlink:href="/apexpages/slds/latest/assets/icons/custom-sprite/svg/symbols.svg#custom53">
+ </use>
+ </svg>
+ <span class="slds-assistive-text">Custom 53</span>
+ </span>
+ <strong style="padding-top: 2px;"> {!remindMsg}</strong>
+ </div>
+ </apex:outputPanel>
+ </td>
+ </tr>
+ </table>
+ </apex:pageBlock>
+ </div>
+ <!-- <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;"> -->
+ <apex:pageBlock id="oppBlock" mode="maindetail">
+ <!-- <apex:pageblocksection columns="1" id="oppSection"> -->
+ <apex:outputPanel >
+ <apex:inputHidden id="oppCount" value="{!oppCount}"/>
+
+ <div id="out_Div_L">
+ <table class="list" style="border-bottom-width: 0px; width:1100px; font-size:14px !important; border-spacing:0;" border="" id="tableHeader">
+ <tr class="dataRow" height="1px">
+ <apex:variable value="{!0}" var="cnt" />
+ <apex:repeat value="{!titleRight}" var="t">
+ <td class="col_{!columnRightCss[cnt]}"></td>
+ <apex:variable value="{!cnt + 1}" var="cnt" />
+ </apex:repeat>
+ <td id="cell_Scroll" class="col_Scroll"></td>
+ </tr>
+ <tr class="headerRow" height="30px">
+ <apex:variable value="{!0}" var="cnt" />
+ <apex:repeat value="{!titleRight}" var="t">
+ <td class="col_{!columnRightCss[cnt]}">
+ <a href="#" onclick="sortTableJs_Account1('{!cnt + titleLeft.size}');return false;" style="text-decoration: underline;color:black;font-size:14px !important;font-weight: bold;"><apex:outputText value="{!t}"/></a>{!sortOrder[cnt + titleLeft.size]}
+ </td>
+ <apex:variable value="{!cnt + 1}" var="cnt" />
+ </apex:repeat>
+ <!-- <td id="cell_Scroll" class="col_Scroll"></td> -->
+ </tr>
+ </table>
+ </div>
+ <div id="out_Div">
+ <table class="list" style="border-bottom-width: 0px; width:2000px; font-size:14px !important; border-spacing:0;" border="" id="tableHeader_L">
+ <tr class="dataRow" height="1px">
+ <apex:variable value="{!0}" var="cnt" />
+ <apex:repeat value="{!titleLeft}" var="t">
+ <td class="col_{!columnLeftCss[cnt]}"></td>
+ <apex:variable value="{!cnt + 1}" var="cnt" />
+ </apex:repeat>
+ </tr>
+>>>>>>> LEXCommunityLiJun
<tr class="headerRow" height="30px">
<apex:variable value="{!0}" var="cnt" />
<apex:repeat value="{!titleLeft}" var="t">
<td class="col_{!columnLeftCss[cnt]}">
+<<<<<<< HEAD
<a
href="#"
onclick="sortTableJs_Account1('{!cnt}');return false;"
@@ -687,10 +1028,16 @@
value="{!cnt + 1}"
var="cnt"
/>
+=======
+ <a href="#" onclick="sortTableJs_Account1('{!cnt}');return false;" style="text-decoration: underline;color:black;font-size:14px !important;font-weight: bold;"><apex:outputText value="{!t}"/></a>{!sortOrder[cnt]}
+ </td>
+ <apex:variable value="{!cnt + 1}" var="cnt" />
+>>>>>>> LEXCommunityLiJun
</apex:repeat>
<!-- <td id="cell_Scroll" class="col_Scroll"></td> -->
</tr>
</table>
+<<<<<<< HEAD
</div>
<!-- out_Div -->
<div style="clear: both; height: 0px"></div>
@@ -728,11 +1075,26 @@
<td
class="dataCellBorder1 col_{!columnRightCss[cnt_3]} {!cnt}_col_{!columnRightCss[cnt_3]}"
>
+=======
+
+ </div> <!-- out_Div -->
+ <div style="clear:both;height:0px;"></div>
+ <div id="in_Div_L">
+ <table class="list" style="border-bottom-width: 0px;width:1100px; font-size:13px; border-spacing:0;" border="" id="tableData">
+ <apex:variable value="{!1}" var="cnt" />
+ <apex:repeat value="{!oppRecords}" var="or" id="oppTable">
+ <tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" style="height:35px;" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
+ <apex:variable value="{!0}" var="cnt_3" />
+ <apex:repeat value="{!columnsRightApi}" var="c">
+ <td class="dataCellBorder1 col_{!columnRightCss[cnt_3]} {!cnt}_col_{!columnRightCss[cnt_3]}">
+
+>>>>>>> LEXCommunityLiJun
<!-- vivek start -->
<!-- <apex:outputLink rendered="{!c[0]=='Name'}" value="/{!or.opp.Id}" target="LINK_{!or.opp.Id}"><apex:outputField rendered="{!c[0]=='Name'}" value="{!or.opp[c[0]]}" /></apex:outputLink> -->
<!-- vivek end -->
<!-- <apex:outputField id="q1111111111" rendered="{!(c.size==1 && columnRightRW[c[0]]=='r' && or.opp.Id <> null && c[0] <> 'Name' && (c[0] <> 'Opp_Changed_Field__c' ||(c[0] == 'Opp_Changed_Field__c' &&
or.opp.Opp_Changed_Field__c != '璇环闃舵鍙戠敓浜嗗彉鍖�' &&or.opp.Opp_Changed_Field__c != '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' &&or.opp.Opp_Changed_Field__c != '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' && or.opp.Opp_Changed_Field__c != '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�')))}" value="{!or.opp[c[0]]}" /> && or.opp.Oly_Inquiry_Status1__c <> null AgcOpp -->
+<<<<<<< HEAD
<apex:outputField
rendered="{!c[0] == 'Change_To_Opportunity_T__c' }"
value="{!or.opp[c[0]]}"
@@ -752,12 +1114,28 @@
</div> -->
<!-- <apex:inputField rendered="{!(c.size==1 && columnRightRW[c[0]]=='w' && or.opp.Id <> null && c[0] <> 'Name')}" value="{!or.opp[c[0]]}" onchange="setChangeFlgRight('{!or.lineNo}')"/>
+=======
+ <apex:outputField rendered="{!c[0] == 'Change_To_Opportunity_T__c' }" value="{!or.opp[c[0]]}" />
+
+ <apex:outputField rendered="{!columnRightRW[c[0]]=='r' && c[0] <> 'Change_To_Opportunity_T__c' && c[0] <> 'Strategic_department_Class_Name__c' }" value="{!or.opp[c[0]]}" />
+ <!-- <apex:outputField id="q1111111111" rendered="{!( columnRightRW[c[0]]=='r' && c[0] <> 'Name' && (c[0] <> 'StageName__c' ||(c[0] == 'StageName__c' &&
+ or.opp.Oly_Inquiry_Stage__c != '璇环闃舵鍙戠敓浜嗗彉鍖�' &&or.opp.Oly_Inquiry_Stage__c != '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' &&or.opp.Oly_Inquiry_Stage__c != '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' && or.opp.Oly_Inquiry_Stage__c != '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�')))}" value="{!or.opp[c[0]]}" /> -->
+ <!-- <div style ="color:red"> -->
+ <!-- <apex:outputField id="q2222222" rendered="{!(c.size==1 && columnRightRW[c[0]]=='r' && or.opp.Id <> null && c[0] <> 'Name' && c[0] == 'Opp_Changed_Field__c' && (
+ or.opp.Opp_Changed_Field__c == '璇环闃舵鍙戠敓浜嗗彉鍖�' || or.opp.Opp_Changed_Field__c == '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' || or.opp.Opp_Changed_Field__c == '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' || or.opp.Opp_Changed_Field__c == '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�'))}" value="{!or.opp[c[0]]}" /> -->
+ <!-- <apex:outputField id="q2222222" rendered="{!(c.size==1 && columnRightRW[c[0]]=='r' && c[0] <> 'Name' && c[0] == 'StageName__c' && (
+ or.opp.Oly_Inquiry_Stage__c == '璇环闃舵鍙戠敓浜嗗彉鍖�' || or.opp.Oly_Inquiry_Stage__c == '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' || or.opp.Oly_Inquiry_Stage__c == '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' || or.opp.Oly_Inquiry_Stage__c == '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�'))}" value="{!or.opp[c[0]]}" />
+
+ </div> -->
+ <!-- <apex:inputField rendered="{!(c.size==1 && columnRightRW[c[0]]=='w' && or.opp.Id <> null && c[0] <> 'Name')}" value="{!or.opp[c[0]]}" onchange="setChangeFlgRight('{!or.lineNo}')"/>
+>>>>>>> LEXCommunityLiJun
<apex:outputPanel rendered="{!(c.size==1 && columnRightRW[c[0]]=='wm' && c[0] <> 'Name' && or.opp.Id <> null)}" layout="none">
<div class="requiredInput_r">
<div class="requiredBlock_r"></div>
<apex:inputField value="{!or.Opp[c[0]]}" onchange="setChangeFlg('{!or.lineNo}')"/>
</div>
</apex:outputPanel> -->
+<<<<<<< HEAD
<apex:outputField
rendered="{!c[0] == 'Strategic_department_Class_Name__c'}"
value="{!or.opp[c[0]]}"
@@ -997,3 +1375,149 @@
</apex:outputPanel>
</apex:form>
</apex:page>
+=======
+ <apex:outputField rendered="{!c[0] == 'Strategic_department_Class_Name__c'}" value="{!or.opp[c[0]]}" />
+
+ <apex:inputField styleClass="slds-form-element" rendered="{!( columnRightRW[c[0]]=='w' && c[0] <> 'Strategic_department_Class_Name__c' && c[0] <> 'Change_To_Opportunity_T__c' && c[0] <> 'Name')}" value="{!or.opp[c[0]]}" onchange="setChangeFlgRight('{!or.lineNo}')"/>
+ <apex:outputPanel rendered="{!( columnRightRW[c[0]]=='wm' && c[0] <> 'Change_To_Opportunity_T__c' && c[0] <> 'Name' )}" layout="none">
+ <div class="requiredInput_r">
+ <div class="requiredBlock_r"></div>
+ <apex:inputField styleClass="slds-form-element" value="{!or.Opp[c[0]]}" onchange="setChangeFlg('{!or.lineNo}')"/>
+ </div>
+ </apex:outputPanel>
+ <apex:variable value="{!cnt_3 + 1}" var="cnt_3" />
+ </td>
+ </apex:repeat>
+ <td id="cell_Scroll" class="col_Scroll">
+ <apex:inputHidden value="{!or.changeFlg}" id="changeFlg"/>
+ <apex:inputHidden value="{!or.changeFlgRt}" id="changeFlgRt"/>
+ <script type="text/javascript">
+ if ("{!or.canEdit}" == "false") {
+ var right = j$("#tableData").find("tr").eq({!cnt-1});
+ var rightline = j$(right).find("td");
+ for (var i=0; i<rightline.length; i++) {
+ j$(rightline[i]).find("input").each(function(){
+ j$(this).attr("disabled",true);
+ });
+ j$(rightline[i]).find("a").each(function(){
+ j$(this).attr("href","#");
+ });
+ }
+ }
+ if ("{!or.hasError}" == "true") {
+ var left = j$("#tableData_L").find("tr").eq({!cnt-1});
+ var leftFirst = j$(left).find("td").eq(1);
+ j$(leftFirst).css("background-color", "gray");
+ }
+ if ("{!or.hasFieldError}" == "true") {
+ var left = j$("#tableData_L").find("tr").eq({!cnt-1});
+ var leftFirst = j$(left).find("td").eq(1);
+ j$(leftFirst).css("background-color", "red");
+ }
+ </script>
+ </td>
+ </tr>
+ <apex:variable value="{!cnt + 1}" var="cnt" />
+ </apex:repeat>
+ </table>
+ </div>
+ <div id="in_Div">
+ <table class="list" style="border-bottom-width: 0px;width:2000px; font-size:13px; border-spacing:0;" border="" id="tableData_L">
+ <apex:variable value="{!1}" var="cnt_2" />
+ <apex:repeat value="{!oppRecords}" var="or" id="oppTable_L">
+ <tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" style="height:35px;" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
+ <apex:variable value="{!0}" var="cnt_2" />
+ <apex:repeat value="{!columnsLeftApi}" var="c">
+ <td class="dataCellBorder1 col_{!columnLeftCss[cnt_2]}">
+ <!-- vivek start -->
+
+ <apex:outputLink target="_blank" rendered="{!c[0]=='Name'}" value="/{!or.AgcOpp.Id}" >
+ <apex:outputField rendered="{!c[0]=='Name'}" value="{!or.AgcOpp[c[0]]}" />
+ </apex:outputLink>
+
+ <apex:outputPanel rendered="{!or.ifLock}">
+ <apex:outputField rendered="{!c[0]!='Name'}" value="{!or.AgcOpp[c[0]]}">
+ </apex:outputField>
+ </apex:outputPanel>
+ <!-- 閿�鍞媴褰� -->
+ <apex:outputPanel rendered="{!or.ifLock == false}">
+ <!-- <apex:outputLink target="_blank" rendered="{!c[0]=='Agency_Person__c'}" value="/{!or.AgcOpp[c[0]]}" > -->
+ <!-- <apex:outputText value="{!or.AgcOpp.Agency_Person__r.Name }" /> -->
+ <!-- <apex:outputText rendered="{!c[0]=='Agency_PersonName__c'}" value="{!or.AgcOpp.Agency_PersonName__c }" /> -->
+ <!-- </apex:outputLink> -->
+ <!-- 缁忛攢鍟� -->
+ <apex:outputLink target="_blank" rendered="{!c[0]=='Agency__c'}" value="/{!or.AgcOpp[c[0]]}" >
+ <apex:outputText value="{!or.AgcOpp.Agency__r.Name }" />
+ </apex:outputLink>
+ <!-- OCSM璇环 -->
+ <!-- <apex:outputLink target="_blank" rendered="{!c[0]=='Change_To_Opportunity__c'}" value="/{!or.AgcOpp[c[0]]}" >
+ <apex:outputText value="{!or.AgcOpp.Agency__r.Name }" />
+ </apex:outputLink> -->
+ <!-- 蹇呭～瀛楁 -->
+ <!-- <apex:outputField rendered="{!(c[0]<>'Name' && c[0]<>'Agency_Hospital__c' && c[0]<>'Product_Category1__c' && c[0]<>'Product_Category2__c' && c[0]<>'Product_Category3__c' && c[0]<>'Agency_Person__c' && c[0]<>'Agency__c' && c[0]<>'Change_To_Opportunity__c' && columnLeftRW[c[0]]=='wm')}" value="{!or.AgcOpp[c[0]] }"/> -->
+ <apex:inputField styleClass="slds-form-element" rendered="{!(c[0]<>'Name' && c[0]<>'Product_Category1__c' && c[0]<>'Product_Category2__c' && c[0]<>'Product_Category3__c' && c[0]<>'Agency_Person__c' && c[0]<>'Agency__c' && c[0]<>'Change_To_Opportunity__c' && columnLeftRW[c[0]]=='wm')}" value="{!or.AgcOpp[c[0]] }" onchange="setChangeFlg('{!or.lineNo}')"/>
+ <!-- vivek end -->
+
+
+ <apex:outputField rendered="{!(c[0]<>'Name' && c[0]<>'Product_Category1__c' && c[0]<>'Product_Category2__c' && c[0]<>'Product_Category3__c' && c[0]<>'Agency_Person__c' && c[0]<>'Agency__c' && c[0]<>'Change_To_Opportunity__c' && columnLeftRW[c[0]]=='r')}" value="{!or.AgcOpp[c[0]] }"/>
+ <!-- <apex:outputField rendered="{!(c[0]<>'Name' && columnLeftRW[c[0]]<>'w')}" value="{!or.AgcOpp[c[0]] }"/> -->
+ <!-- 鍙紪杈戠殑瀛楁 -->
+ <apex:inputField styleClass="slds-form-element" value="{!or.AgcOpp[c[0]]}" rendered="{!columnLeftRW[c[0]]=='w'}" onchange="setChangeFlg('{!or.lineNo}')"/>
+ </apex:outputPanel>
+ </td>
+ <apex:variable value="{!cnt_2 + 1}" var="cnt_2" />
+ </apex:repeat>
+ </tr>
+ <apex:variable value="{!cnt + 1}" var="cnt" />
+ </apex:repeat>
+ </table>
+
+ </div><!-- /in_Div -->
+ </apex:outputPanel>
+ </apex:pageBlock>
+ <!-- </div> -->
+ <script type="text/javascript">
+j$(function() {
+ var tableWidth = 0;
+ j$('body .pbBody table#tableHeader tr.headerRow td').each(function() {
+ var colClass = getColClassName(this);
+ if (colClass != 'col_Scroll') {
+ var headerCol = j$('body .pbBody table.list tr.headerRow td.' + colClass);
+ tableWidth += headerCol.width();
+ }
+ });
+ // j$('table#tableData').css('width', (tableWidth + 2) + 'px');
+ // j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
+
+ // list 銇� headerRow 銇� td銇� toggleWidth() 銈掕拷鍔�
+ bindTdToggleWidth();
+ // j$("input").attr("styleClass","slds-input");
+});
+var elements = document.getElementsByTagName("select");
+for (i = 0; i < elements.length; i++) {
+ var id = elements[i].id;
+ if (id.length > 5 && id.substring(id.length - 5, id.length) == 'mlktp') {
+ elements[i].style.display = "none";
+ }
+}
+var tbl_l = document.getElementById("tableData_L");
+var input_l = tbl_l.getElementsByTagName("input");
+for (i = 0; i < input_l.length; i++) {
+ var id = input_l[i].id + '_lkid';
+ if (document.getElementById(id) != null) {
+ input_l[i].style.width = "75%";
+ }
+}
+var tbl = document.getElementById("tableData");
+var input = tbl.getElementsByTagName("input");
+for (i = 0; i < input.length; i++) {
+ var id = input[i].id + '_lkid';
+ if (document.getElementById(id) != null) {
+ input[i].style.width = "75%";
+ }
+}
+</script>
+ </apex:outputPanel>
+ </apex:form>
+</apex:page>
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1