From cdff37596ef14a95a3e557b0d978f50140410308 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期二, 10 五月 2022 16:17:59 +0800
Subject: [PATCH] 【委托】URF限次修理合同的最高价格修改
---
force-app/main/default/pages/BatchSelectRepairPage.page | 92 ++++++++++++++++++++-------------------------
1 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/force-app/main/default/pages/BatchSelectRepairPage.page b/force-app/main/default/pages/BatchSelectRepairPage.page
index a5291dd..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:Form:Block:j_id53: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:Form:Block:j_id53: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:Form:Block:j_id53: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();"/>
@@ -99,51 +79,63 @@
<apex:pageBlock title="妫�绱㈠垪" id="Editable">
<table>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
- <apex:repeat value="{!RevalInfoList}" var="reval" id="RevalInfoList">
<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="{!reval.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="{!reval.RepairName}"/>
+ <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;">
- <apex:inputText id="SAPRepairNo" value="{!reval.SAPRepairNo}"/>
+ <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="{!reval.SerialNumber}"/>
+ <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="{!reval.repair.Incharge_Staff__c}"/>
+ <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="{!reval.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>
- </apex:repeat>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
<tr>
<td style="text-align: center;" colspan="6">
@@ -152,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();"/>
@@ -163,14 +154,14 @@
<th style="text-align:left; width:6%">鐘舵��1</th>
<th style="text-align:left; width:6%">鐘舵��2</th>
<th style="text-align:left; width:7%">RS淇悊鍗曞彿</th>
- <th style="text-align:left; width:10%">SAP淇悊鍗曞彿</th>
+ <th style="text-align:left; width:8%">SAP淇悊鍗曞彿</th>
<th style="text-align:left; width:10%">鍨嬪彿</th>
<th style="text-align:left; width:5%">鏈鸿韩缂栧彿</th>
- <th style="text-align:left; width:8%">鍖婚櫌鍚嶇О</th>
+ <th style="text-align:left; width:9%">鍖婚櫌鍚嶇О</th>
<th style="text-align:left; width:5%">鐪佷唤</th>
<th style="text-align:left; width:5%">淇悊濮旀墭鑰�</th>
<th style="text-align:left; width:8%">FSE鐢宠鏃ユ湡</th>
- <th style="text-align:left; width:5%">缁翠慨涓績</th>
+ <th style="text-align:left; width:6%">缁翠慨涓績</th>
<th style="text-align:left; width:5%">鏈嶅姟鏂瑰紡</th>
<th style="text-align:left; width:8%">鏈夋棤缁翠慨鍚堝悓瀵硅薄</th>
<th style="text-align:left; width:8%">鏃犲伩鍖哄埆鏍囧織</th>
@@ -191,16 +182,16 @@
<td align="left" width="7%">
<apex:outputField id="OTCode" value="{!ra.repair.Name}"/>
</td>
- <td align="left" width="10%">
+ <td align="left" width="8%">
<apex:outputField id="SAP_Service_Repair_No" value="{!ra.repair.SAP_Service_Repair_No__c}"/>
</td>
<td align="left" width="10%">
<apex:outputField id="Delivered_Product" value="{!ra.repair.Delivered_Product__c}"/>
</td>
- <td align="left" width="5%">
+ <td align="left" width="5%" style="word-wrap:break-word;word-break:break-all;">
<apex:outputField id="SerialNumber" value="{!ra.repair.SerialNumber__c}"/>
</td>
- <td align="left" width="8%">
+ <td align="left" width="9%">
<apex:outputField id="HP_Name" value="{!ra.repair.HP_Name__c}"/>
</td>
<td align="left" width="5%">
@@ -212,7 +203,7 @@
<td align="left" width="8%">
<apex:outputField id="FSE_ApplyForRepair_Day" value="{!ra.repair.FSE_ApplyForRepair_Day__c}"/>
</td>
- <td align="left" width="5%">
+ <td align="left" width="6%">
<apex:outputField id="work_location_select" value="{!ra.repair.work_location_select__c}"/>
</td>
<td align="left" width="5%">
@@ -229,7 +220,6 @@
</table>
</div>
</apex:pageBlock>
- <!-- </div> -->
</div>
</apex:pageBlock>
</apex:outputPanel>
--
Gitblit v1.9.1