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/MaintenanceProductData.page | 150 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 110 insertions(+), 40 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 9c5e8cc..12b55ae 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -4,6 +4,43 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
<style type="text/css">
+/*淇℃伅鎻愮ず棰滆壊*/
+body .bPageBlock .pbSubheader, .slds-vf-scope .bPageBlock .pbSubheader{
+ background-color: #08107b !important;;
+ color: #FFF !important;
+}
+body .infoM2, body .infoM3, body .infoM4, .slds-vf-scope .infoM2, .slds-vf-scope .infoM3, .slds-vf-scope .infoM4 {
+ background-color: #08107b !important;
+}
+body .message, .slds-vf-scope .message{
+ background-color: #08107b !important;
+}
+
+body .errorM2 h4,body .errorM3 h4,body .errorM4 h4,.slds-vf-scope .errorM2 h4,.slds-vf-scope .errorM3 h4,.slds-vf-scope .errorM4 h4 {
+ /* color: rgb(255, 255, 255)!important */
+ background-color: rgb(234, 0, 30)!important
+}
+
+body .errorM2,body .errorM3,body .errorM4,.slds-vf-scope .errorM2,.slds-vf-scope .errorM3,.slds-vf-scope .errorM4 {
+ background-color: rgb(234, 0, 30)!important
+}
+
+body .errorM2,body .errorM3,body .errorM4,.slds-vf-scope .errorM2,.slds-vf-scope .errorM3,.slds-vf-scope .errorM4 {
+ background-color: rgb(234, 0, 30)!important
+}
+body .warningM2,body .warningM3,body .warningM4,.slds-vf-scope .warningM2,.slds-vf-scope .warningM3,.slds-vf-scope .warningM4 {
+ background-color: rgb(254, 147, 57)!important;
+ color: rgb(24, 24, 24)!important
+}
+body .confirmM2,body .confirmM3,body .confirmM4,.slds-vf-scope .confirmM2,.slds-vf-scope .confirmM3,.slds-vf-scope .confirmM4 {
+ background-color: rgb(46, 132, 74)!important
+}
+body .pbButton{
+ text-align: left;
+}
+.message .messageText{
+ color: #FFF !important;
+}
.bPageBlock .detailList .dataCol{
width:100%
}
@@ -20,6 +57,17 @@
}
td.dataCol.first.last{
width: 100%
+ }
+ body .pbBody table.list tr th, body .pbBody table.list tr td {
+ border: 1px solid #ededed;
+ white-space: nowrap;
+}
+ 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>
<script>
@@ -897,8 +945,8 @@
<apex:outputPanel layout="none" rendered="{!IF(RecordTypeName = 'GuranteePrice'|| RecordTypeName ='GuranteeMain', false,true)}">
<tr>
<td align="right" style="width: 100px;">绗�1鍒嗙被</td>
- <td>
- <apex:selectList id="Category1" value="{!category1}" size="1">
+ <td align="right" style="width: 110px;">
+ <apex:selectList style="width: 100px" id="Category1" value="{!category1}" size="1">
<apex:selectOption itemValue="" itemLabel="-鏃�-"/>
<apex:selectOption itemValue="GI" itemLabel="GI"/>
<apex:selectOption itemValue="ET" itemLabel="ET"/>
@@ -909,13 +957,13 @@
</apex:selectList>
</td>
<td align="right" style="width: 100px;" >绗�2鍒嗙被</td>
- <td><apex:inputText id="Category2" value="{!category2}" style="width:100px"/></td>
+ <td align="right" style="width: 110px;"><apex:inputText id="Category2" value="{!category2}" style="width:100px"/></td>
<td align="right" style="width: 100px;" >绗�3鍒嗙被</td>
- <td><apex:inputText id="Category3" value="{!category3}" style="width:100px"/></td>
+ <td align="right" style="width: 110px;"><apex:inputText id="Category3" value="{!category3}" style="width:100px"/></td>
<td align="right" style="width: 100px;" >绗�4鍒嗙被</td>
- <td><apex:inputText id="Category4" value="{!category4}" style="width:100px"/></td>
+ <td align="right" style="width: 110px;"><apex:inputText id="Category4" value="{!category4}" style="width:100px"/></td>
<td align="right" style="width: 100px;" >绗�5鍒嗙被</td>
- <td><apex:inputText id="Category5" value="{!category5}" style="width:100px"/></td>
+ <td align="right" style="width: 110px;"><apex:inputText id="Category5" value="{!category5}" style="width:100px"/></td>
<!-- <td colspan="10"></td> -->
<!-- <td align="right"></td> -->
</tr>
@@ -928,19 +976,20 @@
<tr>
<td align="right" style="width: 100px;">浜у搧鍚嶇О</td>
<!-- ProductDateSearch -->
- <td><apex:inputText id="CateName" value="{!searchCateName}" style="width:100px"/></td>
+ <td align="right" style="width: 110px;"><apex:inputText id="CateName" value="{!searchCateName}" style="width:100px"/></td>
<td align="right" style="width: 100px;">浜у搧缂栫爜</td>
- <td><apex:inputText id="ProductCodeExt" value="{!searchProductCodeExt}" style="width:100px"/></td>
+ <td align="right" style="width: 110px;"><apex:inputText id="ProductCodeExt" value="{!searchProductCodeExt}" style="width:100px"/></td>
<apex:outputPanel layout="none" rendered="{!IF(RecordTypeName = 'GuranteePrice'|| RecordTypeName ='GuranteeMain', true,false)}">
<td align="right" style="width: 100px;">澶氬勾淇濅慨绫诲瀷</td>
- <td>
- <apex:selectList id="GuranteeType" value="{!searchGuranteeType}" size="1">
+ <td align="right" style="width: 110px;">
+ <apex:selectList style="width:100px" id="GuranteeType" value="{!searchGuranteeType}" size="1">
<apex:selectOption itemValue="" itemLabel="-鏃�-"/>
<apex:selectOption itemValue="甯傚満" itemLabel="甯傚満"/>
<apex:selectOption itemValue="鏈嶅姟" itemLabel="鏈嶅姟"/>
</apex:selectList>
</td>
</apex:outputPanel>
+ <td style="width: 30px;"></td>
<!-- <td colspan="{!IF(RecordTypeName = 'GuranteePrice'|| RecordTypeName ='GuranteeMain', 12,12)}"></td> -->
<!-- <td align="right"></td> -->
<td colspan="2" align="right"><apex:commandButton value="浜у搧鎼滅储" style="width: 100px;" onclick="searchProductJs();return false;" reRender="mpdDetailsSection" /></td>
@@ -957,9 +1006,9 @@
<div style="float: left;width: 95%;overflow:auto;">
<table class="list" border="0" cellpadding="0" cellspacing="0" width="100%" >
<tr class="headerRow">
- <th rowspan = "2">鏈�夋嫨鐨勪骇鍝�<br/>閫変腑鏁版嵁鎵归噺淇敼</th>
+ <th rowspan = "2" style="min-width: 100px">鏈�夋嫨鐨勪骇鍝�<br/>閫変腑鏁版嵁鎵归噺淇敼</th>
<apex:repeat value="{!title}" var="t">
- <th><apex:outputText value="{!t}"/></th>
+ <th style="min-width: 100px"><apex:outputText value="{!t}"/></th>
</apex:repeat>
</tr>
<!-- 閲嶇偣浜у搧缁存姢 -->
@@ -1014,12 +1063,12 @@
<apex:outputPanel layout="none" rendered="{!IF(RecordTypeName = 'GuranteeMain',true , false)}">
<tr>
<td>
- <apex:selectList id="GuranteeMain1" size="1">
+ <apex:selectList style="width:100px" id="GuranteeMain1" size="1">
<apex:selectOptions value="{!GuranteeTypeOps}"/>
</apex:selectList>
</td>
<td>
- <apex:selectList id="GuranteeMain2" size="1">
+ <apex:selectList style="width:100px" id="GuranteeMain2" size="1">
<apex:selectOptions value="{!EntendGuranteePeriodOps}"/>
</apex:selectList>
</td>
@@ -1034,6 +1083,10 @@
</span>
</td>
<td><input type="checkbox" id="GuranteeMain8" /></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
<!-- <td></td>
<td>
<input name="Intra_Trade_Service_RMB" id="GuranteeMain5" size="20" type="number" value="" disabled="true" />
@@ -1065,13 +1118,13 @@
<tr>
<td>
- <input name="RepairListPriceLevelA" id="RepairInfo1" size="10" type="number" value="" style="width:100px;" />
+ <input name="RepairListPriceLevelA" id="RepairInfo1" size="10" type="number" value="" style="width:100px;height:32px" />
</td>
<td>
- <input name="RepairListPriceLevelB" id="RepairInfo2" size="10" type="number" value="" style="width:100px;"/>
+ <input name="RepairListPriceLevelB" id="RepairInfo2" size="10" type="number" value="" style="width:100px;height:32px"/>
</td>
<td>
- <input name="RepairListPriceLevelC" id="RepairInfo3" size="10" type="number" value="" style="width:100px;"/>
+ <input name="RepairListPriceLevelC" id="RepairInfo3" size="10" type="number" value="" style="width:100px;height:32px"/>
</td>
<td>
<input type="checkbox" id="RepairInfo4" />
@@ -1080,7 +1133,7 @@
<input name="Repair_Product_Code" id="RepairInfo5" size="20" type="text" value="" style="width:100px;"/>
</td>
<td>
- <input name="Maintenance_Price_Year" id="RepairInfo6" size="20" type="number" style="width:100px;"/>
+ <input name="Maintenance_Price_Year" id="RepairInfo6" size="20" type="number" style="width:100px;height:32px"/>
</td>
<td>
<span class="dateInput dateOnlyInput">
@@ -1089,32 +1142,32 @@
</td>
<!-- LJPH-C6A3DF 銆愬鎵樸�� 銆愰噸瑕併�戜骇鍝佷富鏁版嵁涓鍔犳湇鍔＄敤浜у搧鍒嗙被 liuyan 20210908 Star -->
<td>
- <apex:selectList id="RepairInfo8" size="1">
+ <apex:selectList style="width: 100%" id="RepairInfo8" size="1">
<apex:selectOptions value="{!CanRepairOps}"/>
</apex:selectList>
</td>
<td>
- <apex:selectList id="RepairInfo9" size="1">
+ <apex:selectList style="width: 100%" id="RepairInfo9" size="1">
<apex:selectOptions value="{!ServiceCategory1}"/>
</apex:selectList>
</td>
<td>
- <apex:selectList id="RepairInfo10" size="1">
+ <apex:selectList style="width: 100%" id="RepairInfo10" size="1">
<apex:selectOptions value="{!ServiceCategory2}"/>
</apex:selectList>
</td>
<td>
- <apex:selectList id="RepairInfo11" size="1">
+ <apex:selectList style="width: 100%" id="RepairInfo11" size="1">
<apex:selectOptions value="{!ServiceCategory3}"/>
</apex:selectList>
</td>
<td>
- <apex:selectList id="RepairInfo12" size="1">
+ <apex:selectList style="width: 100%" id="RepairInfo12" size="1">
<apex:selectOptions value="{!ServiceCategory4}"/>
</apex:selectList>
</td>
<td>
- <apex:selectList id="RepairInfo13" size="1">
+ <apex:selectList style="width: 100%" id="RepairInfo13" size="1">
<apex:selectOptions value="{!ServiceCategory5}"/>
</apex:selectList>
</td>
@@ -1148,7 +1201,7 @@
<apex:inputField id="EquipmentInfo5" value="{!EquipmentInfo[0].Default_Fixture_Arrival_Product__c}"/>
</td>
<td>
- <apex:selectList id="EquipmentInfo6" size="1">
+ <apex:selectList id="EquipmentInfo6" size="1" style="width: 100%">
<apex:selectOptions value="{!DefaultFixtureArrivalProcessOps}"/>
</apex:selectList>
</td>
@@ -1157,7 +1210,7 @@
</table>
</div>
<div style="float: right;width:4%;position:relative;" >
- <button type="button" onclick="moreChange();" style="width:100%;display:inline-block;height:30px;margin-top:15px;">纭畾</button>
+ <button type="button" onclick="moreChange();" style="width: 100%;display: inline-block;height: 30px;margin-top: 30px;border-radius: .25rem;color: rgba(1, 118, 211, 1);background-color: white;border-width: 1px;border-color: rgb(201, 201, 201);border-style: double;">纭畾</button>
</div>
<div style="clear: both;"></div>
</apex:pageBlock>
@@ -1199,7 +1252,7 @@
</table>
</div>
<div style="float: right;width:4%;position:relative;" >
- <button type="button" onclick="ServiceMoreChange();" style="width:100%;display:inline-block;height:30px;margin-top:15px;">纭畾</button>
+ <button type="button" onclick="ServiceMoreChange();" style="width: 100%;display: inline-block;height: 30px;margin-top: 30px;border-radius: .25rem;color: rgba(1, 118, 211, 1);background-color: white;border-width: 1px;border-color: rgb(201, 201, 201);border-style: double;">纭畾</button>
</div>
<div style="clear: both;"></div>
</apex:pageBlock>
@@ -1215,21 +1268,38 @@
<input type="hidden" id="allPage:allForm:allBlock:edmpdDetails:mpdDetailsRecordsCount" value="{!mpdDetailsRecordsCount}" />
<table class="list" border="0" cellpadding="0" cellspacing="0">
<tr class="headerRow">
- <apex:variable var="v" value="" rendered="{!IF(editAble&&RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓',true,false)}">
- <th>閫夋嫨</th>
+ <apex:variable var="q" value="" rendered="{!IF(editAble,true,false)}">
+ <apex:variable var="v" value="" rendered="{!IF(editAble&&RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓',true,false)}">
+ <th>閫夋嫨</th>
+ </apex:variable>
+ <th>浜у搧鍚嶇О</th>
+ <th>浜у搧缂栫爜</th>
+ <apex:variable var="type" value="" rendered="{!IF(RecordTypeName='GuranteePrice',true,false)}">
+ <th>澶氬勾淇濅慨绫诲瀷</th>
+ </apex:variable>
+ <apex:repeat value="{!title}" var="t">
+ <th><apex:outputText value="{!t}"/></th>
+ </apex:repeat>
+ <apex:variable var="type" value="" rendered="{!IF(editAble&&!(RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓'),true,false)}">
+ <th>鎿嶄綔</th>
+ </apex:variable>
</apex:variable>
- <th>浜у搧鍚嶇О</th>
- <th>浜у搧缂栫爜</th>
- <apex:variable var="type" value="" rendered="{!IF(RecordTypeName='GuranteePrice',true,false)}">
- <th>澶氬勾淇濅慨绫诲瀷</th>
- </apex:variable>
- <apex:repeat value="{!title}" var="t">
- <th><apex:outputText value="{!t}"/></th>
- </apex:repeat>
- <apex:variable var="type" value="" rendered="{!IF(editAble&&!(RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓'),true,false)}">
- <th>鎿嶄綔</th>
+ <apex:variable var="q" value="" rendered="{!IF(editAble,false,true)}">
+ <apex:variable var="v" value="" rendered="{!IF(editAble&&RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓',true,false)}">
+ <th>閫夋嫨</th>
+ </apex:variable>
+ <th style="min-width: 130px;">浜у搧鍚嶇О</th>
+ <th style="min-width: 130px;">浜у搧缂栫爜</th>
+ <apex:variable var="type" value="" rendered="{!IF(RecordTypeName='GuranteePrice',true,false)}">
+ <th>澶氬勾淇濅慨绫诲瀷</th>
+ </apex:variable>
+ <apex:repeat value="{!title}" var="t">
+ <th style="min-width: 130px;"><apex:outputText value="{!t}"/></th>
+ </apex:repeat>
+ <apex:variable var="type" value="" rendered="{!IF(editAble&&!(RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓'),true,false)}">
+ <th>鎿嶄綔</th>
+ </apex:variable>
</apex:variable>
-
</tr>
<apex:repeat value="{!mpdDetailsRecords}" var="aa" id="bb">
<tr>
--
Gitblit v1.9.1