From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容

---
 force-app/main/default/pages/BatchSelectRepairPage.page |  235 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 151 insertions(+), 84 deletions(-)

diff --git a/force-app/main/default/pages/BatchSelectRepairPage.page b/force-app/main/default/pages/BatchSelectRepairPage.page
index 3902036..a5291dd 100644
--- a/force-app/main/default/pages/BatchSelectRepairPage.page
+++ b/force-app/main/default/pages/BatchSelectRepairPage.page
@@ -1,12 +1,10 @@
 <apex:page id="Page" showHeader="false" sidebar="false" controller="BatchSelectRepairPageController" applyBodyTag="false" applyHtmlTag="false" action="{!init}">
-<head>
-    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-    <!-- <apex:stylesheet value="{!URLFOR($Resource.jquerysuggestcss)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.jquerysuggestjs)}"/> -->
-    <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
-    <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
     <title>鎵归噺閫夋嫨淇悊鍔熻兘</title>
     <style type="text/css">
         .pure-table {
@@ -16,7 +14,7 @@
             border: 1px solid #cbcbcb;
             width: 100%;
         }
- 
+
         .pure-table caption {
             color: #000;
             font: italic 85%/1 arial,sans-serif;
@@ -57,15 +55,15 @@
         //鍏ㄩ�夊姛鑳�
         function checkAll() {
             var cnt = j$(escapeVfId('raCnt')).val();
-            if (j$(escapeVfId('Page:Form:Block:j_id47:checkAll')).attr('checked') == 'checked') {
+            if (j$(escapeVfId('Page:Form:Block:j_id53:checkAll')).attr('checked') == 'checked') {
                 for (var i = 0; i < cnt; i++) {
-                    j$(escapeVfId('Page:Form:Block:j_id47:records:' + i + ':checklist')).attr('checked',true);
+                    j$(escapeVfId('Page:Form:Block:j_id53:records:' + i + ':checklist')).attr('checked',true);
                 }
-			} else {
+            } else {
                 for (var i = 0; i < cnt; i++) {
-                    j$(escapeVfId('Page:Form:Block:j_id47:records:' + i + ':checklist')).attr('checked',false);
+                    j$(escapeVfId('Page:Form:Block:j_id53:records:' + i + ':checklist')).attr('checked',false);
                 }
-			}     
+            }
         }
         //妫�绱㈠姛鑳�
         // function RetrievalBtnJS() {
@@ -88,83 +86,152 @@
         //     }
         // }
     </script>
-</head>
-<body>
-    <apex:form id="Form" style="margin:10px 10px;">
+    <apex:form id="allForm" style="margin: 10px 10px;">
         <apex:actionFunction name="RetrievalBtn" action="{!RetrievalBtn}" rerender="Form, message" onComplete="unblockUI();"/>
         <!-- <apex:actionFunction name="showPDF" action="{!showPDF}" rerender="Form, message" onComplete="unblockUI();" /> -->
         <!-- 鍚庡彴鎶ラ敊淇℃伅鏄剧ず鐨勫叧閿� -->
         <apex:outputPanel id="message">
             <apex:pageMessages ></apex:pageMessages>
         </apex:outputPanel>
-        <apex:pageBlock mode="maindetail" Id="Block">
-            <div style="position: relative;top:0;width:100%;">
-                <table>
-                    <tr>
-                        <td><apex:outputLabel value="妫�绱㈤儴" style="font-size:18px;font-weight:bold;padding-right: 5px;"/></td>                        
-                    </tr>
-                    <apex:repeat value="{!RevalInfoList}" var="reval" id="RevalInfoList">
-                    <tr>
-                        <td style="text-align: center;padding-right: 100px;">&nbsp;</td>
-                        <td style="text-align: center;padding-right: 100px;">
-                            <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="淇悊鍗曞彿"/>
-                            <apex:inputText id="RepairName" value="{!reval.RepairName}"/>
-                        </td>
-                        <td style="text-align: center;padding-right: 100px;">
-                            <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="SAP鍗曞彿"/>
-                            <apex:inputText id="SAPRepairNo" value="{!reval.SAPRepairNo}"/>
-                        </td>
-                        <td style="text-align: center;padding-right: 100px;">
-                            <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="鍖婚櫌/绉戝"/>
-                            <apex:inputText id="HospitalName" value="{!reval.HospitalName}"/>
-                        </td>
-                        <td style="text-align: center;padding-right: 100px;">
-                            <apex:commandButton style="width:80px;" value="妫�绱�" action="{!RetrievalBtn}" onclick="blockme();" reRender="Form,message" onComplete="unblockUI();"/>
-                        </td>
-                    </tr>
-                    </apex:repeat>
-                </table>
-                <div style="font-size:12px; margin-top:10px">
-                    <apex:pageBlockSection title="璇︾粏淇℃伅" columns="1">
+        <apex:outputPanel id="allPanel">
+            <apex:pageBlock mode="maindetail" Id="allBlock">
+                <div style="position: relative; width:100%; ">
+                    <apex:pageBlock title="妫�绱㈠垪" id="Editable">
+                        <table>
+                            <tr><td style="text-align: left;padding-right: 100px;">&nbsp;</td></tr>
+                            <apex:repeat value="{!RevalInfoList}" var="reval" id="RevalInfoList">
+                            <tr>
+                                <!-- <td style="text-align: left;padding-right: 100px;">&nbsp;</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}"/>
+                                </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}"/>
+                                </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}"/>
+                                </td>
+                            </tr>
+                            <tr><td style="text-align: left;padding-right: 100px;">&nbsp;</td></tr>
+                            <tr>
+                                <!-- <td style="text-align: left;padding-right: 100px;">&nbsp;</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}"/>
+                                </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}"/>
+                                </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}"/>
+                                </td>
+                            </tr>
+                            </apex:repeat>
+                            <tr><td style="text-align: left;padding-right: 100px;">&nbsp;</td></tr>
+                            <tr>
+                                <td style="text-align: center;" colspan="6">
+                                    <apex:commandButton style="width:80px;" value="妫�绱�" action="{!RetrievalBtn}" onclick="blockme();" reRender="allForm,message" onComplete="unblockUI();"/>
+                                </td>
+                            </tr>
+                        </table>
+                    </apex:pageBlock>  
+                    <!-- <div style="font-size:12px;"> -->
+                    <apex:pageBlock title="璇︾粏淇℃伅" >
                         <input type="hidden" id="raCnt" value="{!RACount}" />
