From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/pages/RentalApplyJump.page | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/force-app/main/default/pages/RentalApplyJump.page b/force-app/main/default/pages/RentalApplyJump.page
index fafbe77..4d38834 100644
--- a/force-app/main/default/pages/RentalApplyJump.page
+++ b/force-app/main/default/pages/RentalApplyJump.page
@@ -25,15 +25,15 @@
}
}
function checkAll() {
- j$("table td.col_chk input").each(function(){
- if(!this.disabled) {
- this.checked = j$("input#checker").prop('checked');
- }
- })
- }
- function syJs() {
- var cnt = j$("#infoListSize").value();
- console.log(cnt);
+ j$("table td.col_chk input").each(function(){
+ if(!this.disabled) {
+ this.checked = j$("input#checker").prop('checked');
+ }
+ })
+ }
+ function syJs() {
+ var cnt = j$("#infoListSize").value();
+ console.log(cnt);
var Loaner_jump_Remarks = j$("#jumpReason").value();
console.log(Loaner_jump_Remarks);
for (var i = 0; i < cnt; i++) {
@@ -42,18 +42,18 @@
j$(escapeVfId('allPage:allForm:searchBlock:raesdLists:' + i + ':jumpReason_row')).val(Loaner_jump_Remarks);
}
}
- }
+ }
</script>
<apex:pageMessages />
<input type="hidden" id="infoListSize" value="{!infoListSize}" />
<apex:inputHidden value="{!saveStatus}" id="saveStatus"/>
<div style="margin: 10px 15px;">
- <table>
+ <table>
<tr>
- <td align="left">
+ <td align="left">
鎻掗槦鍘熷洜锛�
</td>
- <td align="left">
+ <td align="left">
<textarea rows="2" cols="60" name="jumpReason" id= "jumpReason" ></textarea>
</td>
<td align="left">
@@ -65,30 +65,30 @@
</div>
<apex:pageBlock id="searchBlock" tabStyle="Report">
<apex:dataTable value="{!infoList}" var="info" id="raesdLists" border="1" cellpadding="5">
- <apex:column html-class="col_chk">
- <apex:facet name="header">鍏ㄩ��<input type='checkbox' onClick='checkAll();' id="checker"/></apex:facet>
- <apex:inputCheckbox value="{!info.isSelect}" id="rowCheck"/>
- </apex:column>
- <apex:column >
- <apex:facet name="header">鍊熷嚭澶囧搧閰嶅涓�瑙圢o.</apex:facet>
- <apex:outputField value="{!info.raesd.Rental_Apply_Equipment_Set__c}" />
- </apex:column>
- <apex:column >
- <apex:facet name="header">鍊熷嚭閰嶅鍨嬪彿</apex:facet>
- <apex:outputField value="{!info.raesd.Fixture_Model_No__c}" />
- </apex:column>
- <apex:column >
- <apex:facet name="header">鍊熷嚭澶囧搧閰嶅涓�瑙堟槑缁嗙姸鎬�</apex:facet>
- <apex:outputField value="{!info.raesd.RAESD_Status__c}" />
- </apex:column>
+ <apex:column html-class="col_chk">
+ <apex:facet name="header">鍏ㄩ��<input type='checkbox' onClick='checkAll();' id="checker"/></apex:facet>
+ <apex:inputCheckbox value="{!info.isSelect}" id="rowCheck"/>
+ </apex:column>
+ <apex:column >
+ <apex:facet name="header">鍊熷嚭澶囧搧閰嶅涓�瑙圢o.</apex:facet>
+ <apex:outputField value="{!info.raesd.Rental_Apply_Equipment_Set__c}" />
+ </apex:column>
+ <apex:column >
+ <apex:facet name="header">鍊熷嚭閰嶅鍨嬪彿</apex:facet>
+ <apex:outputField value="{!info.raesd.Fixture_Model_No__c}" />
+ </apex:column>
+ <apex:column >
+ <apex:facet name="header">鍊熷嚭澶囧搧閰嶅涓�瑙堟槑缁嗙姸鎬�</apex:facet>
+ <apex:outputField value="{!info.raesd.RAESD_Status__c}" />
+ </apex:column>
<!-- <apex:column >
<apex:facet name="header">鏄惁鍏佽鎻掗槦</apex:facet>
<apex:inputField value="{!info.raesd.Allow_Adjust_Queue_Flag__c}" id="Allow_Adjust_Queue_Flag"/>
</apex:column> -->
- <apex:column >
- <apex:facet name="header">鎻掗槦鍘熷洜</apex:facet>
- <apex:inputField value="{!info.raesd.jumpReason__c}" id="jumpReason_row"/>
- </apex:column>
+ <apex:column >
+ <apex:facet name="header">鎻掗槦鍘熷洜</apex:facet>
+ <apex:inputField value="{!info.raesd.jumpReason__c}" id="jumpReason_row"/>
+ </apex:column>
</apex:dataTable>
<div style="height: 15px"></div>
<apex:commandButton value="纭鎻掗槦" action="{!saveJump}" oncomplete="alertSuccess();checkSaveStatus();unblockUI();" onclick="blockme();" rerender="allForm" />
--
Gitblit v1.9.1