From 6b61c19fd8f32ee060fec698905b4727807e0ff7 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期日, 24 四月 2022 17:05:33 +0800
Subject: [PATCH] 再来的新数据：新建的时候待入职的就不新建，只有在职的新建。 现在已经新建了的待入职，什么时候状态变在职，什么时候再更新一次，之后也是除非状态再变离职，否则不更新。
---
force-app/main/default/pages/FixtureRentalPDF.page | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/FixtureRentalPDF.page b/force-app/main/default/pages/FixtureRentalPDF.page
index 9601497..15e0cf0 100644
--- a/force-app/main/default/pages/FixtureRentalPDF.page
+++ b/force-app/main/default/pages/FixtureRentalPDF.page
@@ -277,9 +277,14 @@
<table border="0" width="100%" style="border-collapse: collapse;margin: 0;">
<apex:outputPanel layout="none" rendered="{!IF(!IsShowLU , true, false)}">
<tr>
+
<td style="font-size:22px;">
- <apex:outputText value="{!IF(record.isAgencyOrCenter,record.AgencyAddressName,centreAddress)}" />
+ <!-- 20220413 ljh 鎶ご鏄剧ず update start -->
+ <!-- <apex:outputText value="{!IF(record.isAgencyOrCenter,record.AgencyAddressName,centreAddress)}" /> -->
+ <apex:outputText value="{!IF(isAgencyOrCenter,AgencyAddressName,centreAddress)}" />
+ <!-- 20220413 ljh 鎶ご鏄剧ず update end -->
</td>
+
<td rowspan="2">
<img style="float: right; width: 55px; height: 55px;padding: 0px;margin-top: 0mm;" src="{!qrcode}"
/>
@@ -287,8 +292,12 @@
</tr>
<tr>
<td style="font-size:15px;">
- <c:PDFWbr targetStr="{!IF(record.AgencyOrCenterAddress=='BeiJingCenter','鍖椾含甯傛湞闃冲尯閰掍粰妗ヨ矾10鍙锋亽閫氬晢鍔″洯B12C搴цタ闂�1F 鐢佃瘽:010-59756006-1871',IF(record.AgencyOrCenterAddress=='ShangHaiCenter','涓婃捣甯傛郸涓滄柊鍖哄攼闀囧垱涓氳矾183鍙�2骞�1F 鐢佃瘽:021-60391318-8877',IF(record.AgencyOrCenterAddress=='GuangZhouCenter','骞垮窞甯傜暘绂哄尯涓滅幆琛楃暘绂哄ぇ閬撳寳537鍙风暘灞卞垱涓氫腑蹇�3鍙锋ゼ1F 鐢佃瘽:020-39198888-8876',record.AgencyOrCenterAddress)))}"
+ <!-- 20220413 ljh 鎶ご鏄剧ず update start -->
+ <!-- <c:PDFWbr targetStr="{!IF(record.AgencyOrCenterAddress=='BeiJingCenter','鍖椾含甯傛湞闃冲尯閰掍粰妗ヨ矾10鍙锋亽閫氬晢鍔″洯B12C搴цタ闂�1F 鐢佃瘽:010-59756006-1871',IF(record.AgencyOrCenterAddress=='ShangHaiCenter','涓婃捣甯傛郸涓滄柊鍖哄攼闀囧垱涓氳矾183鍙�2骞�1F 鐢佃瘽:021-60391318-8877',IF(record.AgencyOrCenterAddress=='GuangZhouCenter','骞垮窞甯傜暘绂哄尯涓滅幆琛楃暘绂哄ぇ閬撳寳537鍙风暘灞卞垱涓氫腑蹇�3鍙锋ゼ1F 鐢佃瘽:020-39198888-8876',record.AgencyOrCenterAddress)))}"
+ /> -->
+ <c:PDFWbr targetStr="{!IF(AgencyOrCenterAddress=='BeiJingCenter','鍖椾含甯傛湞闃冲尯閰掍粰妗ヨ矾10鍙锋亽閫氬晢鍔″洯B12C搴цタ闂�1F 鐢佃瘽:010-59756006-1871',IF(AgencyOrCenterAddress=='ShangHaiCenter','涓婃捣甯傛郸涓滄柊鍖洪噾鍚夎矾778鍙�3鍙锋ゼ1F 鐢佃瘽:021-60391318-8877',IF(AgencyOrCenterAddress=='GuangZhouCenter','骞垮窞甯傜暘绂哄尯涓滅幆琛楃暘绂哄ぇ閬撳寳537鍙风暘灞卞垱涓氫腑蹇�3鍙锋ゼ1F 鐢佃瘽:020-39198888-8876',AgencyOrCenterAddress)))}"
/>
+ <!-- 20220413 ljh 鎶ご鏄剧ず update start -->
</td>
</tr>
</apex:outputPanel>
--
Gitblit v1.9.1