From 4bfe21c4b5ddc089ae5a95f4b10f6cff148b690d Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 18 三月 2022 18:27:34 +0800
Subject: [PATCH] NFM606fix
---
force-app/main/default/pages/StraightBackAddress.page | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/pages/StraightBackAddress.page b/force-app/main/default/pages/StraightBackAddress.page
index 9dca379..b8c278d 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;
}
@@ -355,9 +355,14 @@
PIData[Id] = temp;
};
for(var i=0;i<tableDataStr.length;i++){
- if(tableDataStr[i].address.AWS_Data_Id__c){
+ if(tableDataStr[i].address.Contacts__r){
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 +384,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 +446,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,12 +457,9 @@
let y=window.event.y;
createDiv.style.left=x;
createDiv.style.top=y;
- createDiv.style.width = '100px';
- createDiv.style.height = '100px';
createDiv.style.background="#dddddd";
createDiv.style.position = "absolute";
parentNode.appendChild(createDiv);
- parentNode.style.position = "relative";
}
function hidePIDiv(awsDataId){
@@ -635,9 +636,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}" />
--
Gitblit v1.9.1