From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/RentalAgencyReceived.page | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/RentalAgencyReceived.page b/force-app/main/default/pages/RentalAgencyReceived.page
index f2cbd46..fbc7f4a 100644
--- a/force-app/main/default/pages/RentalAgencyReceived.page
+++ b/force-app/main/default/pages/RentalAgencyReceived.page
@@ -1,10 +1,11 @@
<!-- 20230427 zq <apex:page controller="RentalAgencyReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鍔炰簨澶勬瑺鍝佺‘璁�"> -->
- <apex:page lightningStylesheets = "true" controller="RentalAgencyReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鍔炰簨澶勬瑺鍝佺‘璁�">
+ <apex:page lightningStylesheets="true" controller="RentalAgencyReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鍔炰簨澶勬瑺鍝佺‘璁�">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230525 ljh lightning -->
<style type="text/css">
.hideDropdown select{
display: none
@@ -32,6 +33,19 @@
right: 5%;
position: absolute;
width: 200px;
+ }
+ .contTab{
+ overflow: hidden;
+ }
+ table.list td{
+ width: 16%!important;
+ border: 1px solid #ededed!important;
+ }
+ table.list td.col_chk{
+ width: 5%!important;
+ }
+ .contTab tr td.col_stockin{
+ display: table-cell;
}
table.list td{
width:100px;
@@ -224,7 +238,7 @@
</div>
<apex:outputPanel id="detail">
<div id="in_Div_L">
- <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData_L">
+ <table class="list contTab" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData_L">
<apex:variable value="{!0}" var="Cnt" />
<apex:repeat id="dataline_L" value="{!esdList}" var="esdInfo">
<tr class="" id="tableData_L_{!Cnt}" style="{!IF(esdInfo.hidden,'display: none','')}">
--
Gitblit v1.9.1