From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/SetPersonalTarget.page | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/pages/SetPersonalTarget.page b/force-app/main/default/pages/SetPersonalTarget.page
index c1de14c..bbf7c80 100644
--- a/force-app/main/default/pages/SetPersonalTarget.page
+++ b/force-app/main/default/pages/SetPersonalTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetPersonalTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetPersonalTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>閮ㄩ棬鎷呭綋鑰呯洰鏍囪瀹氾紙鍖婚櫌鎷呭綋锛�</title>
@@ -111,23 +111,26 @@
unblockUI();
}
}
-function DisableAllButtons (actionText) {
- var button = document.getElementById("Page:Form:headBlock:updateToTarget");
- button.disabled = true;
- button.classList.add("btnDisabled");
-}
- //20200618 SWAG-BQ7CM9 娣诲姞UpdateJs 璋冪敤Apex 涓璘pdate鍑芥暟 by ljh
-function UpdateJs(actionText) {
- blockme_dark();
- if (window.confirm('纭畾瑕佸弽搴斿埌鐩爣鍚楋紵')) {
- Update();
- // j$(escapeVfId('Page:Form:headBlock:updateToTarget')).attr("disabled",true);
- // alert('璇风瓑寰呮彁绀恒�愬弽鏄犲埌鐩爣鎴愬姛銆戝湪鍋氬叾浠栨搷浣�');
- DisableAllButtons(actionText);
- } else {
- unblockUI();
- }
-}
+// 20220613 WLIG-CER9NQ you 椤甸潰涓嬁鎺夋敼鎴恇atch鎵ц
+// function DisableAllButtons (actionText) {
+// var button = document.getElementById("Page:Form:headBlock:updateToTarget");
+// button.disabled = true;
+// button.classList.add("btnDisabled");
+// }
+
+
+// //20200618 SWAG-BQ7CM9 娣诲姞UpdateJs 璋冪敤Apex 涓璘pdate鍑芥暟 by ljh
+// function UpdateJs(actionText) {
+// blockme_dark();
+// if (window.confirm('纭畾瑕佸弽搴斿埌鐩爣鍚楋紵')) {
+// Update();
+// // j$(escapeVfId('Page:Form:headBlock:updateToTarget')).attr("disabled",true);
+// // alert('璇风瓑寰呮彁绀恒�愬弽鏄犲埌鐩爣鎴愬姛銆戝湪鍋氬叾浠栨搷浣�');
+// DisableAllButtons(actionText);
+// } else {
+// unblockUI();
+// }
+// }
function nextJs() {
blockme();
if (j$(escapeVfId('Page:Form:editBlock:changeFlg')).value() == 1) {
@@ -264,8 +267,9 @@
</apex:actionFunction>
<!--CHAN-BDQBLX 20210125 you end -->
<apex:actionFunction name="save" action="{!saveBtn}" rerender="MessageP,editBlock" oncomplete="unblockUI();" />
+ <!--20220613 WLIG-CER9NQ you 椤甸潰涓嬁鎺夋敼鎴恇atch鎵ц-->
<!-- 20200618 SWAG-BQ7CM9 娣诲姞Update action function by ljh -->
- <apex:actionFunction name="Update" action="{!UpdateBtn}" rerender="MessageP,dataBlock" oncomplete="unblockUI();Secin();" />
+ <!--<apex:actionFunction name="Update" action="{!UpdateBtn}" rerender="MessageP,dataBlock" oncomplete="unblockUI();Secin();" /> -->
<apex:actionFunction name="next" action="{!next}" rerender="Form" oncomplete="unblockUI();">
<apex:param name="saveFlg" assignTo="{!saveFlg}" value="" />
</apex:actionFunction>
@@ -326,10 +330,12 @@
<apex:inputCheckBox value="{!p.check}" id="post" onchange="searchByFilterJs();return false;"/><apex:outputLabel value="{!p.positionName}" for="post"/>
</apex:repeat>
</td>
+ <!-- 20220613 WLIG-CER9NQ you 椤甸潰涓嬁鎺夋敼鎴恇atch鎵ц
<td align="right" width="80">
- <!-- 20200619 add 鍙嶅簲鍒扮洰鏍� 鎸夐挳 -->
+ 20200619 add 鍙嶅簲鍒扮洰鏍� 鎸夐挳
<apex:commandButton value="鍙嶅簲鍒扮洰鏍�" id="updateToTarget" style="margin-left: 20px;" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}"/>
</td>
+ -->
<!--CHAN-BDQBLX 20210125 you start -->
<td width="80">
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘">
@@ -374,7 +380,7 @@
<th width="70px" class="headerRow booleanColumn">鐪�</th>
<th class="headerRow booleanColumn">瑙掕壊</th>
<th width="70px" class="headerRow booleanColumn">鎷呭綋</th>
- <th width="70px" class="headerRow booleanColumn">鑱屼綅</th>
+ <th width="70px" class="headerRow booleanColumn">HR閫氱敤鑱岀骇</th> <!-- 20220517 lt SWAG-CD28H3 Update -->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堜富锛�</th>
<!--wangweipeng 20210615-->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堝吋锛�</th>
@@ -411,7 +417,7 @@
<td class="dataCell">{!dbs.user.Province__c}</td>
<td class="dataCell">{!dbs.user.UserRole.Name}</td>
<td class="dataCell">{!dbs.user.Alias}</td>
- <td class="dataCell">{!dbs.user.Post__c}</td>
+ <td class="dataCell">{!dbs.user.HR_Post__c}</td> <!-- 20220517 lt SWAG-CD28H3 Update -->
<td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}</td>
<!--wangweipeng 20210615-->
<td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}</td>
--
Gitblit v1.9.1