From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111

---
 force-app/main/default/pages/SI_NewQuoteEntry.page |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/pages/SI_NewQuoteEntry.page b/force-app/main/default/pages/SI_NewQuoteEntry.page
index 1cc3055..4205ed6 100644
--- a/force-app/main/default/pages/SI_NewQuoteEntry.page
+++ b/force-app/main/default/pages/SI_NewQuoteEntry.page
@@ -96,8 +96,11 @@
             //XLIU-CHRD8P銆愬鎵樸�戙�怬BSAP銆戣缁橭BSAP绠�妗BA2_璇环绠＄悊 SI璇环鎶ヤ环鍗曠‘璁ゆ潈闄� fy start 
             var adminId2 = '{!$Label.ProfileId_SystemAdmin2}';
             var flag=true;
-            var a=adminId2.includes(profileId);
-            if(adminId2.includes(profileId)){
+            var profileId15=profileId;
+            if(profileId&&profileId.length>15){
+                profileId15=profileId.substring(0,15);
+            }
+            if(adminId2.includes(profileId15)){
                 flag=false;
             }else{
                 flag=true;
@@ -460,6 +463,21 @@
                         </center>
                     </div>
                     </td>
+                    <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
+                    <tr>
+                        <th style="text-align:right;width:30px;">&nbsp;</th>
+                        <th style="text-align:left;width:50px;">{!$ObjectType.Quote.fields.QuotationChange__c.label}:&nbsp;</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}:&nbsp;</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}
+                        :&nbsp;</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>&nbsp;</td>
                 </tr>
@@ -543,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