From 34d9607524cad4f765299b28b4f9423cc2fa9e32 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期三, 23 三月 2022 18:07:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/pages/BatchSelectRepairPage.page | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/pages/BatchSelectRepairPage.page b/force-app/main/default/pages/BatchSelectRepairPage.page
index a5291dd..5cf2d1a 100644
--- a/force-app/main/default/pages/BatchSelectRepairPage.page
+++ b/force-app/main/default/pages/BatchSelectRepairPage.page
@@ -55,13 +55,13 @@
//鍏ㄩ�夊姛鑳�
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_id56: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_id56: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_id56:records:' + i + ':checklist')).attr('checked',false);
}
}
}
@@ -99,26 +99,25 @@
<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>
<td style="text-align: left;">
- <apex:inputText id="Status2" value="{!reval.Status2}"/>
+ <apex:inputText id="Status2" value="{!RevalInfo.Status2}"/>
</td>
<td style="text-align: right; width:200px;">
<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;">
<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}"/>
+ <apex:inputText id="SAPRepairNo" value="{!RevalInfo.SAPRepairNo}"/>
</td>
</tr>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
@@ -128,22 +127,21 @@
<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;">
<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;">
<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}"/>
+ <apex:inputField id="FSE_ApplyForRepair_Day" value="{!RevalInfo.repair.Final_complete_day__c}"/>
</td>
</tr>
- </apex:repeat>
<tr><td style="text-align: left;padding-right: 100px;"> </td></tr>
<tr>
<td style="text-align: center;" colspan="6">
@@ -163,14 +161,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 +189,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 +210,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%">
--
Gitblit v1.9.1