From 3a414ec8f1715b3b72e06f8598e08e6a8729ca23 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期四, 24 三月 2022 17:41:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/pages/BatchSelectRepairPage.page | 68 +++++++++++++++-------------------
1 files changed, 30 insertions(+), 38 deletions(-)
diff --git a/force-app/main/default/pages/BatchSelectRepairPage.page b/force-app/main/default/pages/BatchSelectRepairPage.page
index 5cf2d1a..0dd6f47 100644
--- a/force-app/main/default/pages/BatchSelectRepairPage.page
+++ b/force-app/main/default/pages/BatchSelectRepairPage.page
@@ -55,36 +55,16 @@
//鍏ㄩ�夊姛鑳�
function checkAll() {
var cnt = j$(escapeVfId('raCnt')).val();
- if (j$(escapeVfId('Page:allForm:allBlock:j_id56:checkAll')).attr('checked') == 'checked') {
+ if (j$(escapeVfId('Page:allForm:allBlock:j_id66:checkAll')).attr('checked') == 'checked') {
for (var i = 0; i < cnt; i++) {
- j$(escapeVfId('Page:allForm:allBlock:j_id56:records:' + i + ':checklist')).attr('checked',true);
+ j$(escapeVfId('Page:allForm:allBlock:j_id66:records:' + i + ':checklist')).attr('checked',true);
}
} else {
for (var i = 0; i < cnt; i++) {
- j$(escapeVfId('Page:allForm:allBlock:j_id56:records:' + i + ':checklist')).attr('checked',false);
+ j$(escapeVfId('Page:allForm:allBlock:j_id66:records:' + i + ':checklist')).attr('checked',false);
}
}
}
- //妫�绱㈠姛鑳�
- // function RetrievalBtnJS() {
- // var RepairName = j$(escapeVfId("Page:Form:Block:RAInfoList:0:RepairName")).value();
- // var SAPRepairNo = j$(escapeVfId("Page:Form:Block:RAInfoList:0:SAPRepairNo")).value();
- // var HospitalName = j$(escapeVfId("Page:Form:Block:RAInfoList:0:HospitalName")).value();
- // blockme();
- // RetrievalBtn();
- // }
- //璺宠浆鎵撳嵃PDF椤甸潰
- // function showPDFJS() {
- // blockme();
- // showPDF();
- // var raIdList = j$(escapeVfId('raIdList')).val();
- // if(raIdList != null && raIdList != ''){
- // var Id = raIdList.split();
- // for(var i = 0; i < Id.size(); i++){
- // window.open('apex/MaintenanceCommissionPDF?id=' + Id[i]);
- // }
- // }
- // }
</script>
<apex:form id="allForm" style="margin: 10px 10px;">
<apex:actionFunction name="RetrievalBtn" action="{!RetrievalBtn}" rerender="Form, message" onComplete="unblockUI();"/>
@@ -100,46 +80,60 @@
<table>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
<tr>
- <!-- <td style="text-align: left;padding-right: 100px;"> </td> -->
- <td style="text-align: right; width:200px;">
- <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="鐘舵��2"/>
+ <td style="text-align: right; width:100px;">
+ <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="鐘舵��1"/>
</td>
- <td style="text-align: left;">
- <apex:inputText id="Status2" value="{!RevalInfo.Status2}"/>
+ <td style="text-align: left;position: relative; top: 7px;">
+ <apex:selectList value="{!RevalInfo.Status1}" size="1" style="width: 150px; height: 24px;">
+ <apex:selectOptions value="{!StatusItems}"/>
+ </apex:selectList><p/>
</td>
- <td style="text-align: right; width:200px;">
+ <td style="text-align: right; width:150px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="RS淇悊鍗曞彿"/>
</td>
<td style="text-align: left;">
<apex:inputText id="RepairName" value="{!RevalInfo.RepairName}"/>
</td>
- <td style="text-align: right; width:150px;">
+ <td style="text-align: right; width:130px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="SAP淇悊鍗曞彿"/>
</td>
- <td style="text-align: left;padding-right: 100px;">
+ <td style="text-align: left;padding-right: 70px;">
<apex:inputText id="SAPRepairNo" value="{!RevalInfo.SAPRepairNo}"/>
+ </td>
+ <td style="text-align: right; width:60px;">
+ <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="鏈嶅姟鏂瑰紡"/>
+ </td>
+ <td style="text-align: left;position: relative; top: 7px;">
+ <apex:selectList value="{!RevalInfo.onSiteRepair}" size="1" style="width: 150px; height: 24px;">
+ <apex:selectOptions value="{!SiteRepairItems}"/>
+ </apex:selectList><p/>
</td>
</tr>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
<tr>
- <!-- <td style="text-align: left;padding-right: 100px;"> </td> -->
<td style="text-align: right; width:100px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="鏈鸿韩缂栫爜"/>
</td>
<td style="text-align: left;">
<apex:inputText id="SerialNumber" value="{!RevalInfo.SerialNumber}"/>
</td>
- <td style="text-align: right; width:200px;">
+ <td style="text-align: right; width:150px;">
<apex:outputLabel style="font-weight: bold; " value="淇悊濮旀墭鑰�"/>
</td>
<td style="text-align: left;">
<apex:inputField id="InchargeStaffName" value="{!RevalInfo.repair.Incharge_Staff__c}"/>
</td>
- <td style="text-align: right; width:150px;">
+ <td style="text-align: right; width:130px;">
<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="FSE鐢宠鏃�"/>
</td>
- <td style="text-align: left;padding-right: 80px;">
- <apex:inputField id="FSE_ApplyForRepair_Day" value="{!RevalInfo.repair.Final_complete_day__c}"/>
+ <td style="text-align: left;padding-right: 50px;">
+ <apex:inputField id="FSE_ApplyForRepair_Day" value="{!RevalInfo.repair.Aware_date__c}"/>
+ </td>
+ <td style="text-align: right; width:60px;">
+ <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="缁翠慨涓績"/>
+ </td>
+ <td style="text-align: left;">
+ <apex:inputText id="workLocationSelect" value="{!RevalInfo.workLocationSelect}"/>
</td>
</tr>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
@@ -150,7 +144,6 @@
</tr>
</table>
</apex:pageBlock>
- <!-- <div style="font-size:12px;"> -->
<apex:pageBlock title="璇︾粏淇℃伅" >
<input type="hidden" id="raCnt" value="{!RACount}" />
<apex:commandButton style="width:80px;" value="鎵撳嵃PDF" action="{!showPDF}" onclick="blockme();" reRender="allForm,message" onComplete="unblockUI();"/>
@@ -227,7 +220,6 @@
</table>
</div>
</apex:pageBlock>
- <!-- </div> -->
</div>
</apex:pageBlock>
</apex:outputPanel>
--
Gitblit v1.9.1