From 988f9735377909b6310301e582c15804e004783f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 07 十月 2023 10:36:13 +0800
Subject: [PATCH] 近期修改cjw
---
force-app/main/default/pages/DiscountProductApplication.page | 62 ++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/DiscountProductApplication.page b/force-app/main/default/pages/DiscountProductApplication.page
index 4216343..4f06cef 100644
--- a/force-app/main/default/pages/DiscountProductApplication.page
+++ b/force-app/main/default/pages/DiscountProductApplication.page
@@ -5,6 +5,7 @@
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+<apex:includeScript value="{!URLFOR($Resource.SelectFieldJs)}"/>
<style>
/*淇℃伅鎻愮ず棰滆壊*/
body .bPageBlock .pbSubheader, .slds-vf-scope .bPageBlock .pbSubheader{
@@ -53,9 +54,10 @@
if (flag == true) {
// var accid = j$(escapeVfId('dpaPage:dpaForm:dpaBlock:rawAccountId_lkid')).value();
var accid = j$(escapeVfId('dpaPage:dpaForm:dpaBlock:rawAccountId')).value();
- openPopup('/apex/searchAimsAccount?accName='+accid, 'setsearch', 800, 600, 'width=900,height=600,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
+ var protype = j$(escapeVfId('dpaPage:dpaForm:dpaBlock:protype')).value();
+ openPopup('/apex/searchAimsAccount?accName='+accid+'&protype='+protype, 'setsearch', 800, 600, 'width=900,height=600,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
}else{
- openPopup('/apex/searchAimsAccount?accId={!dpa.RawAccount__c }', 'setsearch', 800, 600, 'width=900,height=600,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
+ openPopup('/apex/searchAimsAccount?accId={!dpa.RawAccount__c }&protype='+protype, 'setsearch', 800, 600, 'width=900,height=600,scrollbars=yes,toolbar=no,status=no,directories=no,menubar=no,resizable=1', true);
}
}
@@ -140,12 +142,17 @@
// j$(escapeVfId('dpaPage:dpaForm:dpaBlock:tempid')).value() = 'tempid';
}
-
+ function ProtypeChangeJs() {
+ blockme();
+ ProtypeChange();
+ }
+
//add by rentx 2021-2-20
</script>
<apex:form id="dpaForm" >
<apex:actionFunction name="search" action="{!searchAllProduct2}" oncomplete="unblockUI();" reRender="ConsumableorderdetailsSection,message" />
+ <apex:actionFunction name="ProtypeChange" action="{!ProtypeChange}" oncomplete="unblockUI();" reRender="ConsumableorderdetailsSection,message" />
<apex:pageBlock title="鐗逛环浜у搧鐢宠淇℃伅" id="dpaBlock" >
<apex:pageBlockButtons location="top" >
<apex:commandButton value="淇濆瓨" disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" onclick="blockme();" style="margin-left:30px;width:100px;float: left;" action="{!savesaveDiscountProduct}" onComplete="unblockUI();CheckStatusAfter();" reRender="ConsumableorderdetailsSection,message"/>
@@ -156,37 +163,38 @@
<td align="left">
<!-- //update by rentx 2021-2-22 start -->
<apex:outputField rendered="{!!isPage}" value="{!dpa.RawAccount__c}" style="width:300px"/>
- <apex:inputField id="rawAccountId" rendered="{!isPage}" required="true" value="{!dpa.RawAccount__c}" />
+ <apex:inputField id="rawAccountId" rendered="{!isPage}" required="true" value="{!dpa.RawAccount__c}" style="width:150px"/>
<!-- //update by rentx 2021-2-22 end -->
</td>
<td/>
+ <!-- // DB202309406949 gzw start -->
+ <td align="right" >浜у搧绫诲瀷锛�</td>
+ <td>
+ <apex:inputField id="protype" value="{!dpa.Product_Type__c}" style="width:150px" onchange="ProtypeChangeJs();return false;" rendered="{!IF(dpa.ApplicationStatus__c='鑽夋涓�' || dpa.ApplicationStatus__c=null,true,false)}"/>
+ <apex:outputField id="protypeout" value="{!dpa.Product_Type__c}" style="width:150px" rendered="{!IF(!(dpa.ApplicationStatus__c='鑽夋涓�' || dpa.ApplicationStatus__c=null),true,false)}"/>
+ </td>
<td align="right">鍖婚櫌锛�
</td>
<td width="100px"><apex:inputText id="AimsAccount" disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" style="width:150px" value="{!AimsAccount}" onclick="searchAimsAccount1()"
- onfocus="if (j$(escapeVfId('dpaPage:dpaForm:dpaBlock:tempid')).value() != 'tempId' && j$(escapeVfId('dpaPage:dpaForm:dpaBlock:tempid')).value() != '') {searchFn()}" />
+ onfocus="if (j$(escapeVfId('dpaPage:dpaForm:dpaBlock:tempid')).value() != 'tempId' && j$(escapeVfId('dpaPage:dpaForm:dpaBlock:tempid')).value() != '') {searchFn()}"/>
</td>
<td style="display:none"><apex:inputText style="display:none" id="AimsAccountId" value="{!AimsAccountId}"/></td>
<td style="display:none"><apex:inputText style="display:none" value="{!dpa.ApplicationStatus__c }"/></td>
<apex:inputHidden id="tempid" value="{!tempVal}"/>
-
- <td>
- <!-- <apex:commandButton value="淇濆瓨" disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" onclick="blockme();" style="margin-left:30px;width:180px" action="{!savesaveDiscountProduct}" onComplete="unblockUI();CheckStatusAfter();" reRender="ConsumableorderdetailsSection,message"/> -->
- <!-- <apex:commandButton value="淇濆瓨" disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" onclick="blockme();saveAimsAccountId();" style="margin-left:30px;width:180px" action="{!savesaveDiscountProduct}" onComplete="unblockUI();CheckStatusAfter();" reRender="ConsumableorderdetailsSection,message"/> -->
- </td>
+
<!-- <td/> -->
</tr>
<tr style="height: 10px" />
<tr>
<td align="right" >浜у搧鍚嶇О锛�</td>
- <td align="left"><apex:inputText disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" value="{!text1}" style="width:300"/>
+ <td align="left"><apex:inputText disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" value="{!text1}" style="width:150px"/>
</td>
<td/>
<td align="right" >浜у搧缂栫爜锛�</td>
<td align="left"><apex:inputText disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" value="{!text2}" style="width:150px"/>
</td>
-
- <td><apex:commandButton value="妫�绱�" disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" onclick="blockme();" style="margin-left:30px;width:100px" action="{!searchAllProduct2}" oncomplete="unblockUI();" reRender="ConsumableorderdetailsSection,message"/>
+ <td colspan="2"><apex:commandButton value="妫�绱�" disabled="{!IF(dpa.ApplicationStatus__c='鐢宠涓�'||dpa.ApplicationStatus__c='鎵瑰噯'||dpa.ApplicationStatus__c='椹冲洖',true,false)}" onclick="blockme();" style="margin-left:30px;width:100px" action="{!searchAllProduct2}" oncomplete="unblockUI();" reRender="ConsumableorderdetailsSection,message"/>
</td>
</tr>
</table>
@@ -260,4 +268,32 @@
</table>
</apex:pageBlock>
</apex:form>
+ <script>
+ let SelectFieldParamList=[
+
+{
+
+ //鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
+
+ inputFieldId : 'dpaPage:dpaForm:dpaBlock:rawAccountId',
+
+ //鏌ユ壘瀛楁鎵�鍦ㄥ璞�
+
+ ObjectType : 'DiscountProductApplication__c',
+
+ //鏌ユ壘瀛楁鐨刟pi鍚嶇О
+
+ QueryFieldApiName : 'RawAccount__c',
+
+ //鏌ユ壘瀛楁鐨勬煡鎵惧璞�
+
+ SelectObj : 'Account',
+
+ //鎼滅储鏃朵娇鐢ㄧ殑瀛楁
+
+ SelectFld : 'Name'
+
+}];
+resetOpenPage(SelectFieldParamList);
+ </script>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1