From 32944d1a233be29c0cb27d8ad4f21df868fb98a0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期二, 04 七月 2023 17:42:20 +0800
Subject: [PATCH] 耗材试用表 重新分配页面
---
force-app/main/default/pages/ConsumTrial.page | 9 ++++
force-app/main/default/staticresources/ConsumTrialPageCss.css | 56 ++++++++++++++++++++++++----
force-app/main/default/pages/ConsumTrialUpdate.page | 4 +
force-app/main/default/pages/ConsumReassign.page | 16 ++++++--
4 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/ConsumReassign.page b/force-app/main/default/pages/ConsumReassign.page
index 7a056cb..fb7860a 100644
--- a/force-app/main/default/pages/ConsumReassign.page
+++ b/force-app/main/default/pages/ConsumReassign.page
@@ -1,9 +1,11 @@
-<apex:page Controller="ConsumReassignController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="閲嶆柊鍒嗛厤">
+<apex:page Controller="ConsumReassignController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="閲嶆柊鍒嗛厤" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning 聽-->
+
<style>
.decrypt {
position: absolute;
@@ -17,6 +19,10 @@
a:hover .decrypt {
display: block;
width: 100px
+ }
+
+ th > input{
+ margin-left: revert;
}
</style>
<script type="text/javascript">
@@ -112,18 +118,20 @@
<apex:outputText id="hasError" value="{!hasError}" style="display:none"/>
<apex:outputText id="rentalApplyId" value="{!rentalApplyId}" style="display:none"/>
- <table class="linetable" border="1" style="border-collapse: collapse;width: 750px;">
+ <table class="linetable" border="1" style="border-collapse: collapse;width: auto;">
<colgroup>
- <col width="25"/>
+ <col width="60"/>
<col width="110"/>
<col width="110"/>
<col width="110"/>
<col width="110"/>
<col width="110"/>
<col width="175"/>
+ <col width="110"/>
+ <col width="175"/>
</colgroup>
<tr style="background-color:#DCDCDC;">
- <th style="text-align:center">鍏ㄩ��
+ <th style="text-align:center">鍏ㄩ��
<apex:inputCheckbox id="checkAll" value="{!checkAll}" onclick="checkAll(this);" />
</th>
<th style="text-align:center">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.Consum_Apply_Equipment_Set__c.label}</th>
diff --git a/force-app/main/default/pages/ConsumTrial.page b/force-app/main/default/pages/ConsumTrial.page
index 4771485..7376bf6 100644
--- a/force-app/main/default/pages/ConsumTrial.page
+++ b/force-app/main/default/pages/ConsumTrial.page
@@ -7,6 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning 聽-->
<script type="text/javascript">
var txIds = [];
@@ -30,6 +31,14 @@
background-image:url('{!URLFOR($Resource.IconResizePlus_5)}');
background-repeat:no-repeat;
}
+ .searchTable td {
+ display: -webkit-inline-box;
+ margin: 10px 10px;
+ line-height: 2rem;
+ }
+ .searchTable td:last-child {
+ display: inline-block;
+ }
</style>
<script type="text/javascript">
var heightAjustment = 120;
diff --git a/force-app/main/default/pages/ConsumTrialUpdate.page b/force-app/main/default/pages/ConsumTrialUpdate.page
index 591da9f..90b9f0d 100644
--- a/force-app/main/default/pages/ConsumTrialUpdate.page
+++ b/force-app/main/default/pages/ConsumTrialUpdate.page
@@ -1,4 +1,4 @@
-<apex:page controller="ConsumTrialUpdateController" showHeader="false" action="{!init}" id="allPage">
+<apex:page controller="ConsumTrialUpdateController" showHeader="false" action="{!init}" id="allPage" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -6,6 +6,8 @@
<apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning 聽-->
+
<apex:form id="allForm">
<style>
table.headTable td {
diff --git a/force-app/main/default/staticresources/ConsumTrialPageCss.css b/force-app/main/default/staticresources/ConsumTrialPageCss.css
index 26b4a1d..da32b43 100644
--- a/force-app/main/default/staticresources/ConsumTrialPageCss.css
+++ b/force-app/main/default/staticresources/ConsumTrialPageCss.css
@@ -11,7 +11,7 @@
position:relative;
overflow: hidden;
float:left;
- width:32768px;
+ /* width:32768px; */
}
div#out_Div_L {
position:relative;
@@ -22,7 +22,7 @@
position:relative;
overflow: auto; /*銈广偗銉兗銉儛銉�*/
float:left;
- width:32768px;
+ /* width:32768px; */
height: 100px; /* tbody銈掕〃绀恒仚銈嬮珮銇曘�佸緦銇s銇仸瑾挎暣 */
}
div#in_Div_L {
@@ -61,30 +61,70 @@
table.list td.col_noChk {width:0px;}
table.list td select {width:95%;}
table.list td input {width:85%;}
-table.list td.col_chk {width:35px;text-align:center;}
-table.list td.col_Fixture_Model_No_F__c {width:180px;}
+table.list td.col_chk {
+ width: 26px;
+ text-align: center;
+ padding: 0px 3px 0px 3px !important;
+}
+table.list td.col_Fixture_Model_No_F__c {width:180px;line-height: 30px;}
table.list td.col_Fixture_Model_Name_F__c {width:230px;}
table.list td.col_Fixture_Model_No__c {width:180px;}
-table.list td.col_ProductName__c,table.list td.col_FSD_Name_CHN__c {width:230px;}
+table.list td.col_ProductName__c,table.list td.col_FSD_Name_CHN__c {width:240px;}
/* table.list td.col_Show_demonstration__c {width:90px;} */
table.list td.col_Trial_Num__c {width:80px;text-align:center;}
/* table.list td.col_Operation_Type__c {width:80px} */
table.list td.col_Consum_Start_Date__c {width:100px;text-align:center;}
/* table.list td.col_Case_OR_animal_organ__c {width:70px;} */
/* table.list td.col_Trial_User__c {width:80px;} */
-/* table.list td.col_Follower_User__c{width:95px;} */
+/* table.list td.col_Follower_User__c{width:120px;} */
/* table.list td.col_Comment__c {width:80px;} */
-table.list td.col_Degree_Of_Importance__c,input#Degree_Of_Importance__c {text-align:right;}
+table.list td.col_Degree_Of_Importance__c,input#Degree_Of_Importance__c {text-align:right;}
table.list td.col_Consumable_Guaranteen_end_F__c {text-align:center;}
-table.list td.col_RAESD_Status__c {text-align:center;}
+table.list td.col_RAESD_Status__c {text-align:center;width: 120px;}
+table.list td.col_Received_Confirm__c {text-align:center;width: 120px;}
table.list td.col_Spare__c {width:30px;text-align:center;}
table.list td.col_UpDown {width:120px;text-align:center;}
+
+
table.list td textarea {
height:50px;
width:90%;
}
+#tableData td{
+ display: flex;
+ align-items: center;
+ height: inherit;
+ text-align: center;
+ line-height: 1.1rem;
+}
+#tableHeader .headerRow td{
+ display: inline-block;
+ height: 30px;
+ line-height: 30px;
+}
+.searchTable td>span, select, input{
+ margin-left: 5px;
+}
+table.list td.col_Spare__c input{
+ width: 20px;
+ height: 20px;
+}
+#tableData_R_0{
+ display: flex;
+}
+#tableHeader .headerRow td{
+ display: flex;
+ justify-content: center;
+ flex-direction: row;
+}
+body .headerRow{
+ display: flex;
+}
+td.col_chk input{
+ margin-top: 4px;
+}
/*URLFOR($Resource 銇伄銇elationListPagingCmpCss銇叆銈屻伨銇涖倱*/
/*
body .pbBody table.list tr.headerRow td.colViewing {
--
Gitblit v1.9.1