From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/pages/Consumable.page | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/pages/Consumable.page b/force-app/main/default/pages/Consumable.page
index 80827a2..f4db9ed 100644
--- a/force-app/main/default/pages/Consumable.page
+++ b/force-app/main/default/pages/Consumable.page
@@ -478,7 +478,8 @@
<td colspan="2">鍚� 鍚岋細</td>
<td colspan="2">
<div style="width:2px;height:20px;background-color:red; position:absolute;margin-right:5px;"></div>
- <apex:inputText id="OEC" value="{!contractName}" onclick="searchContract('{!agencyProType}')" style="width:200px" onfocus="if (j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != 'tempId' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != '' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:OECid')).value() != '' && '{!methodType}' == 'promotionorder'){searchPProductJs('0');return false;}"/>
+ <!-- lt 20230526 瀹夊窘涓ょエ鍒� update agencyProType - agencyProType1 -->
+ <apex:inputText id="OEC" value="{!contractName}" onclick="searchContract('{!agencyProType1}')" style="width:200px" onfocus="if (j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != 'tempId' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:tempidPp')).value() != '' && j$(escapeVfId('allPage:allForm:allBlock:searchBlock:OECid')).value() != '' && '{!methodType}' == 'promotionorder'){searchPProductJs('0');return false;}"/>
<apex:inputHidden id="OECid" value="{!contractId}" />
<apex:inputHidden id="tempidPp" value="{!tempidPp}" />
</td>
--
Gitblit v1.9.1