From ead4df22dca33a867279471821ca675f91dec760 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期六, 14 五月 2022 18:44:54 +0800
Subject: [PATCH] FixIssue0514
---
force-app/main/default/pages/SWOPageRead.page | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/SWOPageRead.page b/force-app/main/default/pages/SWOPageRead.page
index 3f64b56..55c74fd 100644
--- a/force-app/main/default/pages/SWOPageRead.page
+++ b/force-app/main/default/pages/SWOPageRead.page
@@ -1442,9 +1442,10 @@
<apex:outputPanel rendered="{!IF(type = 'General' || type = 'All',true,false)}">
<!-- Before PIPL Update by Li Jun 20220414 Start -->
- <apex:commandButton value="Attach" action="{!uploadFile}"></apex:commandButton>
+ <!-- <apex:commandButton value="Attach" action="{!uploadFile}"></apex:commandButton> -->
<!-- Before PIPL Update by Li Jun 20220414 End -->
- <input class="btn" type="Button" value="PIPL Attach" onclick="window.open('/apex/SWOFileUploadPage')" />
+ <apex:iframe src="/apex/SWOFileUploadPage?parentId={!swoid}" scrolling="true" height="300" id="fileUploadSection"/>
+ <!-- <input class="btn" type="Button" value="Attach" onclick="window.open('/apex/SWOFileUploadPage?parentId={!swoid}')" /> -->
<table class="tableCss" style="border:1px solid #000000;width: 80%">
<tr style="text-align:center;">
<th style="text-align:center;width: 33%;">File Name</th>
@@ -1946,8 +1947,8 @@
return sb.tostring()
}
- console.log('{!mailListStr}'.replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\s+/g,"").replace("\"/g","\\\""))
- var mailListObj = JSON.parse('{!mailListStr}'.replace(/\n/g,"\\n").replace(/\r/g,"\\r").replace(/\s+/g,""))
+ console.log('awsDataIdStr = ' + '{!awsDataIdStr}')
+ var mailListObj = JSON.parse('{!awsDataIdStr}');
var staticResourceMailMerge = JSON.parse('{!staticResourceMailMerge}')
var mailList = []
var PIDataObjList = {}
@@ -1965,7 +1966,7 @@
for(var i=0;i<mailListObj.length;i++){
- mailList.push(mailListObj[i].mm.AWS_Data_Id__c)
+ mailList.push(mailListObj[i])
}
var queryBack = function queryBack(data){
console.log(data)
--
Gitblit v1.9.1