From c6ad239fe51b0fcfb0e3ce29f7545af00a48292d Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期五, 02 六月 2023 16:22:41 +0800
Subject: [PATCH] 分配追加附属品
---
force-app/main/default/staticresources/AccessoryAddCss.css | 11 ++
force-app/main/default/pages/AccessoryAdd.page | 216 ++++++++++++++++++++++++++++++-----------------------
2 files changed, 134 insertions(+), 93 deletions(-)
diff --git a/force-app/main/default/pages/AccessoryAdd.page b/force-app/main/default/pages/AccessoryAdd.page
index c183632..4e58510 100644
--- a/force-app/main/default/pages/AccessoryAdd.page
+++ b/force-app/main/default/pages/AccessoryAdd.page
@@ -1,95 +1,125 @@
<!-- <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: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;
+ }
+ /* 20230602 ljh */
+ body .message{
+ margin: 0rem 0!important;
+ }
+ body .pbBottomButtons{
+ margin: 0rem 0rem 0;
+ width: 99%;
+ }
+</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}"/>
+ <!-- 20230602 ljh start -->
+ <!-- <apex:pageBlockSectionItem >
+ <apex:outputPanel >
+ <apex:outputText value="鍏抽敭瀛�" style="width:50px"/>
+ <apex:inputText value="{!keyword}" style="width:200px;margin-left: 50px;"/>
</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:commandButton value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" />
+ </apex:pageBlockSectionItem> -->
+ <!-- 20230602 ljh end -->
+ </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 -->
+ <!-- 20230602 ljh start -->
+ <td width="80px" align ="right">鍏抽敭瀛楋細</td>
+ <td width="200px" align ="left">
+ <apex:inputText value="{!keyword}" style="width:200px;"/>
+ </td>
+ <td width="180px"><apex:commandButton value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" /></td>
+ <!-- 20230602 ljh start -->
+ </tr>
+ </table>
+ <!-- 20230602 ljh start -->
+ <!-- <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> -->
+ <!-- 20230602 ljh end -->
+ </apex:pageBlock>
+ <!-- 20230602 ljh start -->
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
+ </apex:outputPanel>
+ <apex:pageBlock>
+ <apex:pageBlockButtons location="bottom" style="margin:0;padding:0;">
+ <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:pageBlock>
+ <!-- 20230602 ljh end -->
+ <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true" isRadio="true" />
+ </apex:outputPanel>
+ </apex:form>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/AccessoryAddCss.css b/force-app/main/default/staticresources/AccessoryAddCss.css
index e69de29..732f8e6 100644
--- a/force-app/main/default/staticresources/AccessoryAddCss.css
+++ b/force-app/main/default/staticresources/AccessoryAddCss.css
@@ -0,0 +1,11 @@
+table.list .col_Asset__r_Fixture_Model_No_F__c {width:150px;}
+table.list .col_Fixture_Name__c {width:100px;}
+table.list .col_Asset__r_Fixture_Status__c {width:70px;}
+table.list .col_Asset__r_SerialNumber {width:100px;}
+table.list .col_Asset__r_Salesdepartment__c {width:100px;}
+table.list .col_Asset__r_Internal_asset_location__c {width:100px;}
+table.list .col_Asset__r_Product_category__c {width:120px;}
+table.list .col_Asset__r_Equipment_Type__c {width:90px;}
+table.list .col_Asset__r_Consumable_Guaranteen_end__c {width:100px;}
+table.list .col_Asset__r_You_Xiao_Ku_Cun__c {width:70px;}
+table.list .col_Asset__r_In_wh_Fu_Shu_Pin_You_Xiao_Ku_Cun_Sum__c {width:180px;}
\ No newline at end of file
--
Gitblit v1.9.1