From 5cfec12aff9906d1d72cc9473c2774408b377336 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期四, 04 五月 2023 15:08:17 +0800
Subject: [PATCH] 周会-修理 页面修改
---
force-app/main/default/pages/RepairPCL.page | 97 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 42 deletions(-)
diff --git a/force-app/main/default/pages/RepairPCL.page b/force-app/main/default/pages/RepairPCL.page
index 0226fd9..569e20d 100644
--- a/force-app/main/default/pages/RepairPCL.page
+++ b/force-app/main/default/pages/RepairPCL.page
@@ -9,6 +9,13 @@
<apex:includeScript value="{!URLFOR($Resource.OpportunityPCLJs)}"/>
<style>
+
+ /*div#out_Div_L table th, div#out_Div_L>table>tbody>tr.headerRow>td,*/
+ div#out_Div table th, div#out_Div>table>tbody>tr.headerRow>td{
+ white-space: normal;
+ }
+
+
td .dateFormat {
display: none;
}
@@ -23,18 +30,19 @@
position:relative;
overflow: hidden;
float:left;
- width:1400px;
+ width:700px;
}
div#out_Div_L {
position:relative;
overflow: hidden;
float:left;
+ width: 547px;
}
div#in_Div {/* tbody銇屽叆銇ｃ仸銇勩倠銆傘亾銇撱亴銈广偗銉兗銉璞�*/
position:relative;
overflow: auto; /*銈广偗銉兗銉儛銉�*/
float:left;
- width:1400px;
+ width:700px;
height: 100px; /* tbody銈掕〃绀恒仚銈嬮珮銇曘�佸緦銇s銇仸瑾挎暣 */
}
div#in_Div_L {
@@ -42,6 +50,7 @@
overflow: hidden;
float:left;
height: 100px;
+ width: 547px;
}
body .pbBody table.list tr.headerRow td {
@@ -69,6 +78,7 @@
body .pbBody table.list tr.dataRow td.dataCellBorder1 {padding:0px 0px 0px 0px; border-width: 0px 0px 1px 1px; vertical-align: middle; word-break:break-all;}
}
+table.list {table-layout: fixed;}
table.list td {width:100px;}
table.list td select {width:95%;}
table.list td input {width:95%;}
@@ -77,36 +87,46 @@
width:90%;
}
-table.list .col_Name {width:99px;}
+table.list .col_Name {width:110px;}
table.list .col_Service_Repair_No__c {width:49px;}
-table.list .col_Account__c {width:109px;}
+table.list .col_Account__c {width:115px;}
table.list .col_Department_Name__c {width:59px;}
-table.list .col_State_Hospital__c {width:49px;}
-table.list .col_OwnershipMachine_No__c {width:49px;}
-table.list .col_SerialNumber__c {width:49px;}
-table.list .col_FSE_owner__c {width:98px;}
+table.list .col_State_Hospital__c {width:69px;}
+table.list .col_OwnershipMachine_No__c {width:69px;}
+table.list .col_SerialNumber__c {width:69px;}
+
+
+table.list .col_FSE_owner__c {width:104px;}
table.list .col_On_site_repair_c__c {width:118px;}
table.list .col_Contract_status__c {width:98px;}
table.list .col_Status1__c {width:98px;}
table.list .col_Repair_Severity_Rank__c {width:98px;}
table.list .col_Repair_Rank__c {width:78px;}
-table.list .col_Failure_Occurrence_Date__c {width:88px;}
-table.list .col_On_Site_Repair_Order_Date__c {width:88px;}
-table.list .col_Send_To_RC_Date__c {width:88px;}
-table.list .col_Repair_Ordered_Date__c {width:88px;}
-table.list .col_Repair_Inspection_Date__c {width:88px;}
-table.list .col_Repair_Firstestimated_Date_formula__c {width:88px;}
-table.list .col_Repair_Estimated_date_formula__c {width:88px;}
-table.list .col_Repair_Discount_Date_formula__c {width:88px;}
-table.list .col_Repair_Discount_approval_Date_formula__c {width:88px;}
-table.list .col_Agreed_Date__c {width:88px;}
-table.list .col_Repair_Start_Date__c {width:88px;}
-table.list .col_Repair_Completed_Date__c {width:88px;}
-table.list .col_Repair_Shipped_Date__c {width:88px;}
-table.list .col_Input_user_return_day__c {width:88px;}
-table.list .col_Return_Without_Repair__c {width:58px;}
+table.list .col_Failure_Occurrence_Date__c {width:94px;}
+table.list .col_On_Site_Repair_Order_Date__c {width:94px;}
+table.list .col_Send_To_RC_Date__c {width:94px;}
+table.list .col_Repair_Ordered_Date__c {width:94px;}
+table.list .col_Repair_Inspection_Date__c {width:94px;}
+table.list .col_Repair_Firstestimated_Date_formula__c {width:94px;}
+table.list .col_Repair_Estimated_date_formula__c {width:94px;}
+table.list .col_Repair_Discount_Date_formula__c {width:94px;}
+table.list .col_Repair_Discount_approval_Date_formula__c {width:94px;}
+table.list .col_Agreed_Date__c {width:94px;}
+table.list .col_Repair_Start_Date__c {width:94px;}
+table.list .col_Repair_Completed_Date__c {width:94px;}
+table.list .col_Repair_Shipped_Date__c {width:94px;}
+table.list .col_Repair_Returned_To_HP_Date__c {width:94px;}
+table.list .col_Input_user_return_day__c {width:105px;}
+table.list .col_Return_Without_Repair__c {width:65px;}
table.list .col_Return_Without_Repair_Reason__c {width:138px;}
+table.list .col_SAPRepairNo__c {width:108px;}
+div#in_Div input[type="checkbox"] {
+ width:15px ;
+}
+div#in_Div .col_Return_Without_Repair__c {
+ text-align: center;
+}
body .pbBody table.list tr.headerRow td.colViewing {
/* 銉囥儠銈┿儷銉堝�ゃ�佹渶灏忓寲銈€偆銈炽兂銈掕〃绀� */
background-image:url('{!URLFOR($Resource.IconResizeMinus_5)}') ;
@@ -141,18 +161,18 @@
<apex:outputPanel id="allPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
- <table style="border-bottom-width: 0px; font-size:12px;">
+ <table style="border-bottom-width: 0px; font-size:12px;margin-bottom: 10px;">
<tr>
<td width="150px">
<apex:commandButton action="{!save}" value="淇濆瓨" rerender="allPanel" onclick="blockme();" oncomplete="unblockUI();" style="height:30px;width:60px;"/>
- <apex:commandButton value="妫�绱�" onclick="searchOppJs();return false;" style="height:30px;width:60px;"/>
+ <apex:commandButton value="妫�绱�" onclick="searchOppJs();return false;" style="height:30px;width:60px;"/>
</td>
<td width="1000px">
<apex:pageMessages />
</td>
</tr>
</table>
- <table style="border-bottom-width: 0px; font-size:12px;margin-bottom: 10px">
+ <table style="border-bottom-width: 0px; font-size:12px;margin-bottom: 10px;">
<tr>
<td width="250px">鍖婚櫌 <apex:inputText value="{!accSearch}" style="width:150px"/>銆�</td>
<td width="40px">鍒涘缓浜�</td>
@@ -163,9 +183,7 @@
浠� <apex:inputField value="{!con1.BirthDate}" id="fromDateId"/>銆�
鍒� <apex:inputField value="{!con2.BirthDate}" id="toDateId"/>
</td>
-<!-- <td width="30px"><apex:commandButton value="鏍囪" onclick="markOpp('{!$Label.BackgroundColor}');return false;" rerender="allPanel"/></td> -->
-<!-- <td width="10px"></td> -->
-<!-- <td width="80px">鍙浠� <apex:inputCheckbox value="{!onlyOpp}" /></td> -->
+
<td>鏄剧ず銆�<apex:selectList value="{!limits}" size="1" onchange="searchOppJs();return false;"><apex:selectOptions value="{!limitOpts}"/></apex:selectList>銆�鏉℃暟鎹�</td>
<td width="10px"></td>
<td width="70px"><a href="#" onclick="expandAll();return false;" style="text-decoration: underline;">鍏ㄩ儴灞曞紑</a></td>
@@ -199,7 +217,6 @@
</apex:pageBlock>
<apex:pageBlock id="oppBlock" tabStyle="Report">
-<!-- <apex:pageblocksection columns="1" id="oppSection">-->
<apex:outputPanel >
<apex:inputHidden id="oppCount" value="{!oppCount}"/>
<div id="out_Div_L">
@@ -224,7 +241,7 @@
</table>
</div>
<div id="out_Div">
- <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableHeader">
+ <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout: fixed;" border="" id="tableHeader">
<tr class="dataRow" height="1px">
<apex:variable value="{!0}" var="cnt" />
<apex:repeat value="{!titleRight}" var="t">
@@ -295,7 +312,7 @@
</table>
</div>
<div id="in_Div">
- <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData">
+ <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout: fixed;" border="" id="tableData">
<apex:variable value="{!1}" var="cnt" />
<apex:repeat value="{!oppRecords}" var="or" id="oppTable">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
@@ -362,14 +379,11 @@
tableWidth += headerCol.width();
}
});
- j$('table#tableData').css('width', (tableWidth + 2) + 'px');
- j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
+ j$('table#tableData').css('width', (tableWidth + 20) + 'px');
+ j$('table#tableHeader').css('width', (tableWidth + 20) + 'px');
// list 銇� headerRow 銇� td銇� toggleWidth() 銈掕拷鍔�
bindTdToggleWidth();
-
-
-
});
var elements = document.getElementsByTagName("select");
@@ -384,7 +398,7 @@
for (i = 0; i < input_l.length; i++) {
var id = input_l[i].id + '_lkid';
if (document.getElementById(id) != null) {
- input_l[i].style.width = "75%";
+ input_l[i].style.width = "99%";
}
}
var tbl = document.getElementById("tableData");
@@ -392,18 +406,17 @@
for (i = 0; i < input.length; i++) {
var id = input[i].id + '_lkid';
if (document.getElementById(id) != null) {
- input[i].style.width = "75%";
+ input[i].style.width = "95%";
}
}
j$('div#in_Div').scroll(function() {
j$('div#out_Div').scrollLeft(j$(this).scrollLeft());
- console.log(j$(this).scrollLeft());
});
j$('div#in_Div').scroll(function() {
j$('div#in_Div_L').scrollTop(j$(this).scrollTop());
- console.log(j$(this).scrollTop());
});
-windowResize();
+resizeTable();
+// windowResize();
</script>
</apex:outputPanel>
</apex:form>
--
Gitblit v1.9.1