From 08a21f49f2eaf9cfc19ceb67b196cc36ba689305 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 13 五月 2022 20:52:25 +0800
Subject: [PATCH] FIxSWOPageIssue
---
force-app/main/default/pages/SWOPage.page | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/pages/SWOPage.page b/force-app/main/default/pages/SWOPage.page
index 3f46928..ec2d8f2 100644
--- a/force-app/main/default/pages/SWOPage.page
+++ b/force-app/main/default/pages/SWOPage.page
@@ -14,7 +14,7 @@
var staticResources = JSON.parse('{!staticResource}');
var contactstaticResource = JSON.parse('{!contactstaticResource}');
var aws_data = {};
- console.log('AWS' + {!contactAWSDataId});
+ console.log('AWS' + '{!contactAWSDataId}');
var isNew = {!isNew};
console.log('isNew: ' + isNew);
@@ -30,7 +30,8 @@
let d = aws_data[id];
let $e =j$("[aws-id='"+d.dataId+ "']");
$e.each((i,e)=>{
- j$(e).html(d[j$(e).attr("aws-api")]);
+ //j$(e).html(d[j$(e).attr("aws-api")]);
+ j$(e).attr('value',d[j$(e).attr("aws-api")])
})
}
@@ -303,7 +304,7 @@
// doctorDivision1 : document.getElementById("Page:mainForm:idSearchVisitor:updateContactDoctorDivision").value,
// dataId:selectedAwsDataId
contactNameHidden: document.getElementById("Page:mainForm:CONTACT_NAME_HIDDEN__c").value,
- dataId:swoId
+ dataId:'{!swoawsDataId}'
}]);
}
@@ -350,7 +351,10 @@
"sfRecordId":swoId,
"isSuccess":1
}), function(result){
- window.location.reload();
+ //let id = document.getElementById('Page:mainForm:frontSwoId').value
+ let id = j$(escapeVfId("swoid")).value();
+ window.location.href = '/apex/SWOPageRead?id=' + id +'&type='+'{!type}';
+ //window.location.reload();
}, staticResources.token);
}
@@ -415,6 +419,7 @@
</style>
<apex:form id="mainForm" style="width: 95%; margin-left: 30px;">
+
<apex:actionFunction name="mustData" action="{!mustData}" reRender="messageInfo" oncomplete="clickColorChange('Repair')"></apex:actionFunction>
<apex:actionFunction name="repairReturn" action="{!init}" reRender="mainForm" >
<apex:param name="swoid" assignTo="{!swoid}" value="" /><!-- mailRepair mainForm-->
@@ -423,7 +428,9 @@
</apex:actionFunction>
<apex:actionFunction name="uploadFile" action="{!uploadFile}"></apex:actionFunction>
<!-- Add save method for PIPL 20220414 by Li Jun Start -->
- <apex:actionFunction name="saveNew" action="{!save}" reRender="swoid" onComplete="Trans()">
+ <apex:inputHidden id="frontSwoId" value="{!frontSwoId}" />
+ <apex:actionFunction name="saveNew" action="{!save}" reRender="swoid,frontSwoId" onComplete="Trans()">
+ <apex:param name="frontCaseId" assignto="{!caseId}" value="{!caseId}"/>
</apex:actionFunction>
<!-- Add save method for PIPL 20220414 by Li Jun End -->
<input type="hidden" id="baseUrl" value="{!baseUrl}"/>
@@ -514,7 +521,7 @@
<!-- <td colspan="2"><apex:inputField value="{!swo.CONTACT_NAME_HIDDEN__c}"/></td> -->
<td colspan="2" >
<apex:inputHidden id="AWS_Data_Id__c" value="{!swo.AWS_Data_Id__c}"/>
- <apex:inputField html-aws-obj="SWO__c" html-aws-api="CONTACT_NAME_HIDDEN__c" html-aws-id="{!swo.AWS_Data_Id__c}" id="CONTACT_NAME_HIDDEN__c" value="{!swo.CONTACT_NAME_HIDDEN__c }" />
+ <apex:inputField html-aws-obj="SWO__c" html-aws-api="contactNameHidden" html-aws-id="{!swo.AWS_Data_Id__c}" id="CONTACT_NAME_HIDDEN__c" value="{!swo.CONTACT_NAME_HIDDEN__c }" />
</td>
<!-- Update By Yanan -->
</tr>
@@ -941,7 +948,8 @@
<!-- 20220313 PI鏀归�� by Chen Yanan -->
<!-- <td><apex:outputField value="{!swo.CONTACT__c}" ></apex:outputField></td> -->
<td colspan="2" align="left" >
- <a href="/{!swo.CONTACT__c}" aws-obj="Contact" aws-api="lastName" aws-id="{!contactAWSDataId}">{!swo.CONTACT__r.Name}</a>
+ <!-- <a href="/{!swo.CONTACT__c}" aws-obj="Contact" aws-api="lastName" aws-id="{!contactAWSDataId}">{!swo.CONTACT__r.Name}</a> -->
+ <a href="/{!swo.CONTACT__c}" aws-obj="Contact" aws-api="lastName" aws-id="{!contactAWSDataId}">{!contactName}</a>
</td>
<!-- 20220313 PI鏀归�� by Chen Yanan -->
<td><apex:inputField value="{!swo.TRAN__c}"/></td>
@@ -1623,9 +1631,9 @@
<apex:repeat id="attachmentList" value="{!attachmentList}" var="attachment">
<tr style="text-align:center; vertical-align: middle;">
<!-- <td><input value="{!attachment.Name}" readonly="readonly" style="border:none;"/></td> -->
- <td><apex:outputLink value="/{!attachment.Id}">{!attachment.Name}</apex:outputLink></td>
+ <td><apex:outputLink value="/{!attachment.Id}">{!attachment.FileName__c}</apex:outputLink></td>
<td><apex:inputField value="{!attachment.CreatedDate}"/></td>
- <td><apex:inputField value="{!attachment.BodyLength}"/></td>
+ <!-- <td><apex:inputField value="{!attachment.BodyLength}"/></td>-->
</tr>
</apex:repeat>
</table>
--
Gitblit v1.9.1