From 6945f4e865d3f6ba831515fe51e4e6167cd2077b Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 04 五月 2023 10:19:07 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page | 196 ++++++++++++++++++++++++------------------------
1 files changed, 99 insertions(+), 97 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page b/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page
index ac381b6..9c66aca 100644
--- a/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page
+++ b/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page
@@ -1,100 +1,102 @@
-<apex:page Controller="ConsumEquipmentRentalResponseController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
-<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
-<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<script>
-function savejs() {
- blockme();
- savebtn();
-}
-
-function canceljs() {
- top.window.close();
-}
-
-function refreshparent() {
- // var hasError = j$(escapeVfId('allPage:allForm:allBlock:hasError')).text();
- // if (hasError == 'false') {
- // top.window.opener.reloadjs();
- // top.window.close();
- // }
- // 20211123 ljh 搴旂瓟娌熼�� update start
- var hasError = j$(escapeVfId('allPage:allForm:hasError')).text();
- console.log(hasError);
- if (hasError == 'false') {
- window.open("/{!raid}");
- top.window.close();
- }
- // 20211123 ljh 搴旂瓟娌熼�� update end
-}
-</script>
- <apex:form id="allForm">
- <!-- 20211105 ljh 搴旂瓟娌熼�� update start -->
- <!-- <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="allPanel,message" onComplete="unblockUI();refreshparent();">
- </apex:actionFunction> -->
- <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="message" onComplete="unblockUI();refreshparent();">
- </apex:actionFunction>
- <apex:outputPanel id="message">
- <apex:pageMessages />
- <apex:outputText id="hasError" value="{!hasError}" style="display:none"/>
- </apex:outputPanel>
- <!-- 20211105 ljh 搴旂瓟娌熼�� update end -->
- <apex:outputPanel id="allPanel">
- <apex:pageBlock title="{!$ObjectType.Consum_Apply__c.fields.Response__c.label}" id="allBlock">
- <apex:pageBlockButtons location="top">
- <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="鍙戦��" rerender="dummy"/>
- <apex:commandButton onclick="canceljs(); return false;" value="鍙栨秷" rerender="dummy"/>
- </apex:pageBlockButtons>
+<!-- zq <apex:page Controller="ConsumEquipmentRentalResponseController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
+ <apex:page lightningStylesheets = "true" Controller="ConsumEquipmentRentalResponseController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+ <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+ <script>
+ function savejs() {
+ blockme();
+ savebtn();
+ }
+
+ function canceljs() {
+ top.window.close();
+ }
+
+ function refreshparent() {
+ // var hasError = j$(escapeVfId('allPage:allForm:allBlock:hasError')).text();
+ // if (hasError == 'false') {
+ // top.window.opener.reloadjs();
+ // top.window.close();
+ // }
+ // 20211123 ljh 搴旂瓟娌熼�� update start
+ var hasError = j$(escapeVfId('allPage:allForm:hasError')).text();
+ console.log(hasError);
+ if (hasError == 'false') {
+ window.open("/{!raid}");
+ top.window.close();
+ }
+ // 20211123 ljh 搴旂瓟娌熼�� update end
+ }
+ </script>
+ <apex:form id="allForm">
<!-- 20211105 ljh 搴旂瓟娌熼�� update start -->
- <!-- <apex:outputPanel id="message">
+ <!-- <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="allPanel,message" onComplete="unblockUI();refreshparent();">
+ </apex:actionFunction> -->
+ <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="message" onComplete="unblockUI();refreshparent();">
+ </apex:actionFunction>
+ <apex:outputPanel id="message">
<apex:pageMessages />
- </apex:outputPanel> -->
-
- <apex:outputText id="raid" value="{!raid}" style="display:none"/>
- <!-- <apex:outputText id="hasError" value="{!hasError}" style="display:none"/> -->
+ <apex:outputText id="hasError" value="{!hasError}" style="display:none"/>
+ </apex:outputPanel>
<!-- 20211105 ljh 搴旂瓟娌熼�� update end -->
- <table>
- <tr>
- <td>To锛�</td>
- <td>
- <apex:outputPanel layout="none" rendered="{!IF(type='response2center', true, false)}">
- <apex:outputText value="{!ra.Loaner_centre_mail_address__c}"/>
- </apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!IF(type='response2user', true, false)}">
- <apex:outputText value="{!ra.Person_In_Charge__r.Name}"/>锛�
- <apex:outputText value="{!ra.ApplyUser__r.Name}"/>(鎿嶄綔鑰�)
- </apex:outputPanel>
- </td>
- </tr>
- <tr>
- <td>Cc锛�</td>
- <td><apex:inputField value="{!cc.JingliApprovalManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.SalesManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.BuchangApprovalManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.BuchangApprovalManagerSales__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.ZongjianApprovalManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;"/>
- </td>
- </tr>
- </table>
-
- </apex:pageBlock>
- </apex:outputPanel>
- </apex:form>
-</apex:page>
\ No newline at end of file
+ <apex:outputPanel id="allPanel">
+ <apex:pageBlock title="{!$ObjectType.Consum_Apply__c.fields.Response__c.label}" id="allBlock">
+ <apex:pageBlockButtons location="top">
+ <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="鍙戦��" rerender="dummy"/>
+ <apex:commandButton onclick="canceljs(); return false;" value="鍙栨秷" rerender="dummy"/>
+ </apex:pageBlockButtons>
+ <!-- 20211105 ljh 搴旂瓟娌熼�� update start -->
+ <!-- <apex:outputPanel id="message">
+ <apex:pageMessages />
+ </apex:outputPanel> -->
+
+ <apex:outputText id="raid" value="{!raid}" style="display:none"/>
+ <!-- <apex:outputText id="hasError" value="{!hasError}" style="display:none"/> -->
+ <!-- 20211105 ljh 搴旂瓟娌熼�� update end -->
+ <table>
+ <tr>
+ <td>To锛�</td>
+ <td>
+ <apex:outputPanel layout="none" rendered="{!IF(type='response2center', true, false)}">
+ <apex:outputText value="{!ra.Loaner_centre_mail_address__c}"/>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!IF(type='response2user', true, false)}">
+ <apex:outputText value="{!ra.Person_In_Charge__r.Name}"/>锛�
+ <apex:outputText value="{!ra.ApplyUser__r.Name}"/>(鎿嶄綔鑰�)
+ </apex:outputPanel>
+ </td>
+ </tr>
+ <tr>
+ <td>Cc锛�</td>
+ <td><apex:inputField value="{!cc.JingliApprovalManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.SalesManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.BuchangApprovalManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.BuchangApprovalManagerSales__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.ZongjianApprovalManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <!--zq <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;"/> -->
+ <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;margin:10px 0px;"/>
+ </td>
+ </tr>
+ </table>
+
+ </apex:pageBlock>
+ </apex:outputPanel>
+ </apex:form>
+ </apex:page>
\ No newline at end of file
--
Gitblit v1.9.1