From e14d6d0619330cad423f06493e3aa2371faa2a8f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 09 九月 2023 14:02:23 +0800
Subject: [PATCH] Sit期间修改
---
force-app/main/default/pages/InventoryReport.page | 79 ++++++++++++++++++++++++++++++---------
1 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/pages/InventoryReport.page b/force-app/main/default/pages/InventoryReport.page
index a1e9b56..38345fb 100644
--- a/force-app/main/default/pages/InventoryReport.page
+++ b/force-app/main/default/pages/InventoryReport.page
@@ -1,7 +1,7 @@
<apex:page extensions="InventoryReportController" standardController="Inventory_Header__c" 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:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilColorCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<style>
.dateFormat {
@@ -116,12 +116,24 @@
width: 9%;
padding: 5px;
}
+ .labelStyle1{
+ width: 7%;
+ }
.tdStyle-left {
/*20220419 ljh HWAG-CAV5WX update */
/*width: 16%;*/
width: 11%;
padding: 5px;
text-align: left;
+ }
+ .tdStyle-left1{
+ width: 7.5%;
+ padding: 5px;
+ text-align: left;
+ }
+ .tdStyle-right1{
+ width: 9%;
+ padding: 5px;
}
.tdStyle-right {
/*20220419 ljh HWAG-CAV5WX update */
@@ -159,9 +171,9 @@
border:1px;
background-color:black;
}
- .datePicker {
- width: 300px;
- height: 200px;
+ body .datePicker {
+ width: 250px;
+ /* height: 200px;*/
}
/****************** 椤甸潰搴曢儴瀹℃壒娴乧ss璋冩暣 *******************/
.bRelatedList .relatedProcessHistory .extraRow td.actionColumn .actionLink, .bRelatedList .relatedProcessHistory .extraRow td, .bRelatedList .relatedProcessHistory .extraRow th {
@@ -202,6 +214,14 @@
width: 3px;
top: 1px;
bottom: 1px;
+ }
+
+ 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;
}
</style>
<style type="text/css" media="print">
@@ -256,33 +276,54 @@
}
// 缁翠慨璁板綍
function weixiu_report() {
- window.open("{!$Label.Environment_Url}{!weixiuReportId}?pv1={!ihId}");
+ // 20230907 ljh start
+ // window.open("{!$Label.Environment_Url}{!weixiuReportId}?pv1={!ihId}");
+ window.open("{!$Label.Environment_Url}lightning/r/Report/{!weixiuReportId}/view?fv1={!ihId}");
+ // 20230907 ljh end
}
// 鍑哄�熻褰�
function chujie_report() {
- window.open("{!$Label.Environment_Url}{!chujieReportId}?pv1={!ihId}");
+ // 20230907 ljh start
+ // window.open("{!$Label.Environment_Url}{!chujieReportId}?pv1={!ihId}");
+ window.open("{!$Label.Environment_Url}lightning/r/Report/{!chujieReportId}/view?fv1={!ihId}");
+ // 20230907 ljh end
}
// 涓㈠け璁板綍
function diushi_report() {
- window.open("{!$Label.Environment_Url}{!diushiReportId}?pv1={!ihId}");
+ // 20230907 ljh start
+ // window.open("{!$Label.Environment_Url}{!diushiReportId}?pv1={!ihId}");
+ window.open("{!$Label.Environment_Url}lightning/r/Report/{!diushiReportId}/view?fv1={!ihId}");
+ // 20230907 ljh end
}
<!--20210525 you 1650 start-->
// 璋冩嫧鍑哄�熻褰�
function transfer_chujie_report() {
- window.open("{!$Label.Environment_Url}{!transferchujieReportId}?pv1={!ihId}");
+ // 20230907 ljh start
+ // window.open("{!$Label.Environment_Url}{!transferchujieReportId}?pv1={!ihId}");
+ window.open("{!$Label.Environment_Url}lightning/r/Report/{!transferchujieReportId}/view?fv1={!ihId}");
+ // 20230907 ljh end
}
// 璋冩嫧閬楀け璁板綍
function transfer_diushi_report() {
- window.open("{!$Label.Environment_Url}{!transferdiushiReportId}?pv1={!ihId}");
+ // 20230907 ljh start
+ // window.open("{!$Label.Environment_Url}{!transferdiushiReportId}?pv1={!ihId}");
+ window.open("{!$Label.Environment_Url}lightning/r/Report/{!transferdiushiReportId}/view?fv1={!ihId}");
+ // 20230907 ljh end
}
<!--20210525 you 1650 end-->
// 鑰楁潗鍑哄�熻褰�
function consum_chujie_report() {
- window.open("{!$Label.Environment_Url}{!consumChujieReportId}?pv1={!ihId}");
+ // 20230907 ljh start
+ // window.open("{!$Label.Environment_Url}{!consumChujieReportId}?pv1={!ihId}");
+ window.open("{!$Label.Environment_Url}lightning/r/Report/{!consumChujieReportId}/view?fv1={!ihId}");
+ // 20230907 ljh end
}
// 鑰楁潗娑堣�楄褰�
function consum_xiaohao_report() {
- window.open("{!$Label.Environment_Url}{!consumXiaohaoReportId}?pv1={!ihId}");
+ // 20230907 ljh start
+ // window.open("{!$Label.Environment_Url}{!consumXiaohaoReportId}?pv1={!ihId}");
+ window.open("{!$Label.Environment_Url}lightning/r/Report/{!consumXiaohaoReportId}/view?fv1={!ihId}");
+ // 20230907 ljh end
}
</script>
@@ -339,7 +380,7 @@
<hr class="line" />
<table class="inventoryReportTable">
<tr>
- <td class="labelStyle">鐩樼偣鍦扮偣锛�</td>
+ <td class="labelStyle1">鐩樼偣鍦扮偣锛�</td>
<td class="labelStyle">
<apex:outputText id="ivLocation" value="{!ihObj.Internal_asset_location__c}" />
</td>
@@ -351,10 +392,10 @@
</td>
</tr>
<tr>
- <td class="labelStyle">鐩樼偣鏃堕棿From锛�</td>
+ <td class="labelStyle1">鐩樼偣鏃堕棿From锛�</td>
<td class="labelStyle">
<apex:inputField id="ivDateFrom" value="{!ihObj.Inventory_Date_From__c}"
- required="{!DESC_RW1['Inventory_Date_From__c'] == 'wm'}" />
+ required="{!DESC_RW1['Inventory_Date_From__c'] == 'wm'}"/>
</td>
<td class="labelStyle">鐩樼偣鏃堕棿To锛�</td>
<td class="labelStyle">
@@ -363,7 +404,7 @@
</td>
</tr>
<tr>
- <td class="labelStyle">鐩樼偣浜哄憳锛�</td>
+ <td class="labelStyle1">鐩樼偣浜哄憳锛�</td>
<td class="labelStyle" colspan="3">
<apex:inputField id="ivPIC" style="width: 100%;" value="{!ihObj.Inventory_Persons__c}"
required="{!DESC_RW1['Inventory_Persons__c'] == 'wm'}" />
@@ -373,7 +414,7 @@
<hr class="line" />
<table class="inventoryReportTable" width="100%" >
<tr>
- <td class="tdStyle-left">鐩樼偣鎶ュ憡鎻愪氦浜猴細</td>
+ <td class="tdStyle-left1">鐩樼偣鎶ュ憡鎻愪氦浜猴細</td>
<td class="tdStyle-left">
<apex:inputField id="ivsubmitPIC" value="{!ihObj.InventorySubmit_PIC__c}"
required="{!DESC_RW1['InventorySubmit_PIC__c'] == 'wm'}" >
@@ -384,13 +425,13 @@
</script>
</apex:inputField>
</td>
- <td class="tdStyle-right">鑱屼綅锛�</td>
+ <td class="tdStyle-right1">鑱屼綅锛�</td>
<td class="tdStyle-left">
<apex:outputText id="ivsubmitPICPost" value="{!ihObj.InventorySubmit_PIC__r.Post__c}" />
</td>
</tr>
<tr>
- <td class="tdStyle-left">鐩樼偣鎶ュ憡纭浜猴細</td>
+ <td class="tdStyle-left1">鐩樼偣鎶ュ憡纭浜猴細</td>
<td class="tdStyle-left">
<apex:inputField id="ivcheckPIC" value="{!ihObj.InventoryCheck_PIC__c}"
required="{!DESC_RW1['InventoryCheck_PIC__c'] == 'wm'}" >
@@ -401,7 +442,7 @@
</script>
</apex:inputField>
</td>
- <td class="tdStyle-right">鑱屼綅锛�</td>
+ <td class="tdStyle-right1">鑱屼綅锛�</td>
<td class="tdStyle-left">
<apex:outputText id="ivcheckPICPost" value="{!ihObj.InventoryCheck_PIC__r.Post__c}" />
</td>
--
Gitblit v1.9.1