From 17b4d477edf91f55ffce09b2e180c9308431488a Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 18 七月 2023 17:09:44 +0800
Subject: [PATCH] hql20230718Page提交
---
force-app/main/default/pages/NewPaymentPlanLoad.page | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/NewPaymentPlanLoad.page b/force-app/main/default/pages/NewPaymentPlanLoad.page
index 135f02b..026c5a5 100644
--- a/force-app/main/default/pages/NewPaymentPlanLoad.page
+++ b/force-app/main/default/pages/NewPaymentPlanLoad.page
@@ -4,7 +4,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<style type="text/css">
.BlockSytle{
- width: 1000px;
+ width: 1300px;
}
.PageStyleCss{
width: 980px;
@@ -30,6 +30,11 @@
Initdisabled();
}
+ window.addEventListener('DOMContentLoaded', function() {
+ var pageBlock = document.getElementById('{!$Component.allBlock}');
+ pageBlock.style.border = 'none';
+ pageBlock.style.boxShadow = 'none';
+ });
function Convert_All_Amount() {
var Total_Contract_Amount = j$(escapeVfId('allPage:allForm:Contract_Amount_Hidden')).val();
var Total_Contract_Amount_In_Words = j$(escapeVfId('allPage:allForm:Total_Contract_Amount_In_Words_Hidden')).val();
@@ -215,7 +220,11 @@
// fxk 2021/8/31 鐐规娆℃暟蹇呴』濉� end
// window.opener.top.location.href = '/{!PageMCEElement.id}';
// top.window.close();
- window.close();
+ setTimeout(function(){
+ window.location.href = '/{!PageMCEElement.id}';
+ }, 1500 );
+
+ // window.close();
unblockUI();
}else{
unblockUI();
@@ -311,16 +320,17 @@
<apex:inputHidden value="{!PageMCEElement.Payment_Plan_Sum_Sixth_in_Word__c}" id="Payment_Plan_Sum_6_in_Word_Hidden"/>
</apex:outputPanel>
- <apex:pageBlock id="allBlock" >
+ <apex:pageBlock id="allBlock">
<apex:outputPanel id="Messages" style="color:red">
- <apex:messages />
+ <!-- <apex:messages /> -->
+ <apex:pageMessages />
</apex:outputPanel>
<table border="0" >
<colgroup>
<col width="25%"/>
+ <col width="45%"/>
<col width="25%"/>
- <col width="25%"/>
- <col width="25%"/>
+ <col width="5%"/>
</colgroup>
<tr>
<td style ="text-align: right;">
@@ -329,7 +339,7 @@
<td style ="text-align: left;">
<div class="requiredInput"><div class="requiredBlock"></div>
<apex:inputField id="Is_Standard_Contract" value="{!PageMCEElement.Is_Standard_Contract__c}" onchange="RerenderallpageBlockJS(); "/>
- (蹇呭～椤癸紝鎵�鏈夊悎鍚屽潎蹇呴』鍕鹃��)
+ (蹇呭～椤癸紝鎵�鏈夊悎鍚屽潎蹇呴』鍕鹃��)
</div>
</td>
<td/>
@@ -623,12 +633,12 @@
</apex:pageBlockSection>
<apex:pageBlockButtons id="allButtons">
<apex:outputPanel rendered="{!IF(PageMCEElement.Status__c != '寮曞悎涓�', 'true', 'false')}">
- <apex:commandButton styleClass="align-save-button" disabled="true" id="SaveButton1" value="淇濆瓨" action="{!save}" onclick="blockme();" reRender="hiddenInput,Messages" oncomplete="CloseJs();"/>
+ <apex:commandButton styleClass="align-save-button" disabled="true" id="SaveButton1" value="淇濆瓨" action="{!save}" onclick="blockme();" reRender="hiddenInput,Messages" style="margin-top:-2px" oncomplete="CloseJs();"/>
<apex:commandButton disabled="true" id="CancelButton1" value="鍙栨秷" onclick="CloseJs(); return false;"/>
<apex:commandButton disabled="true" id="PrintButton1" value="鎵撳嵃" action="{!print}" onclick="blockme();" rerender="hiddenInput,Messages,pdfPrint" oncomplete="PrintJs();" />
</apex:outputPanel>
<apex:outputPanel id="bottom" rendered="{!IF(PageMCEElement.Status__c == '寮曞悎涓�', 'true', 'false')}">
- <apex:commandButton id="SaveButton" value="淇濆瓨" action="{!save}" onclick="blockme();" reRender="hiddenInput,Messages" oncomplete="CloseJs();"/>
+ <apex:commandButton id="SaveButton" value="淇濆瓨" action="{!save}" onclick="blockme();" reRender="hiddenInput,Messages" oncomplete="CloseJs();" style="margin-top:-2px"/>
<apex:commandButton id="CancelButton" value="鍙栨秷" onclick="CloseJs(); return false;"/>
<apex:commandButton id="PrintButton" value="鎵撳嵃" action="{!print}" onclick="blockme();" rerender="hiddenInput,Messages,pdfPrint" oncomplete="PrintJs();" />
</apex:outputPanel>
@@ -643,28 +653,29 @@
function PrintJs() {
var Rs = j$(escapeVfId('allPage:allForm:statusSave')).value();
if(Rs == 'Fin'){
+ // CloseJs();
unblockUI();
if ('{!printContract}' == 'true') {
//HWAG-BHT7XX 2019/11/26 START
if('{!agreeUpperLimit}' == 'true'){
// 鎵撳嵃鍖婚櫌闄愭鍚堝悓閰嶇疆
window.open('/apex/NewMCHPDFLimit?id={!PageMCEElement.id}', 'MCHLimitPDF');
- window.close();
+ // window.close();
}else{
// 鎵撳嵃鍖婚櫌鍚堝悓閰嶇疆
window.open('/apex/NewMCHPDF?id={!PageMCEElement.id}', 'MCHPDF');
- window.close();
+ // window.close();
}
//HWAG-BHT7XX 2019/11/26 END
}else if ('{!printAgent}' == 'true') {
if('{!agreeUpperLimit}' == 'true'){
//鎵撳嵃缁忛攢鍟嗛檺娆″悎鍚�
window.open('/apex/NewMCAgentPDFLimit?id={!PageMCEElement.id}', 'MCAgentLimitPDF');
- window.close()
+ // window.close()
}else{
//鎵撳嵃缁忛攢鍟嗗悎鍚�
window.open('/apex/NewMCAgentPDF?id={!PageMCEElement.id}', 'MCHPDF');
- window.close();
+ // window.close();
}
}else {
alert('1');
--
Gitblit v1.9.1