From 52321010086ac12b441f77e0798c5eee528174cb Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期四, 25 五月 2023 11:55:33 +0800
Subject: [PATCH] 备品出借 排队查看序列信息 及公用css:listTable和之前修改改为公用css文件
---
force-app/main/default/staticresources/listTable.css | 11 +++++
force-app/main/default/pages/ReantalApplySeriesNo.page | 33 +++++++++++++---
force-app/main/default/staticresources/listTable.resource-meta.xml | 5 ++
force-app/main/default/pages/RentalApplySequence.page | 15 -------
force-app/main/default/pages/RentalFixtureSetAssignAgency.page | 12 -----
5 files changed, 45 insertions(+), 31 deletions(-)
diff --git a/force-app/main/default/pages/ReantalApplySeriesNo.page b/force-app/main/default/pages/ReantalApplySeriesNo.page
index e826778..5907b92 100644
--- a/force-app/main/default/pages/ReantalApplySeriesNo.page
+++ b/force-app/main/default/pages/ReantalApplySeriesNo.page
@@ -1,9 +1,12 @@
-<apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="搴忓垪鏌ョ湅">
- <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<!-- <apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="搴忓垪鏌ョ湅"> -->
+<apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="搴忓垪鏌ョ湅" lightningStylesheets="true">
+<!-- 20230525 ljh lightning -->
+<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning -->
<style type="text/css">
.bPageBlock .detailList .dataCol {
width: auto;
@@ -24,7 +27,8 @@
</script>
<apex:form id="allForm">
<apex:pageBlock id="searchBlock" title="搴忓垪淇℃伅">
- <apex:pageBlockSection columns="3" id="mainSection">
+ <!-- 20230525 ljh lightning start -->
+ <!-- <apex:pageBlockSection columns="3" id="mainSection">
<apex:pageBlockSectionItem >
<apex:outputLabel value="鍨嬪彿:" />
<apex:outputField value="{!raq.Fixture_Model_No__c}"/>
@@ -47,11 +51,28 @@
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem >
<apex:outputLabel value="搴忓垪绫诲瀷:"/>
- <!-- {!Isadmix} -->
<apex:outputText value="{!IF(Isadmix,'娣峰悎','鍗曚竴')}"/>
- <!-- <input name="Isadmix" disabled="true" type="checkbox" value="{!Isadmix}" checked="{!IF(Isadmix,'checked','')}" /> -->
</apex:pageBlockSectionItem>
- </apex:pageBlockSection>
+ </apex:pageBlockSection> -->
+ <table style="width:100%;margin:10px 0;" >
+ <tr>
+ <td>鍨嬪彿:</td>
+ <td>{!raq.Fixture_Model_No__c}</td>
+ <td>澶囧搧瀛樻斁鍦�:</td>
+ <td>{!raq.Internal_asset_location__c}</td>
+ <td>鏈儴:</td>
+ <td>{!raq.Salesdepartment__c}</td>
+ </tr>
+ <tr>
+ <td>澶囧搧鍒嗙被:</td>
+ <td>{!raq.Equipment_Type__c}</td>
+ <td>浜у搧鍒嗙被:</td>
+ <td>{!raq.Product_category__c}</td>
+ <td>搴忓垪绫诲瀷:</td>
+ <td>{!IF(Isadmix,'娣峰悎','鍗曚竴')}</td>
+ </tr>
+ </table>
+ <!-- 20230525 ljh lightning end -->
</apex:pageBlock>
<apex:outputPanel id="message">
<apex:pageMessages />
diff --git a/force-app/main/default/pages/RentalApplySequence.page b/force-app/main/default/pages/RentalApplySequence.page
index d13c962..3c12041 100644
--- a/force-app/main/default/pages/RentalApplySequence.page
+++ b/force-app/main/default/pages/RentalApplySequence.page
@@ -6,7 +6,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
-
+<apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning -->
<style type="text/css">
.hideDropdown select{
display: none
@@ -14,19 +14,6 @@
.table-head{padding-right:17px;}
.tablehead0{padding-right:0;}
.table-body table tr:nth-child(2n){background-color:#f2f2f2;}
- /* 20230524 ljh lightning start */
- body .pbBody table.list tr th, body .pbBody table.list tr td {
- border: 1px solid #ededed;
- white-space: normal;
- }
- body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
- background: #f2f3f3;
- border-width: 0 0 1px 1px;
- border-color: #e0e3e5;
- font-size: .9em;
- font-weight: bold;
- }
- /* 20230524 ljh lightning end */
/*浠ヤ笅鏄笅鎷夊閫夋鐨勬牱寮� start*/
* {
margin: 0;
diff --git a/force-app/main/default/pages/RentalFixtureSetAssignAgency.page b/force-app/main/default/pages/RentalFixtureSetAssignAgency.page
index 62af1ef..75edf43 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssignAgency.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssignAgency.page
@@ -7,6 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning -->
<style type="text/css">
.hideDropdown select{
display: none
@@ -59,17 +60,6 @@
/* body .pbBody table.list tr.headerRow td, body .pbBody table.list tr.headerRow th {
border-width: 1px;
} */
- body .pbBody table.list tr th, body .pbBody table.list tr td {
- border: 1px solid #ededed;
- white-space: normal;
- }
- body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
- background: #f2f3f3;
- border-width: 0 0 1px 1px;
- border-color: #e0e3e5;
- font-size: .9em;
- font-weight: bold;
- }
/* 20230524 ljh lightning end */
</style>
<script type="text/javascript">
diff --git a/force-app/main/default/staticresources/listTable.css b/force-app/main/default/staticresources/listTable.css
new file mode 100644
index 0000000..226f499
--- /dev/null
+++ b/force-app/main/default/staticresources/listTable.css
@@ -0,0 +1,11 @@
+body .pbBody table.list tr th, body .pbBody table.list tr td {
+ border: 1px solid #ededed;
+ white-space: normal;
+}
+body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
+ background: #f2f3f3;
+ border-width: 0 0 1px 1px;
+ border-color: #e0e3e5;
+ font-size: .9em;
+ font-weight: bold;
+}
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/listTable.resource-meta.xml b/force-app/main/default/staticresources/listTable.resource-meta.xml
new file mode 100644
index 0000000..205b97a
--- /dev/null
+++ b/force-app/main/default/staticresources/listTable.resource-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<StaticResource xmlns="http://soap.sforce.com/2006/04/metadata">
+ <cacheControl>Public</cacheControl>
+ <contentType>text/css</contentType>
+</StaticResource>
--
Gitblit v1.9.1