From 5363705f99dcbb7c270a619804beb4ac29b3faa0 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 09 八月 2023 20:02:16 +0800
Subject: [PATCH] 今日修改
---
force-app/main/default/pages/InventoryResultRecord.page | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 174 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/pages/InventoryResultRecord.page b/force-app/main/default/pages/InventoryResultRecord.page
index 4799443..bd528dd 100644
--- a/force-app/main/default/pages/InventoryResultRecord.page
+++ b/force-app/main/default/pages/InventoryResultRecord.page
@@ -1,4 +1,4 @@
-<apex:page controller="InventoryResultRecordController" showHeader="false" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab">
+<apex:page controller="InventoryResultRecordController" showHeader="false" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab" lightningStylesheets="true" applyHtmlTag="false">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -7,7 +7,157 @@
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<style>
+ .dateFormat {
+ display: none;
+ }
+ .requiredBlock {
+ display: none;
+ }
+ .message {
+ margin: 0px;
+ /*width: 1125px;*/
+ }
+ table {
+ table-layout: fixed;
+ border-collapse: collapse;
+ }
+ a {
+ text-decoration: none;
+ }
+ /*TODO width margin-left 杩欓噷璋冭妭瀹藉害*/
+ div#out_Div_L {
+ position: relative;
+ overflow: hidden;
+ width: 1300px;
+ }
+ div#out_Div_R {
+ position: relative;
+ overflow: hidden;
+ width: 1200px;
+ margin-left: 686px;
+ }
+
+ div#in_Div_L {
+ position: relative;
+ width: 745px;
+ height: 451px;
+ }
+ div#in_Div_R {
+ position: relative;
+ overflow: auto;
+ height: 451px;
+ margin-left: 686px;
+ margin-top: -451px;
+ }
+ div#in_Div_L td.dataCellBorder1 {
+ border-width: 1px;
+ }
+ div#in_Div_R td.dataCellBorder1 {
+ border-width: 1px;
+ }
+ /* 榛樿 */
+ table.list td {width:100px;}
+ table.list td select {width:95%;}
+ table.list td input {width:95%;}
+ table.list td textarea {
+ height:50px;
+ width:90%;
+ }
+ table.list .col_Internal_asset_location__c {width:130px;}
+ table.list .col_Salesdepartment__c {width:110px;}
+ table.list .col_SalesProvince__c {width:70px;}
+ table.list .col_Asset_loaner_category__c {width:80px;}
+ table.list .col_Fixture_Model_No_F__c {width:80px;}
+ table.list .col_CompanyOfEquipment__c {width:60px;}
+ table.list .col_Asset_name__c {width:60px;}
+ table.list .col_Internal_Asset_number__c {width:80px;}
+ table.list .col_Internal_Asset_number_key__c {width:80px;}
+
+ table.list .col_SerialNumber {width:60px;} /*鏈鸿韩缂栧彿*/
+ table.list .col_Product_Serial_No__c {width:60px;} /*浜у搧 + 鏈轰綋缂栫爜*/
+ table.list .col_Product_category__c {width:60px;}
+ table.list .col_Equipment_Type__c {width:120px;}
+ table.list .col_Consumable_Guaranteen_end__c {width:70px;}
+ table.list .col_Manage_type__c {width:80px;} /*绠$悊绉嶇被*/
+ table.list .col_Loaner_accsessary__c {width:50px;}
+ table.list .col_EquipmentSet_Managment_Code__c {width:50px;}
+ table.list .col_AssetManageConfirm__c {width:50px;}
+ table.list .col_Fixture_QRCode__c {width:50px;}
+ table.list .col_WH_location__c {width:30px;}
+ table.list .col_Quantity {width:30px;}
+ table.list .col_You_Xiao_Ku_Cun__c {width:30px;}
+ table.list .col_Ji_Zhong_Guan_Li_Ku_Cun__c {width:30px;}
+ table.list .col_Out_of_wh__c {width:30px;}
+ table.list .col_Rental_Count__c {width:30px;}
+ table.list .col_Frozen_Quantity__c {width:30px;}
+ table.list .col_Abandoned_RealThing__c {width:30px;}
+ table.list .col_Abandoned_Inventory__c {width:40px;}
+ table.list .col_Repairing_Count__c {width:30px;}
+ table.list .col_Fixture_Status__c {width:30px;}
+ table.list .col_Main_OneToOne__c {width:40px;}
+
+ .navigationBarBlock {
+ width: 100%;
+ }
+ .apexp .bPageBlock.apexDefaultPageBlock .pbBody {
+ margin: 0px;
+ }
+ .checkButtonStyle input {
+ width: 100%;
+ text-align: left;
+ }
+ .searchButtonStyle {
+ width: 50%;
+ }
+ .searchButtonStyle input {
+ width: 80%;
+ background: #9BC2E6;
+ }
+ .setButtonStyle {
+ width: 8%;
+ }
+ .setButtonStyle input {
+ width: 100%;
+ background: #9BC2E6;
+ }
+ .startInventoryButtonStyle {
+ width: 12%;
+ }
+ .labelSettingStyle {
+ width: 8%;
+ text-align: right;
+ }
+ .labelStyle {
+ width: 8%;
+ text-align: left;
+ }
+ .blankStyle {
+ width: 1%;
+ }
+ .inputTextStyle {
+ width: 9%;
+ }
+ .inputTextStyle input {
+ width: 90%;
+ }
+ .inputTextStyle select {
+ width: 95%;
+ }
+ .redStyle {
+ background-color: #F00;
+ }
+ .greyStyle {
+ background-color: #AAA;
+ }
+ .blueStyle input {
+ background: #9BC2E6;
+ }
+ #pageBlockButton1 {
+ margin: 0pxt;
+ }
+
.overlay {
position: absolute;
top: 0;
@@ -201,6 +351,15 @@
text-decoration: none;
cursor: pointer;
}
+ #pageBlockButton1 {
+ margin: 0pxt;
+ }
+ div#in_Div_L td.dataCellBorder1 {
+ border-width: 1px;
+ }
+ div#in_Div_R td.dataCellBorder1 {
+ border-width: 1px;
+ }
</style>
<script type="text/javascript">
sforce.connection.sessionId = "{!$Api.Session_ID}";
@@ -370,6 +529,20 @@
</table>
</apex:pageBlock>
</apex:outputPanel> -->
+
+ <!-- <apex:outputPanel layout="block" style="width: 14%; float: left;">
+ <apex:pageBlock mode="maindetail">
+ <table style='width:140px;height: 120px'>
+ <tr><td class="checkButtonStyle"><apex:commandButton value="鐩樼偣" rendered="{!!inventoryBlueFlag}" onclick="location.href='/apex/InventoryResultRecord'; return false"/></td></tr>
+ <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鐩樼偣" rendered="{!inventoryBlueFlag}"/></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton value="澶囧搧鐩樼偣鎶ュ憡" rendered="{!!rentBlueFlag}" onclick="location.href='{!$Page.InventoryReport}'; return false" /></td></tr>
+ <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="澶囧搧鐩樼偣鎶ュ憡" rendered="{!rentBlueFlag}"/></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton value="鑰楁潗鐩樼偣鎶ュ憡" rendered="{!!consumBlueFlag}" onclick="location.href='{!$Page.InventoryReport}?isConsum=true'; return false" /></td></tr>
+ <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鑰楁潗鐩樼偣鎶ュ憡" rendered="{!consumBlueFlag}"/></td></tr>
+ <tr><td></td></tr>
+ </table>
+ </apex:pageBlock>
+ </apex:outputPanel> -->
<!-- 鍙充晶妫�绱㈠尯 -->
<apex:outputPanel layout="block">
<apex:pageBlock mode="maindetail" id="maindetailId">
--
Gitblit v1.9.1