From 6945f4e865d3f6ba831515fe51e4e6167cd2077b Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 04 五月 2023 10:19:07 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/AccessoryAdd.page | 174 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 93 insertions(+), 81 deletions(-)
diff --git a/force-app/main/default/pages/AccessoryAdd.page b/force-app/main/default/pages/AccessoryAdd.page
index cfe06ea..c183632 100644
--- a/force-app/main/default/pages/AccessoryAdd.page
+++ b/force-app/main/default/pages/AccessoryAdd.page
@@ -1,83 +1,95 @@
-<apex:page controller="AccessoryAddController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
-<head>
-<title>闄勫睘鍝佽拷鍔�</title>
-<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-<apex:stylesheet value="{!URLFOR($Resource.AccessoryAddCss)}"/>
-<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
-<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
-
-<script type="text/javascript">
-var heightAjustment = 120;
-var widthAjustment = 30;
-
-</script>
-</head>
- <apex:form id="allForm">
- <apex:outputPanel id="pageallPanel">
- <apex:pageBlock id="searchBlock" tabStyle="Report">
- <apex:pageBlockSection title="闄勫睘鍝佽拷鍔�">
- <apex:outputField value="{!parentObj.Rental_Apply__r.Name}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Demo_purpose1__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Owner.Name}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.demo_purpose2__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Salesdept__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Product_category__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.WorkPlace__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Equipment_Type_F__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Internal_asset_location_F__c}" />
- <apex:outputText />
- <apex:outputField value="{!parentObj.Rental_Apply__r.Request_shipping_day__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Request_return_day__c}"/>
- <apex:outputField value="{!parentObj.Fixture_Set__r.Fixture_Set_Body_Model_No__c}"/>
- <apex:outputField value="{!parentObj.Irreplaceable_flag__c}"/>
- <apex:outputField value="{!parentObj.Fu_Shu_Pin_Fen_Pei_Jia__c}"/>
- <apex:outputText />
- <apex:outputField value="{!parentObj.Rental_Start_Date__c}"/>
- <apex:outputField value="{!parentObj.Rental_End_Date__c}"/>
-
- <apex:pageBlockSectionItem >
- <apex:outputPanel >
- <apex:outputText value="鍏抽敭瀛�" style="width:50px"/>
- <apex:inputText value="{!keyword}" style="width:200px;margin-left: 50px;"/>
+<!-- <apex:page controller="AccessoryAddController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
+ <apex:page controller="AccessoryAddController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets = "true">
+ <head>
+ <title>闄勫睘鍝佽拷鍔�</title>
+ <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.AccessoryAddCss)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+
+ <!-- 20230426 zq add style -->
+ <style>
+ body .bPageBlock .detailList .labelCol {
+ width: auto;
+ }
+ body input.btn {
+ padding: 2px 3px;
+ margin-left: 55px;
+ }
+ </style>
+ <script type="text/javascript">
+ var heightAjustment = 120;
+ var widthAjustment = 30;
+
+ </script>
+ </head>
+ <apex:form id="allForm">
+ <apex:outputPanel id="pageallPanel">
+ <apex:pageBlock id="searchBlock" tabStyle="Report">
+ <apex:pageBlockSection title="闄勫睘鍝佽拷鍔�">
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Name}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Demo_purpose1__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Owner.Name}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.demo_purpose2__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Salesdept__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Product_category__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.WorkPlace__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Equipment_Type_F__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Internal_asset_location_F__c}" />
+ <apex:outputText />
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Request_shipping_day__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Request_return_day__c}"/>
+ <apex:outputField value="{!parentObj.Fixture_Set__r.Fixture_Set_Body_Model_No__c}"/>
+ <apex:outputField value="{!parentObj.Irreplaceable_flag__c}"/>
+ <apex:outputField value="{!parentObj.Fu_Shu_Pin_Fen_Pei_Jia__c}"/>
+ <apex:outputText />
+ <apex:outputField value="{!parentObj.Rental_Start_Date__c}"/>
+ <apex:outputField value="{!parentObj.Rental_End_Date__c}"/>
+
+ <apex:pageBlockSectionItem >
+ <apex:outputPanel >
+ <apex:outputText value="鍏抽敭瀛�" style="width:50px"/>
+ <apex:inputText value="{!keyword}" style="width:200px;margin-left: 50px;"/>
+ </apex:outputPanel>
+ <apex:commandButton value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" />
+ </apex:pageBlockSectionItem>
+ </apex:pageBlockSection>
+ <table>
+ <tr>
+ <td width="20px"/>
+ <!--20230426 zq <td width="200px"> -->
+ <td width="220px">
+ <apex:outputLabel for="bieCunFangDi" value="澶囧搧瀛樻斁鍦�" />
+ <!-- <apex:outputText value="{!bieCunFangDi}"/> -->
+ <apex:selectList value="{!bieCunFangDi}" size="1" style="margin-left: 20px; width:110px" id="bieCunFangDi">
+ <apex:selectOptions value="{!bieCunFangDiOps}"/>
+ <!-- #OLY_OCM-659 澶囧搧瀛樻斁鍦� 閫夐」鍙樺寲鏃讹紝鏈儴 閫夐」鍊奸殢涔嬪彂鐢熷彉鍖� -->
+ <apex:actionSupport event="onchange" reRender="bieBenBu"/>
+ </apex:selectList>
+ </td>
+ <td width="10px"></td>
+ <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� Start -->
+ <td width="180px">
+ <apex:outputLabel for="bieBenBu" value="鏈儴" />
+ <apex:selectList value="{!bieBenBu}" size="1" style="margin-left: 20px; width:110px" id="bieBenBu">
+ <apex:selectOptions value="{!bieBenBuOps}"/>
+ </apex:selectList>
+ </td>
+ <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� End -->
+ </tr>
+ </table>
+ <apex:pageBlockButtons location="bottom">
+ <apex:commandButton style="float:left;" action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:right;" action="{!cancel}" value="杩斿洖" rerender="allForm"/>
+ </apex:pageBlockButtons>
+ <div style="clear:both;"></div>
+
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
</apex:outputPanel>
- <apex:commandButton value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" />
- </apex:pageBlockSectionItem>
- </apex:pageBlockSection>
- <table>
- <tr>
- <td width="20px"/>
- <td width="200px">
- <apex:outputLabel for="bieCunFangDi" value="澶囧搧瀛樻斁鍦�" />
- <!-- <apex:outputText value="{!bieCunFangDi}"/> -->
- <apex:selectList value="{!bieCunFangDi}" size="1" style="margin-left: 20px; width:110px" id="bieCunFangDi">
- <apex:selectOptions value="{!bieCunFangDiOps}"/>
- <!-- #OLY_OCM-659 澶囧搧瀛樻斁鍦� 閫夐」鍙樺寲鏃讹紝鏈儴 閫夐」鍊奸殢涔嬪彂鐢熷彉鍖� -->
- <apex:actionSupport event="onchange" reRender="bieBenBu"/>
- </apex:selectList>
- </td>
- <td width="10px"></td>
- <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� Start -->
- <td width="180px">
- <apex:outputLabel for="bieBenBu" value="鏈儴" />
- <apex:selectList value="{!bieBenBu}" size="1" style="margin-left: 20px; width:110px" id="bieBenBu">
- <apex:selectOptions value="{!bieBenBuOps}"/>
- </apex:selectList>
- </td>
- <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� End -->
- </tr>
- </table>
- <apex:pageBlockButtons location="bottom">
- <apex:commandButton style="float:left;" action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();" />
- <apex:commandButton style="float:right;" action="{!cancel}" value="杩斿洖" rerender="allForm"/>
- </apex:pageBlockButtons>
- <div style="clear:both;"></div>
-
- <apex:outputPanel id="message">
- <apex:pageMessages />
+ </apex:pageBlock>
+ <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true" isRadio="true" />
</apex:outputPanel>
- </apex:pageBlock>
- <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true" isRadio="true" />
- </apex:outputPanel>
- </apex:form>
-</apex:page>
\ No newline at end of file
+ </apex:form>
+ </apex:page>
\ No newline at end of file
--
Gitblit v1.9.1