From 25f056535350a0b80bad50d2cc45311998e5d1cd Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期一, 09 十月 2023 18:28:00 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/pages/AssetMaintain.page | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/AssetMaintain.page b/force-app/main/default/pages/AssetMaintain.page
index 6929f0c..4ce78a5 100644
--- a/force-app/main/default/pages/AssetMaintain.page
+++ b/force-app/main/default/pages/AssetMaintain.page
@@ -489,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> <!-- 銈枫儶銈€儷鐣彿 -->
@@ -507,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">
@@ -626,9 +633,9 @@
<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 id="SalesName1" value="{!amHeader.CC_User1__c}"/>
</apex:pageBlockSectionItem>
@@ -636,7 +643,7 @@
<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 id="SalesName2" value="{!amHeader.CC_User2__c}"/>
</apex:pageBlockSectionItem>
@@ -644,7 +651,7 @@
<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 id="SalesName3" value="{!amHeader.CC_User3__c}"/>
</apex:pageBlockSectionItem>
@@ -652,12 +659,12 @@
<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 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 id="SalesName5" value="{!amHeader.CC_User5__c}"/>
</apex:pageBlockSectionItem>
@@ -707,7 +714,7 @@
//鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
- inputFieldId : 'allPage:allForm:pageBlockButton1:j_id105:j_id106:j_id107:SalesName1',
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem1:SalesName1',
//鏌ユ壘瀛楁鎵�鍦ㄥ璞�
@@ -731,7 +738,7 @@
//鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
- inputFieldId : 'allPage:allForm:pageBlockButton1:j_id105:j_id106:j_id112:SalesName2',
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem2:SalesName2',
//鏌ユ壘瀛楁鎵�鍦ㄥ璞�
@@ -753,7 +760,7 @@
//鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
- inputFieldId : 'allPage:allForm:pageBlockButton1:j_id105:j_id106:j_id117:SalesName3',
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem3:SalesName3',
//鏌ユ壘瀛楁鎵�鍦ㄥ璞�
@@ -775,7 +782,7 @@
//鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
- inputFieldId : 'allPage:allForm:pageBlockButton1:j_id105:j_id106:j_id122:SalesName4',
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem4:SalesName4',
//鏌ユ壘瀛楁鎵�鍦ㄥ璞�
@@ -797,7 +804,7 @@
//鍘焌pex:inputField鐨刬d鍊硷紝闇�瑕佸湪椤甸潰涓婅幏鍙�
- inputFieldId : 'allPage:allForm:pageBlockButton1:j_id105:j_id106:j_id125:SalesName5',
+ inputFieldId : 'allPage:allForm:pageBlockButton1:SalesSectionOut1:SalesSectionIn1:SalesSectionItem5:SalesName5',
//鏌ユ壘瀛楁鎵�鍦ㄥ璞�
--
Gitblit v1.9.1