From 7c7cb195462c2ded7bfe4105959ea36d1dd68ded Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 11 十月 2023 19:26:36 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/pages/AssetMaintain.page | 214 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 187 insertions(+), 27 deletions(-)
diff --git a/force-app/main/default/pages/AssetMaintain.page b/force-app/main/default/pages/AssetMaintain.page
index 1f261c9..4ce78a5 100644
--- a/force-app/main/default/pages/AssetMaintain.page
+++ b/force-app/main/default/pages/AssetMaintain.page
@@ -2,8 +2,25 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<apex:includeScript value="{!URLFOR($Resource.SelectFieldJs)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<style>
+ .datePicker {
+ left: 805px !important;
+ width: 350px !important;
+ }
+ .label{
+ font-size: .75rem !important;
+ }
+ .labelCol{
+ font-size: .75rem !important;
+ }
+ .dataCol{
+ font-size: .75rem !important;
+ }
+ .textStyle{
+ font-size: 15px;
+ }
/*20230815 ljh start*/
table.mytable tr{
height:45px;
@@ -35,7 +52,7 @@
div#out_Div_R {
position: relative;
overflow: hidden;
- width: 1200px;
+ width: 455px !important;
margin-left: 686px;
}
@@ -46,6 +63,7 @@
}
div#in_Div_R {
position: relative;
+ width: 470px !important;
overflow: auto;
height: 451px;
margin-left: 686px;
@@ -471,10 +489,13 @@
<td class="labelStyle">璐ф灦鍙�</td>
<td class="inputTextStyle"><apex:inputText value="{!searchB.wh_location}" id="shelfNumId" /></td>
<td class="blankStyle"></td>
- <td class="labelStyle">娑堣�楀搧鏈夋晥鏈熻嚦</td>
+ <td class="labelStyle">鏈鸿韩鍙�</td>
+ <td class="inputTextStyle"><apex:inputText value="{!searchB.serialNumber}" id="serialNoId" /></td>
+ <!-- 20230928 ljh 鍜屾満韬彿鎹綅缃� -->
+ <!-- <td class="labelStyle">娑堣�楀搧鏈夋晥鏈熻嚦</td>
<td class="inputTextStyle">
<apex:inputText id="consumable_Guaranteen_endStr" value="{!searchB.consumable_Guaranteen_endStr}" size="12" onfocus="DatePicker.pickDate(true, '{!$Component.consumable_Guaranteen_endStr}', false)" />
- </td>
+ </td> -->
</tr>
<tr>
<td class="labelStyle">澶囧搧绠＄悊缂栫爜</td> <!-- 銈枫儶銈€儷鐣彿 -->
@@ -489,8 +510,12 @@
<apex:inputText value="{!searchB.internal_Asset_number}" id="fixedAssetNumId2" rendered="{!!internalAssetNumberEditableFlag}" />
</td>
<td class="blankStyle"></td>
- <td class="labelStyle">鏈鸿韩鍙�</td>
- <td class="inputTextStyle"><apex:inputText value="{!searchB.serialNumber}" id="serialNoId" /></td>
+ <!-- <td class="labelStyle">鏈鸿韩鍙�</td>
+ <td class="inputTextStyle"><apex:inputText value="{!searchB.serialNumber}" id="serialNoId" /></td> -->
+ <td class="labelStyle">娑堣�楀搧鏈夋晥鏈熻嚦</td>
+ <td class="inputTextStyle">
+ <apex:inputText id="consumable_Guaranteen_endStr" value="{!searchB.consumable_Guaranteen_endStr}" size="12" onfocus="DatePicker.pickDate(true, '{!$Component.consumable_Guaranteen_endStr}', false)" />
+ </td>
<td class="blankStyle"></td>
<td class="labelStyle">鍒嗗叕鍙稿彿</td>
<td class="inputTextStyle">
@@ -601,47 +626,47 @@
<apex:param name="csvMaintaintype" value="" />
</apex:actionFunction>
<apex:pageBlockSection columns="2">
- <apex:outputField value="{!amHeader.Name}"/>
- <apex:outputField value="{!amHeader.MaintainType__c}"/>
- <apex:outputField value="{!amHeader.Submit_Time__c}" rendered="{!amHeader.MaintainType__c=='瀹炵墿鎶ュ簾'}"/>
- <apex:outputField value="{!amHeader.Date__c}" rendered="{!amHeader.MaintainType__c!='瀹炵墿鎶ュ簾'}"/>
- <apex:outputField value="{!amHeader.Status__c}"/>
- <apex:outputField value="{!amHeader.Submit_Person__c}" rendered="{! amHeader.MaintainType__c=='瀹炵墿鎶ュ簾'|| ISBLANK(amHeader.MaintainType__c) }"/>
+ <apex:outputField styleClass="textStyle" value="{!amHeader.Name}"/>
+ <apex:outputField styleClass="textStyle" value="{!amHeader.MaintainType__c}"/>
+ <apex:outputField styleClass="textStyle" value="{!amHeader.Submit_Time__c}" rendered="{!amHeader.MaintainType__c=='瀹炵墿鎶ュ簾'}"/>
+ <apex:outputField styleClass="textStyle" value="{!amHeader.Date__c}" rendered="{!amHeader.MaintainType__c!='瀹炵墿鎶ュ簾'}"/>
+ <apex:outputField styleClass="textStyle" value="{!amHeader.Status__c}"/>
+ <apex:outputField styleClass="textStyle" value="{!amHeader.Submit_Person__c}" rendered="{! amHeader.MaintainType__c=='瀹炵墿鎶ュ簾'|| ISBLANK(amHeader.MaintainType__c) }"/>
</apex:pageBlockSection>
- <apex:pageBlockSection columns="1" rendered="{! amHeader.MaintainType__c=='瀹炵墿鎶ュ簾'|| ISBLANK(amHeader.MaintainType__c) }">
- <apex:pageBlockSection columns="2" rendered="{! editmode}">
- <apex:pageBlockSectionItem >
+ <apex:pageBlockSection id="SalesSectionOut1" columns="1" rendered="{! amHeader.MaintainType__c=='瀹炵墿鎶ュ簾'|| ISBLANK(amHeader.MaintainType__c) }">
+ <apex:pageBlockSection id="SalesSectionIn1" columns="2" rendered="{! editmode}">
+ <apex:pageBlockSectionItem id="SalesSectionItem1">
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_User1__c.Label}"/>
- <apex:inputField value="{!amHeader.CC_User1__c}"/>
+ <apex:inputField id="SalesName1" value="{!amHeader.CC_User1__c}"/>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem >
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_Email1__c.Label}"/>
<apex:inputField value="{!amHeader.CC_Email1__c}"/>
</apex:pageBlockSectionItem>
- <apex:pageBlockSectionItem >
+ <apex:pageBlockSectionItem id="SalesSectionItem2">
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_User2__c.Label}"/>
- <apex:inputField value="{!amHeader.CC_User2__c}"/>
+ <apex:inputField id="SalesName2" value="{!amHeader.CC_User2__c}"/>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem >
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_Email2__c.Label}"/>
<apex:inputField value="{!amHeader.CC_Email2__c}"/>
</apex:pageBlockSectionItem>
- <apex:pageBlockSectionItem >
+ <apex:pageBlockSectionItem id="SalesSectionItem3">
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_User3__c.Label}"/>
- <apex:inputField value="{!amHeader.CC_User3__c}"/>
+ <apex:inputField id="SalesName3" value="{!amHeader.CC_User3__c}"/>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem >
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_Email3__c.Label}"/>
<apex:inputField value="{!amHeader.CC_Email3__c}"/>
</apex:pageBlockSectionItem>
- <apex:pageBlockSectionItem >
+ <apex:pageBlockSectionItem id="SalesSectionItem4">
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_User4__c.Label}"/>
- <apex:inputField value="{!amHeader.CC_User4__c}"/>
+ <apex:inputField id="SalesName4" value="{!amHeader.CC_User4__c}"/>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem />
- <apex:pageBlockSectionItem >
+ <apex:pageBlockSectionItem id="SalesSectionItem5">
<apex:outputLabel value="{!$ObjectType.AssetMaintainHeader__c.fields.CC_User5__c.Label}"/>
- <apex:inputField value="{!amHeader.CC_User5__c}"/>
+ <apex:inputField id="SalesName5" value="{!amHeader.CC_User5__c}"/>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem />
</apex:pageBlockSection>
@@ -682,7 +707,139 @@
<apex:pageBlockSectionItem />
</apex:pageBlockSection>
</apex:pageBlockSection>
+ <script>
+ let SelectFieldParamList=[
+ {
+
+ //鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
+
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem1:SalesName1',
+
+ //鏌ユ壘瀛楁鎵�鍦ㄥ璞�
+
+ ObjectType : 'AssetMaintainHeader__c',
+
+ //鏌ユ壘瀛楁鐨刟pi鍚嶇О
+
+ QueryFieldApiName : 'CC_User1__c',
+
+ //鏌ユ壘瀛楁鐨勬煡鎵惧璞�
+
+ SelectObj : 'User',
+
+ //鎼滅储鏃朵娇鐢ㄧ殑瀛楁
+
+ SelectFld : 'Name',
+
+ },
+
+ {
+
+ //鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
+
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem2:SalesName2',
+
+ //鏌ユ壘瀛楁鎵�鍦ㄥ璞�
+
+ ObjectType : 'AssetMaintainHeader__c',
+
+ //鏌ユ壘瀛楁鐨刟pi鍚嶇О
+
+ QueryFieldApiName : 'CC_User2__c',
+
+ //鏌ユ壘瀛楁鐨勬煡鎵惧璞�
+
+ SelectObj : 'User',
+
+ //鎼滅储鏃朵娇鐢ㄧ殑瀛楁
+
+ SelectFld : 'Name',
+
+ }, {
+
+ //鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
+
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem3:SalesName3',
+
+ //鏌ユ壘瀛楁鎵�鍦ㄥ璞�
+
+ ObjectType : 'AssetMaintainHeader__c',
+
+ //鏌ユ壘瀛楁鐨刟pi鍚嶇О
+
+ QueryFieldApiName : 'CC_User3__c',
+
+ //鏌ユ壘瀛楁鐨勬煡鎵惧璞�
+
+ SelectObj : 'User',
+
+ //鎼滅储鏃朵娇鐢ㄧ殑瀛楁
+
+ SelectFld : 'Name',
+
+ }, {
+
+ //鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
+
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem4:SalesName4',
+
+ //鏌ユ壘瀛楁鎵�鍦ㄥ璞�
+
+ ObjectType : 'AssetMaintainHeader__c',
+
+ //鏌ユ壘瀛楁鐨刟pi鍚嶇О
+
+ QueryFieldApiName : 'CC_User4__c',
+
+ //鏌ユ壘瀛楁鐨勬煡鎵惧璞�
+
+ SelectObj : 'User',
+
+ //鎼滅储鏃朵娇鐢ㄧ殑瀛楁
+
+ SelectFld : 'Name',
+
+ }, {
+
+ //鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
+
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem5:SalesName5',
+
+ //鏌ユ壘瀛楁鎵�鍦ㄥ璞�
+
+ ObjectType : 'AssetMaintainHeader__c',
+
+ //鏌ユ壘瀛楁鐨刟pi鍚嶇О
+
+ QueryFieldApiName : 'CC_User5__c',
+
+ //鏌ユ壘瀛楁鐨勬煡鎵惧璞�
+
+ SelectObj : 'User',
+
+ //鎼滅储鏃朵娇鐢ㄧ殑瀛楁
+
+ SelectFld : 'Name',
+
+ },
+ ]
+
+ //鍒濆鍖�
+
+ resetOpenPage(SelectFieldParamList);
+ function unblockUI(){
+
+ j$("#sbArea").fadeOut(500, function(){
+
+ j$("#sbArea").remove();
+
+ });
+
+ resetOpenPage(SelectFieldParamList);
+
+ }
+ </script>
<table border="0">
<tr>
<!-- <td style="width: 2%"></td> -->
@@ -772,7 +929,7 @@
else{
reportId = "{!notScrappedReportId}";
}
- var url = `/lightning/r/Report/${reportId}?fv0=${maintainType}`;
+ var url = `/lightning/r/Report/${reportId}/view?fv0=${maintainType}`;
window.open(url);
}
</script>
@@ -798,7 +955,10 @@
<apex:inputText id="abandonCountId" style="width: 90%"/>
</td>
- <td class="setButtonStyle"><apex:commandButton style="width: 70%" action="{!changeEditable}" value="缂栬緫" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" disabled="{!!editButtonActive}" /></td>
+ <td class="setButtonStyle">
+ <apex:commandButton style="width: 70%" action="{!changeEditable}" value="缂栬緫" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();resetOpenPage(SelectFieldParamList);" disabled="{!!editButtonActive}" />
+
+ </td>
<td class="setButtonStyle">
<apex:commandButton style="width: 58%" value="閫傜敤" reRender="allForm" onclick="applyJs(); return false;" disabled="{!!editmode}" />
<script type="text/javascript">
@@ -943,7 +1103,7 @@
</table>
</div>
<div id="out_Div_R">
- <table class="list" border="1" style="border-collapse: collapse; table-layout:fixed; border-bottom-width: 0px; border-spacing:0; width:700px; height: 30px;">
+ <table class="list" border="1" style="border-collapse: collapse; table-layout:fixed; border-bottom-width: 0px; border-spacing:0; width:455px; height: 30px;">
<tr class="headerRow" style="background-color: #DCDCDC; text-align: left; vertical-align: top;">
<apex:variable value="{!0}" var="cnt" />
<apex:repeat value="{!amdRightLabelList}" var="t">
@@ -1219,7 +1379,7 @@
j$('select[id$=mlktp]').each(function() {
this.style.display="none";
})
-
+
</script>
</apex:pageBlock>
</apex:form>
--
Gitblit v1.9.1