From d3e4451e36fbe25da4427bccd4e6b41aefd473c8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 14:53:16 +0800
Subject: [PATCH] newclass0626formate
---
force-app/main/default/pages/SI_NewQuoteEntry.page | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/pages/SI_NewQuoteEntry.page b/force-app/main/default/pages/SI_NewQuoteEntry.page
index a08a769..62eb8ba 100644
--- a/force-app/main/default/pages/SI_NewQuoteEntry.page
+++ b/force-app/main/default/pages/SI_NewQuoteEntry.page
@@ -1,4 +1,4 @@
-<apex:page controller="SI_NewQuoteEntryController" sidebar="false" action="{!init}" id="Page">
+<apex:page controller="SI_NewQuoteEntryController" sidebar="false" action="{!init}" id="Page" lightningStylesheets="true">
<!-- <apex:page standardController="Quote" extensions="SI_NewQuoteEntryController" sidebar="false" action="{!init}" id="Page" > -->
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
@@ -85,6 +85,7 @@
window.open('/apex/SI_CsvModel?id='+encodeURI(a),'name','features','replace');
}
function QuoteConfirmJs() {
+ debugger
// body...
blockme();
//SWAG-C5DBAL 銆愬鎵樸�� [绱ф�SI璇环鑲栧瘨鏃犳硶淇敼鎶ヤ环鍗� 绮剧悽鎶�鏈� 2021/07/30 start
@@ -92,9 +93,22 @@
var profileId = '{!$User.profileId}';
//鑾峰彇鑷畾涔夋爣绛� 绯荤粺绠＄悊鍛樼畝妗�
var adminId = '{!$Label.ProfileId_SystemAdmin}';
+ //XLIU-CHRD8P銆愬鎵樸�戙�怬BSAP銆戣缁橭BSAP绠�妗BA2_璇环绠＄悊 SI璇环鎶ヤ环鍗曠‘璁ゆ潈闄� fy start
+ var adminId2 = '{!$Label.ProfileId_SystemAdmin2}';
+ var flag=true;
+ var profileId15=profileId;
+ if(profileId&&profileId.length>15){
+ profileId15=profileId.substring(0,15);
+ }
+ if(adminId2.includes(profileId15)){
+ flag=false;
+ }else{
+ flag=true;
+ }
+ //XLIU-CHRD8P銆愬鎵樸�戙�怬BSAP銆戣缁橭BSAP绠�妗BA2_璇环绠＄悊 SI璇环鎶ヤ环鍗曠‘璁ゆ潈闄� fy end
//鍙湁绯荤粺绠＄悊鍛樺彲浠ョ偣鍑�
- if(profileId!=adminId){
- alert('鍙湁绯荤粺绠＄悊鍛樻湁鏉冮檺纭鎶ヤ环锛�');
+ if(profileId!=adminId&&flag){
+ alert('鍙湁绯荤粺绠＄悊鍛樺拰钀ヤ笟鍔╃悊鏈夋潈闄愮‘璁ゆ姤浠凤紒');
unblockUI();
}else{
QuoteConfirm();
@@ -340,8 +354,8 @@
<tr>
<th style="text-align:right">{!IF(displayFlg,$Label.Total_ListPrice,'')}</th>
<td style="text-align:right;"><apex:outputText id="Estimation_List_Price" style="display:{!IF(displayFlg, '', 'none')}" value="{0, number, ###,##0.00}"><apex:param value="{!qb.Estimation_List_Price}" /></apex:outputText></td>
- <th style="text-align:right;">{!IF(displayFlg,$Label.Total_Price,'')}</th>
- <td><apex:inputField id="quoTotalPrice" value="{!quo.QuoteTotal_Page__c}" style="text-align:right;" rendered="{!displayFlg}" onchange="quoteTotalPriceAction()"/></td>
+ <th style="text-align:right;">{!IF(displayFlg,$Label.Total_Price,'')}</th><!--obsap 缁忛攢鍟�1鍚堝悓閲戦璁＄畻 fy html-disabled="true" -->
+ <td><apex:inputField id="quoTotalPrice" value="{!quo.QuoteTotal_Page__c}" style="text-align:right;" rendered="{!displayFlg}" onchange="quoteTotalPriceAction()" html-disabled="true"/></td>
<th style="text-align:right;">{!IF(displayFlg,$Label.Contact_Price,'')}</th>
<!-- 2018/09/28 CHAN-B4YAB8 缁忛攢鍟嗗崟浠疯绠� start -->
@@ -449,6 +463,21 @@
</center>
</div>
</td>
+ <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
+ <tr>
+ <th style="text-align:right;width:30px;"> </th>
+ <th style="text-align:left;width:50px;">{!$ObjectType.Quote.fields.QuotationChange__c.label}: </th>
+ <td style="width:190px;"><apex:inputField id="QuotationChange" value="{!quo.QuotationChange__c}" style="width:80px; text-align:right;" />
+ </td>
+ <th style="text-align:left;width:50px;">{!$ObjectType.Quote.fields.MainEngineWithoutMonitor__c.label}: </th>
+ <td style="width:500px;"><apex:inputField id="RemarksOnChanges" value="{!quo.MainEngineWithoutMonitor__c}" style="width:450px; text-align:left;" />
+ </td>
+ <th style="text-align:right;width:50px;">
+ {!$ObjectType.Quote.fields.Interdepartmental__c.label}
+ : </th>
+ <td style="width:200px;"><apex:inputField id="Interdepartmental" value="{!quo.Interdepartmental__c}" style="text-align:right;width:30px;" /></td>
+ </tr>
+ <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
<tr>
<td> </td>
</tr>
@@ -532,7 +561,7 @@
<apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Id__c==null,null,s.lineNo + 1)}" style="width:10px;"/>
</td>
<td class="dataCell" style="text-align:center;width:150px;">
- <apex:inputText id="Assert" style="width:120px;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value)" />
+ <apex:inputText id="Assert" style="width:120px;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value, '')" />
</td>
<td class="dataCell" id="{!Text(cnt-1)}:td_Status__c" style="width:100px;">
<apex:outputField style="width:75px;" id="Status__c" value="{!s.PageObject.SFDA_Status__c}"/>
--
Gitblit v1.9.1