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/NotReceivingNoteWaitingReceipt.page | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page b/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page
index dce084d..692992f 100644
--- a/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page
+++ b/force-app/main/default/pages/NotReceivingNoteWaitingReceipt.page
@@ -1,10 +1,11 @@
-<apex:page controller="NotReceivingNoteWaitingReceiptController" showHeader="false" action="{!init}" id="allPage">
+<apex:page controller="NotReceivingNoteWaitingReceiptController" 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)}"/>
<apex:stylesheet value="{!URLFOR($Resource.ReceivingNotePageCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:form >
<!-- 姝ゅ闅愬紡鐢熸垚浜岀淮鐮佸浘鐗囷紝闃叉PDF椤典笂鐨勪簩缁寸爜宕╁潖 -->
<!-- <apex:includeScript value="{!URLFOR($Resource.qrcode)}"/> -->
@@ -37,6 +38,18 @@
}
td.newed {
color: #f00 !important;
+ }
+ table.list td.col_chk {width:3%;}
+ table.list td.col_Chk {width:3%;}
+ table.list td.col_ReceivingNoteDetailNo__c {width:10%;}
+ table.list td.col_OT_CODE__c {width:10%;}
+ table.list td.col_Fixture_Model_No_F__c {width:15%;}
+ table.list td.col_Internal_Asset_number_key__c {width:10%;}
+ table.list td.col_SerialNumber_Origin__c {width:10%;}
+ table.list td.col_SerialNumber__c {width:15%;}
+ table.list td.col_SerialNumber__c input {width:90%;}
+ .buttonSave{
+ display: none;
}
</style>
<script type="text/javascript">
@@ -99,7 +112,7 @@
<apex:inputHidden value="{!done_flg}" id="done_flg"/>
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock">
- <table class="headTable" style="width:100%">
+ <table class="headTable" style="width:100%;margin-bottom:10px;">
<tr>
<td>
<span style="font-weight:bold;">
@@ -147,7 +160,7 @@
</td>
</tr>
</table>
- <table class="searchTable" style="width:100%">
+ <table class="searchTable" style="width:100%;margin-bottom:10px;">
<tr>
<td>
<span>
@@ -171,6 +184,7 @@
</td>
<td>
<span style="margin-left: 50px;float: right;">
+ <input class="buttonSave" type="button" style="width:0;height:0;" />
<apex:commandButton style="" value="鏁版嵁纭" action="{!defineSaveRecord}" onclick="blockme();" reRender="allForm" oncomplete="unblockUI();checkMessage();"/>
<apex:commandButton style="" value="淇濆瓨" action="{!saveRecord}" onclick="blockme();" reRender="allForm" oncomplete="unblockUI();checkMessage();"/>
<apex:commandButton value="杩斿洖" onclick="closeCurrentPage();"/>
@@ -188,7 +202,7 @@
{!nowPage}/{!maxPage}
<apex:commandButton reRender="allForm" onclick="blockme();" disabled="{!canNext = false}" action="{!nextPage}" value="next" oncomplete="unblockUI();"/>
</div>
- <div id="out_Div_L" style="width: 100%;">
+ <div id="out_Div_L" style="width: 100%;overflow: auto;">
<table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableHeader_L">
<tr class="headerRow" height="30px">
<td class="col_chk" align="center">
--
Gitblit v1.9.1