-                        <!-- <input type="hidden" id="raIdList" value="{!repairIdList}" /> -->
-                        <apex:outputPanel >
-                            <div style="text-align: center;"><apex:commandButton style="width:80px;" value="鎵撳嵃PDF" action="{!showPDF}" onclick="blockme();" reRender="Form,message" onComplete="unblockUI();"/></div>
-                            <div style="width:700px; height:700px; margin-left:100px; margin-top:10px;">
-                                <table class="pure-table pure-table-horizontal" id="theTable_header">
-                                    <tr style="background-color:#f2f3f3;">
-                                        <th style="align:left; width:10%"><apex:inputCheckbox id="checkAll" onclick="checkAll();" style="text-align:left;"/></th>
-                                        <th style="text-align:left; width:30%">淇悊鍗曞彿</th>
-                                        <th style="text-align:left; width:30%">绉戝</th>
-                                        <th style="text-align:left; width:30%">鍖婚櫌</th>
-                                    </tr>
-                                </table>
-                                <div style="height:500px; overflow:auto;">
-                                <table class="pure-table pure-table-horizontal" id="theTable_header" style="width: 100%">
-                                    <apex:repeat value="{!RAInfoList}" var="ra" id="records">
-                                    <tr>
-                                        <td align="left" width="10%">
-                                            <apex:inputCheckbox style="text-align:left;" id="checklist" value="{!ra.IFCheck}" />
-                                        </td>
-                                        <td align="left" width="30%">
-                                            <apex:outputField id="OTCode" value="{!ra.repair.Name}"/>
-                                        </td>
-                                        <td align="left" width="30%">
-                                            <apex:outputField id="Samplename" value="{!ra.repair.HP_Name__c}"/>
-                                        </td>
-                                        <td align="left" width="30%">
-                                            <apex:outputField id="Specs" value="{!ra.repair.Department_Name__c}"/>    
-                                        </td>
-                                    </tr>
-                                    </apex:repeat>
-                                </table>
-                                </div>
-                            </div>
-                        </apex:outputPanel>
-                    </apex:pageBlockSection>
+                        <apex:commandButton style="width:80px;" value="鎵撳嵃PDF" action="{!showPDF}" onclick="blockme();" reRender="allForm,message" onComplete="unblockUI();"/>
+                        <div style="width:100%;height:385px;overflow:auto;">
+                        <table class="pure-table pure-table-horizontal" id="theTable_header" style="width:99%; margin-top:10px;border-collapse: collapse;table-layout:fixed;">
+                            <tr style="background-color:#f2f3f3;">
+                                <th style="align:left; width:2%"><apex:inputCheckbox id="checkAll" onclick="checkAll();" style="text-align:left;"/></th>
+                                <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:10%">鍨嬪彿</th>
+                                <th style="text-align:left; width:5%">鏈鸿韩缂栧彿</th>
+                                <th style="text-align:left; width:8%">鍖婚櫌鍚嶇О</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:5%">鏈嶅姟鏂瑰紡</th>
+                                <th style="text-align:left; width:8%">鏈夋棤缁翠慨鍚堝悓瀵硅薄</th>
+                                <th style="text-align:left; width:8%">鏃犲伩鍖哄埆鏍囧織</th>
+                            </tr>
+                        </table>
+                        <table class="pure-table pure-table-horizontal" id="theTable_header" style="width:99%; border-collapse: collapse;table-layout:fixed;">
+                            <apex:repeat value="{!RAInfoList}" var="ra" id="records">
+                            <tr>
+                                <td align="left" width="2%">
+                                    <apex:inputCheckbox style="text-align:left;" id="checklist" value="{!ra.IFCheck}" />
+                                </td>
+                                <td align="left" width="6%">
+                                    <apex:outputField id="Status1" value="{!ra.repair.Status1__c}"/>
+                                </td>
+                                <td align="left" width="6%">
+                                    <apex:outputField id="Status2" value="{!ra.repair.Status2__c}"/>
+                                </td>
+                                <td align="left" width="7%">
+                                    <apex:outputField id="OTCode" value="{!ra.repair.Name}"/>
+                                </td>
+                                <td align="left" width="10%">
+                                    <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%">
+                                    <apex:outputField id="SerialNumber" value="{!ra.repair.SerialNumber__c}"/>
+                                </td>
+                                <td align="left" width="8%">
+                                    <apex:outputField id="HP_Name" value="{!ra.repair.HP_Name__c}"/>
+                                </td>
+                                <td align="left" width="5%">
+                                    <apex:outputField id="State_Hospital" value="{!ra.repair.State_Hospital__c}"/>
+                                </td>
+                                <td align="left" width="5%">
+                                    <apex:outputField id="Incharge_Staff" value="{!ra.repair.Incharge_Staff__c}"/>
+                                </td>
+                                <td align="left" width="8%">
+                                    <apex:outputField id="FSE_ApplyForRepair_Day" value="{!ra.repair.FSE_ApplyForRepair_Day__c}"/>
+                                </td>
+                                <td align="left" width="5%">
+                                    <apex:outputField id="work_location_select" value="{!ra.repair.work_location_select__c}"/>
+                                </td>
+                                <td align="left" width="5%">
+                                    <apex:outputField id="On_site_repair" value="{!ra.repair.On_site_repair__c}"/>
+                                </td>
+                                <td align="center" width="8%">
+                                    <apex:outputField id="Number_of_EffectiveContract" value="{!ra.repair.Number_of_EffectiveContract__c}"/>
+                                </td>
+                                <td align="left" width="8%">
+                                    <apex:outputField id="NewProductGuaranteeObject" value="{!ra.repair.NewProductGuaranteeObject__c}"/>
+                                </td>
+                            </tr>
+                            </apex:repeat>
+                        </table>
+                        </div>
+                    </apex:pageBlock>
+                    <!-- </div> -->
                 </div>
-            </div>
-        </apex:pageBlock>
+            </apex:pageBlock>
+        </apex:outputPanel>
     </apex:form>
-</body>
 </apex:page>
\ No newline at end of file

--
Gitblit v1.9.1