From 962519811b7c4be07f30d09e791798b0ea79d3ae Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 08 三月 2023 09:54:02 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/pages/CM_SearchContactService.page | 130 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 113 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/pages/CM_SearchContactService.page b/force-app/main/default/pages/CM_SearchContactService.page
index b8e0fe9..497847b 100644
--- a/force-app/main/default/pages/CM_SearchContactService.page
+++ b/force-app/main/default/pages/CM_SearchContactService.page
@@ -19,6 +19,12 @@
<script type="text/javascript">
// 2022/02/15 寮犲崕寤� 鏀归�燩I start
+ //zhj 2022-02-04 鏂版柟妗堟敼閫� start
+ var accountId = '{!accountIdV2}'
+ var accountName = '';
+ var dataIdManageCodeMap = {};
+ var staticResourcesV2 = JSON.parse('{!staticResourceContactV2}');
+ //zhj 2022-02-04 鏂版柟妗堟敼閫� end
var staticResources = JSON.parse('{!staticResource}');
var contactAWSIds = JSON.parse('{!contactAWSIds}');
var LastName = '';
@@ -92,6 +98,7 @@
}
function editSaveJs() {
+ hiddenErrorMsgNode(); //zhj MEBG鏂版柟妗堟敼閫� 2022-11-24
document.getElementById("errorMsg").innerHTML = '';
if(!document.getElementById("Page:allForm:editBlock:Search_LastName__c").value){
@@ -179,16 +186,37 @@
return null;
}
function ProcessPI(sobjJson, payloadForNewPI) {
- //blockme();
- let url = staticResources.newUrl
- if (now_edit_id) {
- url = staticResources.updateUrl
- }
- AWSService.post(url, payloadForNewPI, function(result){
- aws_result = result;
- SetEditObj();
- saveNew();
- }, staticResources.token);
+ // //blockme();
+ // //zhj 2022-02-04 鏂版柟妗堟敼閫� start
+ // // let url = staticResources.newUrl
+ // // if (now_edit_id) {
+ // // url = staticResources.updateUrl
+ // // }
+ // let url = staticResourcesV2.newUrl
+ // if (now_edit_id) {
+ // url = staticResourcesV2.updateUrl
+ // }
+ // //zhj 2022-02-04 鏂版柟妗堟敼閫� end
+ // AWSService.post(url, payloadForNewPI, function(result){
+ // aws_result = result;
+ // //zhj MEBG鏂版柟妗堟敼閫� 2022-11-24 start
+ // if(r.status == '129'){
+ // alertErrorMessage('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠＄悊缂栫爜 ['+dataIdManageCodeMap[r.object[0].dataId]+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�');
+ // unblockUI();
+ // return
+ // }
+ // if(r.status == '130'){
+ // if(r.object[0] && r.object[0].sfRecordId != null && r.object[0].sfRecordId != '')
+ // alertErrorMessage('宸叉壘鍒伴噸澶嶅�硷細 UniqueNumber__c 涓庤褰曞�奸噸澶嶏紝ID 涓�: '+r.object[0].sfRecordId+'瀹㈡埛浜哄憳淇℃伅');
+ // else
+ // alertErrorMessage('鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鐢佃瘽鍙风爜');
+ // unblockUI();
+ // return
+ // }
+ // //zhj MEBG鏂版柟妗堟敼閫� 2022-11-24 end
+ // SetEditObj();
+ // saveNew();
+ // }, staticResources.token);
}
function Trans(){
@@ -210,11 +238,61 @@
}
function GetEditObj(){
- return JSON.stringify([{
- lastName : document.getElementById("Page:allForm:editBlock:Search_LastName__c").value,
- //phone : document.getElementById("Page:allForm:editBlock:Phone").value,
- dataId:document.getElementById("Page:allForm:editBlock:AWS_Data_Id__c").value,
- }]);
+ //zhj 2022-02-04 鏂版柟妗堟敼閫� start
+ Visualforce.remoting.Manager.invokeAction(
+ 'CM_SearchContactServiceController.searchContactByAccountId',
+ accountId,
+ function (result, event) {
+ if(result.status == 'fail'){
+ alertErrorMessage(result.message);
+ return
+ }
+ console.log('result = ' + JSON.stringify(result));
+ accountName = result.accountName;
+ dataIdManageCodeMap = result.dataIdManageCodeMap;
+ var contactList = '';
+ for(var i = 0; i<result.contactList.length; i++){
+ if(result.contactList[i].AWS_Data_Id__c)
+ contactList += ',' + result.contactList[i].AWS_Data_Id__c;
+ }
+ contactList = contactList.substring(1);
+ var payloadForNewPI = JSON.stringify([{
+ lastName : document.getElementById("Page:allForm:editBlock:Search_LastName__c").value,
+ mobilePhone : '',
+ dataId : document.getElementById("Page:allForm:editBlock:AWS_Data_Id__c").value,
+ contactIds : contactList,
+ isMobileVerif : result.isMobileVerif,
+ isNameMobileVerif : result.isNameMobileVerif
+ }]);
+ console.log('payloadForNewPI = ' + JSON.stringify(payloadForNewPI));
+ debugger
+ let url = staticResourcesV2.newUrl
+ if (now_edit_id) {
+ url = staticResourcesV2.updateUrl
+ }
+ //zhj 2022-02-04 鏂版柟妗堟敼閫� end
+ AWSService.post(url, payloadForNewPI, function(result){
+ aws_result = result;
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-24 start
+ if(result.status == '129'){
+ alertErrorMessage('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠＄悊缂栫爜 ['+dataIdManageCodeMap[result.object[0].dataId]+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�');
+ unblockUI();
+ return
+ }
+ if(result.status == '130'){
+ if(result.object[0] && result.object[0].sfRecordId != null && result.object[0].sfRecordId != '')
+ alertErrorMessage('宸叉壘鍒伴噸澶嶅�硷細 UniqueNumber__c 涓庤褰曞�奸噸澶嶏紝ID 涓�: '+result.object[0].sfRecordId+'瀹㈡埛浜哄憳淇℃伅');
+ else
+ alertErrorMessage('鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鐢佃瘽鍙风爜');
+ unblockUI();
+ return
+ }
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-24 end
+ SetEditObj();
+ saveNew();
+ }, staticResources.token);
+ });
+ //zhj 2022-02-04 鏂版柟妗堟敼閫� end
}
function SetEditObj(){
@@ -228,7 +306,19 @@
}
}
-
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-24 start
+ function alertErrorMessage(errorMsg) {
+ let errorMsgNode = document.getElementById("Page:allForm:editBlock:msgContent");
+ errorMsg = '閿欒锛氭棤鏁堟暟鎹��' + '\n' + errorMsg;
+ errorMsgNode.innerText = errorMsg;
+ errorMsgNode.className = 'pbError';
+ }
+ function hiddenErrorMsgNode() {
+ let errorMsgNode = document.getElementById("Page:allForm:editBlock:msgContent");
+ errorMsgNode.innerText = '';
+ errorMsgNode.className = '';
+ }
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-24 end
// 2022骞�2鏈�15鏃� PI鏀归�� 寰愪寒 end
</script>
@@ -242,7 +332,7 @@
</apex:actionFunction>
<apex:actionFunction name="saveNew" action="{!saveNew}" rerender="allForm,allPanel,sfContactId" onComplete="Trans();">
</apex:actionFunction>
- <apex:actionFunction name="editClear" action="{!editClear}" rerender="allForm,allPanel,sfContactId" onComplete="unblockUI();">
+ <apex:actionFunction name="editClear" action="{!editClear}" rerender="allForm,allPanel,sfContactId" onComplete="unblockUI();searchContactAll()">
</apex:actionFunction>
<!-- 2022/02/15 寮犲崕寤� 娓呯┖LineInfoList start -->
<apex:actionFunction name="clearLineInfoList" action="{!clearLineInfoList}" rerender="allForm" onComplete="unblockUI();">
@@ -320,6 +410,12 @@
<apex:commandButton onclick="editClearJs();" value="娓呯┖" rerender="dummy"/>
<apex:commandButton onclick="editSaveJs();" value="淇濆瓨" rerender="dummy"/>
</apex:pageBlockButtons>
+ <!-- Error Msg-->
+ <div style="text-align: center;">
+ <apex:outputPanel id="errorMsg">
+ <apex:pageMessages id="msgContent" escape="false" />
+ </apex:outputPanel>
+ </div>
<!-- zhj 鏂版柟妗堟敼閫� 2022-12-05 start-->
<!-- <apex:inputHidden id="LastName_Encrypted__c" value="{!newCon.LastName_Encrypted__c}"/>
<apex:inputHidden id="Phone_Encrypted__c" value="{!newCon.Phone_Encrypted__c}"/> -->
--
Gitblit v1.9.1