From 84b24801b8e0e071589ea57b29e64f73e13b1c0c Mon Sep 17 00:00:00 2001
From: 付煜 <fuyu3103346691@163.com>
Date: 星期一, 21 三月 2022 14:54:15 +0800
Subject: [PATCH] SWAG-CCEB67【委托】【重要】保有设备所属变更审批报错
---
force-app/main/default/pages/StraightBackAddress.page | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/pages/StraightBackAddress.page b/force-app/main/default/pages/StraightBackAddress.page
index 9dca379..b7b6bd1 100644
--- a/force-app/main/default/pages/StraightBackAddress.page
+++ b/force-app/main/default/pages/StraightBackAddress.page
@@ -21,7 +21,7 @@
//鏇挎崲vlookup
var newSearchContactWindow = null;
- window.onload = () => {
+ window.onload = function () {
document.getElementById("tab01").style.height = screen.availHeight*0.07+'px';
document.getElementById("tab02").style.height = screen.availHeight*0.53+'px';
document.getElementById("tab03").style.height = screen.availHeight*0.25+'px';
@@ -81,7 +81,7 @@
let divs = j$(e).find("div.message");
for (let i = 0; i < divs.length; i++) {
for (let j = 0; j < divs[i].classList.length; j++) {
- for(let cls of divs[i].classList){
+ for(let cls in divs[i].classList){
if (cls.indexOf('error')>-1) {
return true;
}
@@ -140,7 +140,10 @@
}
blockme();
console.log('{!insUpdData}')
- if(document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:Create_Contacts__c").value){
+ if(document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:Create_Contacts__c").value //銆愯仈绯讳汉锛堟柊寤猴級銆戜笉涓虹┖
+ &&document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:CustomerRecordType").value!='{!accOfficeTypeId}'////璁板綍绫诲瀷id 鍔炰簨澶�
+ &&document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:CustomerRecordType").value!='{!accAgencyTypeId}'//璁板綍绫诲瀷id 璨╁２搴�
+ &&document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:CustomerRecordType").value!='{!accAgencyContactTypeId}'){//璁板綍绫诲瀷id 缁忛攢鍟嗚仈绯讳汉
//new contact
ProcessPI({},GetEditObj('contact'),'contact',function(){
//new address
@@ -357,7 +360,12 @@
for(var i=0;i<tableDataStr.length;i++){
if(tableDataStr[i].address.AWS_Data_Id__c){
correct++;
- AWSService.queryRepair(staticResource.queryUrl,tableDataStr[i].address.AWS_Data_Id__c,tableDataStr[i].address.Id,tableDataStr[i].address.Contacts__r.AWS_Data_Id__c,searchCallBack,staticResource.token);
+ AWSService.queryRepair(staticResource.queryUrl,
+ tableDataStr[i].address.AWS_Data_Id__c,
+ tableDataStr[i].address.Id,
+ tableDataStr[i].address.Contacts__r.AWS_Data_Id__c,
+ searchCallBack,
+ staticResource.token);
}
}
var interval=self.setInterval(function (){
@@ -379,7 +387,6 @@
let queryBack = function queryBack(result) {
let contacts = result.object;
if(contacts == null){
- console.log('鏌ヨ鑱旂郴浜虹殑鏁版嵁 == null')
return;
}
for(var i=0;i<result.object.length;i++){
@@ -442,7 +449,7 @@
'\n閭紪: '+PIData[awsDataId].zipCode+
'\n璇︾粏鍦板潃: '+PIData[awsDataId].detailedAddress
}else{
- piInformation = '鑱旂郴浜�: '+
+ piInformation = '鑱旂郴浜�: null'+
'\n鐢佃瘽: '+PIData[awsDataId].telephone+
'\n閭紪: '+PIData[awsDataId].zipCode+
'\n璇︾粏鍦板潃: '+PIData[awsDataId].detailedAddress
@@ -453,8 +460,8 @@
let y=window.event.y;
createDiv.style.left=x;
createDiv.style.top=y;
- createDiv.style.width = '100px';
- createDiv.style.height = '100px';
+ createDiv.style.height='100px';
+ createDiv.style.width='100px';
createDiv.style.background="#dddddd";
createDiv.style.position = "absolute";
parentNode.appendChild(createDiv);
@@ -526,6 +533,11 @@
document.getElementById(contactNodeId).value = contactInfo.ContactId;
document.getElementById(closeField).value = contactInfo.Name;
}
+ function queryRecordType(){
+ if(document.getElementById('allPage:allForm:oppBlock2:UpdAddressId:Customer__r_Name').value){
+ queryRecordType();
+ }
+ }
//2022 02 28 寮犲崕寤� display PI Data end
</script>
<apex:form id="allForm">
@@ -546,6 +558,8 @@
</apex:actionFunction>
<!-- 淇濆瓨鍜屼慨鏀规柟娉� -->
<apex:actionFunction name="save" action="{!save}" rerender="oppBlock2,message" onComplete="unblockUI();{!IF(isSearchBtn,'searchBtnJs()',false)};Trans()"></apex:actionFunction>
+ <!-- 鏌ヨ瀹㈡埛璁板綍绫诲瀷鏂规硶 -->
+ <apex:actionFunction name="queryRecordType" action="{!queryRecordType}" rerender="oppBlock2,message" onComplete="unblockUI();"></apex:actionFunction>
<!-- 鐐瑰嚮淇敼鎸夐挳鑾峰彇淇敼鏁版嵁鏂规硶 -->
<apex:actionFunction name="onEditor" action="{!onEditor}" rerender="oppBlock2,checEventFrame,insUpdDataStr" onComplete="decrypt();unblockUI();">
<apex:param name="UpdId" assignTo="{!UpdId}" value="" />
@@ -635,9 +649,9 @@
<td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
<apex:outputfield value="{!or.address.Customer__c}" />
</td>
- <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;" aws-data-id="{!or.address.AWS_Data_Id__c}" >
+ <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;" aws-data-id="{!or.address.AWS_Data_Id__c}">
<!-- <apex:outputfield value="{!or.address.Contacts__c}" id="{!or.address.Contacts__c}_{!or.address.Id}"/> -->
- <a href="#" id="{!or.address.Id}" aws-data-id="{!or.address.Contacts__r.AWS_Data_Id__c}" onmouseover="showPIDiv('{!or.address.Id}')" onmouseout="hidePIDiv('{!or.address.Id}')">{!or.address.Contacts__r.Name}</a>
+ <a href="#" id="{!or.address.Id}" onmouseover="showPIDiv('{!or.address.Id}')" onmouseout="hidePIDiv('{!or.address.Id}')" aws-data-id="{!or.address.Contacts__r.AWS_Data_Id__c}">{!or.address.Contacts__r.Name}</a>
</td>
<td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
<apex:outputText value="{!or.address.Telephone__c}" />
@@ -681,7 +695,7 @@
<apex:pageBlock id="oppBlock2" tabStyle="Report">
<apex:pageblocksection title="缂栬緫鍦板潃" id="UpdAddressId" rendered="true" columns="4">
<apex:inputfield value="{!insUpdData.Address_Classification__c}" id="Address_Classification__c" />
- <apex:inputfield value="{!insUpdData.Customer__c}" id="Customer__r_Name" required="false" />
+ <apex:inputfield value="{!insUpdData.Customer__c}" id="Customer__r_Name" required="false" onchange="queryRecordType();" />
<!-- Before PIPL 20220308 -->
<!-- <apex:inputfield value="{!insUpdData.Contacts__c}" id="Contacts__c" required="false"/> -->
<!-- Add By Li Jun for PIPL 20220308 Start -->
@@ -708,6 +722,7 @@
<apex:inputHidden id="Telephone_Encrypted__c" value="{!insUpdData.Telephone_Encrypted__c}"/>
<apex:inputHidden id="ZipCode_Encrypted__c" value="{!insUpdData.ZipCode_Encrypted__c}"/>
<apex:inputHidden id="Detailed_Address_Encrypted__c" value="{!insUpdData.Detailed_Address_Encrypted__c}"/>
+ <apex:inputHidden id="CustomerRecordType" value="{!accRecordTypeId}"/>
</apex:pageblocksection>
<div style="text-align: center;">
--
Gitblit v1.9.1