From 8475b9f98c8a4c95446f02be4bf2a64e359c359a Mon Sep 17 00:00:00 2001
From: liwentao <1376563863@qq.com>
Date: 星期五, 11 八月 2023 09:10:31 +0800
Subject: [PATCH] 与测试环境对比，部分代码已被人修改，删除其中的alert和部分硬编码，还原测试环境代码逻辑
---
force-app/main/default/pages/AssetModifyBelongs.page | 32
force-app/main/default/pages/DealerPersonnelInformationImport.page | 4
force-app/main/default/classes/NewQuoteIraiController.cls | 55 ++
force-app/main/default/pages/CampaignCreate.page | 1
force-app/main/default/pages/AccountQualifyAlert.page | 3
force-app/main/default/pages/DateModify.page | 1
force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page | 4
force-app/main/default/pages/LookupPage.page | 16
force-app/main/default/pages/taskFeedback.page | 2
force-app/main/default/classes/GuaranteePeriodAlterationController.cls | 146 +++---
force-app/main/default/pages/InMaintenance.page | 2
force-app/main/default/classes/AssetModifyBelongsController.cls | 30
force-app/main/default/pages/maintenanceContractNotOpen.page | 2
force-app/main/default/pages/CM_SearchContactService.page | 9
force-app/main/default/pages/genjinbaobiao.page | 4
force-app/main/default/pages/BidAnnounceIframe.page | 2
force-app/main/default/pages/OFSHoverView.page | 2
force-app/main/default/pages/BandwidthExceeded.page | 4
force-app/main/default/pages/NewQuoteIrai.page | 818 ++++++++++++++++++------------------
force-app/main/default/pages/SearchProductIrai.page | 71 +-
force-app/main/default/pages/AssetGuaranteePeriodAlteration.page | 32
force-app/main/default/pages/InitCreateSolutionPage.page | 11
force-app/main/default/classes/BidAnnounceIframeController.cls | 27
force-app/main/default/pages/CampaignMember.page | 1
force-app/main/default/pages/SI_Opportunity_Response.page | 1
force-app/main/default/pages/UnderConstruction.page | 4
26 files changed, 677 insertions(+), 607 deletions(-)
diff --git a/force-app/main/default/classes/AssetModifyBelongsController.cls b/force-app/main/default/classes/AssetModifyBelongsController.cls
index f832d61..8b89bb5 100644
--- a/force-app/main/default/classes/AssetModifyBelongsController.cls
+++ b/force-app/main/default/classes/AssetModifyBelongsController.cls
@@ -105,7 +105,7 @@
soql = this.makeSoql1('', '');
assetListed = Database.query(soql);
assetListed = noSubmittedList(assetListed);
-
+
if (assetListed.size() > 0) {
ambc.rawAccount__c = assetListed[0].Account.Id;
}
@@ -180,7 +180,8 @@
Map<String, AssetModifyBelongsChangeDetailInfo> MidMap = new Map<String, AssetModifyBelongsChangeDetailInfo>();
List<Asset> asListed = new List<Asset>();
soql = this.makeSoql1(text1, val1);
- asListed = Database.query(soql);
+ System.debug('soql:'+soql);
+ asListed = Database.query(soql);
asListed = noSubmittedList(asListed);
for (AssetModifyBelongsChangeDetailInfo bss : assetModifyBelongsChangeDetailRecordsview) {
if (bss.check == true) {
@@ -224,10 +225,10 @@
Map<String,String> submittedMap = new Map<String,String>();
List<AssetModifyBelongsChangeDetail__c> changeDetailList = new List<AssetModifyBelongsChangeDetail__c>();
// 鏌ユ壘 淇濇湁璁惧鎵�灞炲彉鏇存槑缁�
- changeDetailList = [select Id, Name, Asset__c,Asset__r.Id
+ changeDetailList = [select Id, Name, Asset__c,Asset__r.Id
from AssetModifyBelongsChangeDetail__c
where ChangeAndChangeDetail__c In:ambcIdList];
-
+
if (changeDetailList.size() > 0) {
for(AssetModifyBelongsChangeDetail__c ambcDetail:changeDetailList){
submittedMap.put(ambcDetail.Asset__r.Id, ambcDetail.Asset__r.Id);
@@ -239,9 +240,9 @@
}
}
}
-
+
} else {
- noSubmittedList = asListed;
+ noSubmittedList = asListed;
}
if (noSubmittedList.size() > 200) {
@@ -254,13 +255,13 @@
} else{
break;
}
-
+
}
} else {
asListed = noSubmittedList;
}
}
-
+
return asListed;
// WLIG-BYZ9UF XHL 20210311 End
@@ -271,6 +272,7 @@
val1 = val1.trim();
}
String soql='';
+ //update by liwentao 20230705 start
System.debug(RawAccountId);
RawAccountId='';
if(String.isBlank(RawAccountId)){
@@ -281,6 +283,7 @@
soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'' + RawAccountId + '\'';
System.debug('id is not null');
}
+ //update by liwentao 20230705 start
if (!String.isBlank(text1)) {
if (text1 == 'Order_No__c' && checkexact) {
soql += ' AND (' + text1 + ' = \'' + String.escapeSingleQuotes(val1) + '\' )';
@@ -345,6 +348,7 @@
//璺宠浆鍒颁笂浼犻檮浠堕〉闈�
public PageReference uploadingAttachment() {
PageReference ref = new Pagereference('/p/attach/NoteAttach?pid=' + Id + '&retURL=%2Fapex/AssetModifyBelongs?Id=' + Id);
+
ref.setRedirect(true);
return ref;
}
@@ -353,7 +357,7 @@
public PageReference uploadingAttachmentLightning() {
//PageReference ref = new Pagereference('/p/attach/NoteAttach?pid=' + Id + '&retURL=%2Fapex/AssetModifyBelongs?Id=' + Id);
PageReference ref = new Pagereference('/lightning/n/lightning?backgroundContext=%2Flightning%2Fr%2FAssetModifyBelongsChange__c%2F'+Id+'%2Fedit%3Fcount%3D1&0.recordId='+Id+'');
-
+
ref.setRedirect(true);
return ref;
}
@@ -386,7 +390,7 @@
//鎻愪氦涔嬪墠楠岃瘉淇濇湁璁惧鏄惁鍦ㄥ師瀹㈡埛涓嬶紝涓嶅湪鎶ラ敊銆�
List<AssetModifyBelongsChangeDetail__c> getAmBdList = new List<AssetModifyBelongsChangeDetail__c>();
getAmBdList = [SELECT Id, Name,Asset__r.SerialNumber,AssetNotAccount__c,Asset__r.Account.Name,ChangeAndChangeDetail__r.rawAccount__r.Name
- FROM AssetModifyBelongsChangeDetail__c
+ FROM AssetModifyBelongsChangeDetail__c
WHERE ChangeAndChangeDetail__c = : Id AND AssetNotAccount__c = true];
if (getAmBdList.size() > 0) {
for (AssetModifyBelongsChangeDetail__c ambcd: getAmBdList ) {
@@ -394,11 +398,11 @@
String rawAccountName = ' 涓嶅湪瀹㈡埛 銆� ' + ambcd.ChangeAndChangeDetail__r.rawAccount__r.Name +' 銆� 涓嬶紝';
String accountName = ' 鍦ㄥ鎴� 銆� ' +ambcd.Asset__r.Account.Name +' 銆� 涓嬶紝';
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, serialNumber+rawAccountName+accountName+' 鏃犳硶鎻愪氦锛岃纭'));
-
+
}
return null;
}
-
+
try {
Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
psr.setObjectId(Id);
@@ -628,4 +632,4 @@
}
}
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/BidAnnounceIframeController.cls b/force-app/main/default/classes/BidAnnounceIframeController.cls
index 2d424a7..6f2b673 100644
--- a/force-app/main/default/classes/BidAnnounceIframeController.cls
+++ b/force-app/main/default/classes/BidAnnounceIframeController.cls
@@ -8,17 +8,24 @@
public void init() {
Bid_Announcement__c bid = [select Id, Web_URL__c, Web_URL_ModifiedDate__c from Bid_Announcement__c where Id = :recordId];
- List<Attachment> attList = [select Id, LastModifiedDate from Attachment where ParentId = :recordId order by LastModifiedDate desc limit 1];
- Attachment att = null;
- if (attList.size() > 0) {
- att = attList[0];
+ // List<Attachment> attList = [select Id, LastModifiedDate from Attachment where ParentId = :recordId order by LastModifiedDate desc limit 1];
+ List<ContentDocumentLink> links = [select ContentDocumentId from ContentDocumentLink where LinkedEntityId =: recordId];
+ List<Id> idList = new List<Id>();
+ for (ContentDocumentLink link : links) {
+ idList.add(link.ContentDocumentId);
}
-
+ List<ContentDocument> docList = [select Id,ContentModifiedDate from ContentDocument where Id in: idList order by ContentModifiedDate desc limit 1];
+ // Attachment att = null;
+ ContentDocument doc = null;
+ if (docList.size() > 0) {
+ doc = docList[0];
+ }
+ ContentVersion version = [select Id from ContentVersion where ContentDocumentId =: doc.Id];
if (bid.Web_URL__c != null) {
// 涓爣閫氱煡涔RL鏇存柊鏃堕棿銆�銇ㄣ��鏈�鏂癆ttachment銇檪闁撱仺姣旇純銆佹柊銇椼亜銈傘伄銈掗仼鐢�
- if (att != null) {
- if (bid.Web_URL_ModifiedDate__c < att.LastModifiedDate) {
- iframe = '/servlet/servlet.FileDownload?file=' + att.Id;
+ if (doc != null) {
+ if (bid.Web_URL_ModifiedDate__c < doc.ContentModifiedDate) {
+ iframe = '/sfc/servlet.shepherd/version/renditionDownload?rendition=THUMB720BY480&versionId='+ version.Id;
} else {
iframe = bid.Web_URL__c;
}
@@ -29,8 +36,8 @@
}
} else {
// Attachment銈掗仼鐢�
- if (att != null) {
- iframe = '/servlet/servlet.FileDownload?file=' + att.Id;
+ if (doc != null) {
+ iframe = '/sfc/servlet.shepherd/version/renditionDownload?rendition=THUMB720BY480&versionId='+ version.Id;
}
}
}
diff --git a/force-app/main/default/classes/GuaranteePeriodAlterationController.cls b/force-app/main/default/classes/GuaranteePeriodAlterationController.cls
index b0740c1..6d33eca 100644
--- a/force-app/main/default/classes/GuaranteePeriodAlterationController.cls
+++ b/force-app/main/default/classes/GuaranteePeriodAlterationController.cls
@@ -17,29 +17,29 @@
textOpts.add(new SelectOption('SerialNumber' , Schema.SObjectType.Asset.fields.SerialNumber.label));
//textOpts.add(new SelectOption('Installation_Site__c', Schema.SObjectType.Asset.fields.Installation_Site__c.label));
//textOpts.add(new SelectOption('Department_Name__c' , Schema.SObjectType.Asset.fields.Department_Name__c.label));
-
+
changeReasonOpts = new List<SelectOption>();
changeReasonOpts.add(new SelectOption('' , '-鏃�-'));
changeReasonOpts.add(new SelectOption('闆嗕腑閲囪喘,鏈垎閰嶅埌鍖婚櫌' , '闆嗕腑閲囪喘,鏈垎閰嶅埌鍖婚櫌'));
changeReasonOpts.add(new SelectOption('鍏朵粬' , '鍏朵粬'));
-
+
}
-
+
/*****************鐢婚潰鍒濆鍖栫敤********************************/
-
+
public Boolean editAble {get;set;}
public Boolean spoLinkFlag {get;set;}
public String statusEdit {get;set;}
/*****************鐢婚潰琛ㄧずBean******************/
-
+
private List<GuaranteePeriodAlterationDetailInfo> guaranteePeriodAlterationDetailRecords = new List<GuaranteePeriodAlterationDetailInfo>();
public List<GuaranteePeriodAlterationDetailInfo> guaranteePeriodAlterationDetaiRecordsview { get; set; }
- public Integer ConsumableorderdetailsCount {
+ public Integer ConsumableorderdetailsCount {
get {
return guaranteePeriodAlterationDetailRecords == null ? 0 : guaranteePeriodAlterationDetailRecords.size();
}
}
- public Integer ConsumableorderdetailsviewCount {
+ public Integer ConsumableorderdetailsviewCount {
get {
return guaranteePeriodAlterationDetaiRecordsview == null ? 0 : guaranteePeriodAlterationDetaiRecordsview.size();
}
@@ -48,11 +48,11 @@
public String Id { get; set; }
public Boolean isShow { get; set; }
public List<Attachment> attachments { get; set; }
- public List<ContentDocument> contents { get; set; }
+ public List<ContentDocument> contents { get; set; }//update by liwentao 鏇存柊lightning闄勪欢涓婁紶
//鍒嗛〉鍔熻兘
public Integer pageLimit{get;set;}
public String soql {get;set;}
-
+
public GuaranteePeriodAlterationController(ApexPages.StandardController stdController) {
isShow = false;
Statu_AchievementsId = ApexPages.currentPage().getParameters().get('Statu_AchievementsId');
@@ -80,7 +80,7 @@
// 鐢婚潰鍒濆鍖�
public void init() {
-
+
if(Id!=null&&Id!=''&&statusEdit==''&&statusEdit==null){
editAble = false;
}else if((Id == null||Id=='')&&(statusEdit==''||statusEdit==null)){
@@ -92,16 +92,16 @@
guaranteePeriodAlterationDetailRecords = new List<GuaranteePeriodAlterationDetailInfo>();
List<Asset> assetListed = new List<Asset>();
Map<String,GuaranteePeriodAlterationDetailInfo> MidMap = new Map<String,GuaranteePeriodAlterationDetailInfo>();
-
+
if(Id== NULL || Id==''){
- List<Statu_Achievements__c> statuAchievements = [select Id,InstallDate__c from Statu_Achievements__c where Id = :Statu_AchievementsId];
+ List<Statu_Achievements__c> statuAchievements = [select Id,InstallDate__c from Statu_Achievements__c where Id = :Statu_AchievementsId];
ambc.WarrantyStartDate__c = statuAchievements[0].InstallDate__c;
soql = this.makeSoql1('','');
assetListed = Database.query(soql);
for (Integer i = 0; i < assetListed.size(); i++) {
guaranteePeriodAlterationDetailRecords.add(new GuaranteePeriodAlterationDetailInfo(assetListed[i]));
-
+
MidMap.put(assetListed[i].Id, new GuaranteePeriodAlterationDetailInfo(assetListed[i]));
}
@@ -111,7 +111,7 @@
}else{
List<GuaranteePeriodAlterationDetail__c> changeDetailList = new List<GuaranteePeriodAlterationDetail__c>();
List<GuaranteePeriodAlterationApplication__c> assetChangeList = new List<GuaranteePeriodAlterationApplication__c>();
-
+
assetChangeList = [select Id, Name,Change_status__c,
ChangeReason__c,WarrantyStartDate__c,
ChangeReason_text__c,GpaaStatu_Achievements__c
@@ -139,7 +139,7 @@
for(GuaranteePeriodAlterationDetailInfo ass:MidMap.values()){
guaranteePeriodAlterationDetailRecords.add(ass);
-
+
}
for(GuaranteePeriodAlterationDetailInfo ass : guaranteePeriodAlterationDetailRecords){
@@ -149,17 +149,17 @@
guaranteePeriodAlterationDetaiRecordsview.add(ass);
}
}
-
+
}
isShow = true;
attachments = seekAttachment();
- }
+ }
}
// 妫�绱�
public void searchConsumableorderdetails() {
-
+
Map<String,GuaranteePeriodAlterationDetailInfo> MidMap = new Map<String,GuaranteePeriodAlterationDetailInfo>();
List<Asset> asListed = new List<Asset>();
soql = this.makeSoql1(text1,val1);
@@ -174,7 +174,7 @@
if(!MidMap.containsKey(asListed[i].Id)){
MidMap.put(asListed[i].Id, new GuaranteePeriodAlterationDetailInfo(asListed[i]));
}
-
+
}
@@ -224,14 +224,14 @@
//鍒犻櫎鎸夐挳
public PageReference DelConsumable(){
GuaranteePeriodAlterationApplication__c ambc = new GuaranteePeriodAlterationApplication__c(Id = Id);
- List<GuaranteePeriodAlterationDetail__c> changeDetailList = [Select Id,GuaranteePeriodAlteration__r.GpaaStatu_Achievements__c
- from GuaranteePeriodAlterationDetail__c
- where GuaranteePeriodAlteration__c = :Id];
- String rawAccountIded = '';
+ List<GuaranteePeriodAlterationDetail__c> changeDetailList = [Select Id,GuaranteePeriodAlteration__r.GpaaStatu_Achievements__c
+ from GuaranteePeriodAlterationDetail__c
+ where GuaranteePeriodAlteration__c = :Id];
+ String rawAccountIded = '';
if(changeDetailList.size()> 0){
rawAccountIded = changeDetailList[0].GuaranteePeriodAlteration__r.GpaaStatu_Achievements__c;
}
-
+
try {
delete changeDetailList;
delete ambc;
@@ -240,7 +240,7 @@
} catch (Exception e) {
ApexPages.addMessages(e);
return null;
- }
+ }
//return null;
}
@@ -250,7 +250,7 @@
ref.setRedirect(true);
return ref;
}
-
+
//鏌ユ壘褰撳墠"淇濅慨鏈熼檺鍙樻洿鐢宠"鎵�鏈夌殑闄勪欢
public List<Attachment> seekAttachment() {
return [select Id, ParentId, Name, OwnerId, CreatedDate, BodyLength FROM Attachment where ParentId = :Id];
@@ -281,7 +281,7 @@
if (repairList.size() > 0 || qIS_ReportList.size() > 0 || assets.size() > 0) {
if (repairList.size() > 0) {
-
+
for (Repair__c repair :repairList) {
assetIdMap.put(repair.Delivered_Product__c,repair.Delivered_Product__r.SerialNumber+'(鍚慨鐞�)');
}
@@ -302,7 +302,7 @@
}
return true;
- }
+ }
return false;
}
@@ -316,9 +316,9 @@
agAlteration.Id = Id;
attachments = seekAttachment();
if (ambc.ChangeReason__c == '闆嗕腑閲囪喘,鏈垎閰嶅埌鍖婚櫌' && attachments.size() == 0) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇蜂笂浼犳爣涔�'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇蜂笂浼犳爣涔�'));
return null;
- }
+ }
try{
@@ -331,32 +331,32 @@
Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
psr.setObjectId(Id);
Approval.ProcessResult submitResult = Approval.process(psr);
- return ref;
+ return ref;
}
catch (Exception e) {
//ApexPages.addmessages(e);
Database.rollback(sp);
- return null;
+ return null;
}
//return null;
- //return UnabletoEdit();
+ //return UnabletoEdit();
}
//楠岃瘉瀛楁
public Boolean warning() {
if (String.isBlank(ambc.ChangeReason__c)) {
-
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ュ彉鏇村師鍥�'));
+
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ュ彉鏇村師鍥�'));
return true;
} else if (ambc.ChangeReason__c == '鍏朵粬' && String.isBlank(ambc.ChangeReason_text__c)) {
-
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙樻洿鍘熷洜涓�"鍏朵粬"鏃讹紝璇疯緭鍏�"鍙樻洿鍘熷洜鍏朵粬"'));
+
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙樻洿鍘熷洜涓�"鍏朵粬"鏃讹紝璇疯緭鍏�"鍙樻洿鍘熷洜鍏朵粬"'));
return true;
} else if (ambc.WarrantyStartDate__c == null) {
-
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ヤ繚淇紑濮嬫棩'));
+
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ヤ繚淇紑濮嬫棩'));
return true;
}
@@ -370,7 +370,7 @@
}
if (Count == FLG) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇烽�夋嫨瑕佷慨鏀圭殑淇濇湁璁惧'));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇烽�夋嫨瑕佷慨鏀圭殑淇濇湁璁惧'));
return true;
}
@@ -381,10 +381,10 @@
// 淇濆瓨鎸夐挳
public PageReference save() {
//return null;
-
+
GuaranteePeriodAlterationApplication__c agAlteration = new GuaranteePeriodAlterationApplication__c ();
List<GuaranteePeriodAlterationDetail__c> Ins = New List<GuaranteePeriodAlterationDetail__c>();
-
+
//鏂板缓鍙樻洿鍗曟椂
Savepoint sp = Database.setSavepoint();
try {
@@ -392,11 +392,11 @@
agAlteration.ChangeReason_text__c = ambc.ChangeReason_text__c;
agAlteration.WarrantyStartDate__c = ambc.WarrantyStartDate__c;
agAlteration.ChangeReason__c = ambc.ChangeReason__c;
-
+
if (warning()) {
return null;
- }
+ }
if (String.isBlank(Id)) {
@@ -411,23 +411,23 @@
ApexPages.addMessages(e);
}
-
+
Map<String,String> assetGuaranteeTimeMap = new Map<String,String>();
- List<GuaranteePeriodAlterationApplication__c> saveGpaApplicationList =
- [SELECT Id,Name,WarrantyStartDate__c
- FROM GuaranteePeriodAlterationApplication__c
+ List<GuaranteePeriodAlterationApplication__c> saveGpaApplicationList =
+ [SELECT Id,Name,WarrantyStartDate__c
+ FROM GuaranteePeriodAlterationApplication__c
WHERE id = :agAlteration.id];
-
+
if ( saveGpaApplicationList.size() > 0) {
List<Asset> assetList = [Select Id,Guarantee_period_for_products__c,guarantee_period__c,RepairQuantity__c,SerialNumber
from Asset
where Backorder__c = :Statu_AchievementsId];
- Map<String,Integer> assetMap = new Map<String,Integer>();
+ Map<String,Integer> assetMap = new Map<String,Integer>();
for (Asset ass :assetList) {
assetMap.put(ass.Id,Integer.valueOf(ass.guarantee_period__c));
- }
+ }
List<String> assetIds = new List<String>();
@@ -443,23 +443,23 @@
gpaDetail.Name = saveGpaApplicationList[0].Name + '-'+ str;
gpaDetail.GuaranteePeriodAlteration__c = saveGpaApplicationList[0].Id;
gpaDetail.Asset__c = ass.ast.Id;
- gpaDetail.GuaranteeTime__c = saveGpaApplicationList[0].WarrantyStartDate__c.addDays(assetMap.get(ass.ast.Id));
+ gpaDetail.GuaranteeTime__c = saveGpaApplicationList[0].WarrantyStartDate__c.addDays(assetMap.get(ass.ast.Id));
i++;
Ins.add(gpaDetail);
assetIds.add(ass.ast.Id);
}
}
-
+
if (find_QIS_Repair(assetIds)) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '浠ヤ笅淇濇湁璁惧鍚湁"QIS"鎴�"淇悊"鎴�"淇濅慨鏈熼檺鍙樻洿杩�"涓嶉�傚悎鍙樻洿"淇濅慨鏈熼檺"' + assetIdMap.values()));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '浠ヤ笅淇濇湁璁惧鍚湁"QIS"鎴�"淇悊"鎴�"淇濅慨鏈熼檺鍙樻洿杩�"涓嶉�傚悎鍙樻洿"淇濅慨鏈熼檺"' + assetIdMap.values()));
return null;
- }
+ }
//update saveGpaApplicationList;
- }
-
+ }
+
Id = agAlteration.id;
@@ -469,26 +469,26 @@
}
}
//淇敼涔嬪悗 淇濆瓨璁㈠崟
- else if(!String.isBlank(Id)){
-
+ else if(!String.isBlank(Id)){
+
agAlteration.Id = Id;
- agAlteration.GpaaStatu_Achievements__c = ambc.GpaaStatu_Achievements__c;
-
+ agAlteration.GpaaStatu_Achievements__c = ambc.GpaaStatu_Achievements__c;
+
update agAlteration;
- List<GuaranteePeriodAlterationDetail__c> delIns =
+ List<GuaranteePeriodAlterationDetail__c> delIns =
[select Id from GuaranteePeriodAlterationDetail__c
where GuaranteePeriodAlteration__r.Id = :Id];
-
+
if(delIns.size()>0){
delete delIns;
}
Integer i = 1;
- List<GuaranteePeriodAlterationApplication__c> saveGpaApplicationList =
- [SELECT Id,Name
- FROM GuaranteePeriodAlterationApplication__c
+ List<GuaranteePeriodAlterationApplication__c> saveGpaApplicationList =
+ [SELECT Id,Name
+ FROM GuaranteePeriodAlterationApplication__c
WHERE id =:agAlteration.id];
List<String> assetIds = new List<String>();
@@ -498,15 +498,15 @@
GuaranteePeriodAlterationDetail__c gpaDetail = new GuaranteePeriodAlterationDetail__c();
String str = string.valueOf(i);
-
+
if(str.length() == 1){
-
+
str = '0' + str;
}
gpaDetail.Name = saveGpaApplicationList[0].Name + '-'+ str;
gpaDetail.GuaranteePeriodAlteration__c = saveGpaApplicationList[0].Id;
- gpaDetail.Asset__c = ass.ast.Id;
+ gpaDetail.Asset__c = ass.ast.Id;
i++;
Ins.add(gpaDetail);
assetIds.add(ass.ast.Id);
@@ -515,10 +515,10 @@
if (find_QIS_Repair(assetIds)) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '浠ヤ笅淇濇湁璁惧鍚湁"QIS"鎴�"淇悊"鎴�"淇濅慨鏈熼檺鍙樻洿杩�"涓嶉�傚悎鍙樻洿"淇濅慨鏈熼檺"' + assetIdMap.values()));
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '浠ヤ笅淇濇湁璁惧鍚湁"QIS"鎴�"淇悊"鎴�"淇濅慨鏈熼檺鍙樻洿杩�"涓嶉�傚悎鍙樻洿"淇濅慨鏈熼檺"' + assetIdMap.values()));
return null;
}
-
+
if(Ins.size()>0){
insert Ins;
@@ -569,6 +569,6 @@
ast = e;
canSelect = true;
}
-
+
}
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/NewQuoteIraiController.cls b/force-app/main/default/classes/NewQuoteIraiController.cls
index 510f981..a681f61 100644
--- a/force-app/main/default/classes/NewQuoteIraiController.cls
+++ b/force-app/main/default/classes/NewQuoteIraiController.cls
@@ -310,6 +310,15 @@
} else {
// 宸茬粡瀛樺湪鎶ヤ环
if (String.isNotBlank(oppquoid)) {
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ Quote quo2 = new Quote();
+ List<Quote> quote = [select Id,Agency1__c,Agency2__c From Quote Where Id =:oppquoid];
+ if(quote.size()>0){
+ quo2=quote[0];
+ }
+ quo.Agency1_entrust__c = quo2.Agency1__c;
+ quo.Agency2_entrust__c = quo2.Agency2__c;
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
// 鎶ヤ环鍟嗗搧鍙栧緱
// CHAN-BHNBX6 2019/11/20 START//fy lastbuy 20220310 PricebookEntry.Product2.LastbuyProductFLG__c
List<QuoteLineItem> qlis = [select id,PricebookEntry.Product2Id,PricebookEntry.Product2.LastbuyProductFLG__c,Quantity__c,CurrencyIsoCode,GuaranteePeriod__c from QuoteLineItem where QuoteId = :oppquoid];
@@ -426,6 +435,7 @@
[ SELECT Id,Name,Cancel_Decide__c,Agency_Hospital_Link__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,Agency1_entrust__c,cancelMultiyearInsurance__c,
Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Noteplus__c,Lead__c,Opportunity__c,
TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Print_HP_Name__c,Account__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
FROM QuoteIrai__c Where Id =:quoId];
@@ -1022,7 +1032,7 @@
}
}
}
- System.debug('---lt123---descriptions---'+descriptions);
+ // System.debug('---lt123---descriptions---'+descriptions);
if (descriptions.size() <= 0) {
errorflg = true;
errorMessage = '娌℃湁瑕佸鎵樼殑浜у搧銆�';
@@ -1059,7 +1069,7 @@
}
i += 1;
}
- System.debug('---lt123---description---'+description);
+ // System.debug('---lt123---description---'+description);
//obsap 鏂板缁忛攢鍟�1瀛楁 fy start
if (!String.isBlank(quo.Agency1_entrust__c)) {
Account quoteAeName = [select Id,Name from Account where Id =:quo.Agency1_entrust__c];
@@ -1068,6 +1078,13 @@
descriptionsendEmailbody += '\r\n' + '绗竴缁忛攢鍟嗗悕绉�' + '锛�' + quoteAeName.Name;
//20230116 fy end
}
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ if (!String.isBlank(quo.Agency2_entrust__c)) {
+ Account quoteAeName2 = [select Id,Name from Account where Id =:quo.Agency2_entrust__c];
+ description += '\r\n' + '绗簩缁忛攢鍟嗗悕绉�' + '锛�' + quoteAeName2.Name;
+ descriptionsendEmailbody += '\r\n' + '绗簩缁忛攢鍟嗗悕绉�' + '锛�' + quoteAeName2.Name;
+ }
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
if (quo.QuoteProportion__c!=null) {
description += '\r\n' + '鎶ヤ环姣斾緥' + '锛�' + quo.QuoteProportion__c;
//20230116 fy start
@@ -1119,6 +1136,12 @@
descriptionsendEmailbody += '\r\n' + '绗竴缁忛攢鍟�' + '锛�' + baseUrl + '/' + quo.Agency1_entrust__c;
//20230116 fy end
}
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ if (!String.isBlank(quo.Agency2_entrust__c)) {
+ description += '\r\n' + '绗簩缁忛攢鍟�' + '锛�' + baseUrl + '/' + quo.Agency2_entrust__c;
+ descriptionsendEmailbody += '\r\n' + '绗簩缁忛攢鍟�' + '锛�' + baseUrl + '/' + quo.Agency2_entrust__c;
+ }
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
//SWAG-CKDATG銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
if (!String.isBlank(tenderid)&&!description.contains('鎷涙爣椤圭洰') ) {
description += '\r\n' + '鎷涙爣椤圭洰' + '锛�' + baseUrl + '/' + tenderid;
@@ -1304,7 +1327,7 @@
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,
- TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Print_HP_Name__c,Account__c,Agency_Hospital_Link__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
FROM QuoteIrai__c Where Id =:quoId];
@@ -1327,6 +1350,25 @@
if(String.isNotBlank(leadid)){
lea.Id = leadid;
lea.OfferToEntrust__c = 1;
+
+ //20230227 lt DB202302251962 start
+ Map<Date,String> lm = new Map<Date,String>();
+ for(OlympusCalendar__c oc:[SELECT Id,Date__c FROM OlympusCalendar__c WHERE Date__c =: Date.today()]){
+ lm.put(oc.Date__c,oc.Id);
+ }
+ String datestr =String.valueOf(Date.today());
+ String dt = lm.get(Date.valueOf(datestr.substring(0,10)));
+
+ List<Lead> leadlist = [select Id,FirstDate_Quote_Irai__c from Lead where Id = :leadid];
+ // System.debug('lt123鏃ユ湡1'+ leadlist[0].FirstDate_Quote_Irai__c);
+ // System.debug('lt123鏃ユ湡2'+ lea.FirstDate_Quote_Irai__c);
+ if(leadlist.size() > 0){
+ if(leadlist[0].FirstDate_Quote_Irai__c == null){
+ lea.FirstDate_Quote_Irai__c = dt;
+ }
+ }
+ //20230227 lt DB202302251962 end
+
update lea;
}
//XLIU-CHY4KW 20220907 lt end
@@ -1668,7 +1710,7 @@
//XLIU-CFE8M7 銆愬鎵樸�戙�怭-OBSAP銆戞姤浠峰鎵樹换鍔℃敼鍠� fy Noteplus__c
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
qs = [select Id,Account__c,Agency_Hospital_Link__c,Name,IraiUser__c,IraiSubject__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,
- Preferential_Trading_Price__c,Discount__c,Pricing__c,Unit_Price__c,Offer_Amount__c,TOTAL__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ Preferential_Trading_Price__c,Discount__c,Pricing__c,Unit_Price__c,Offer_Amount__c,TOTAL__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Contract__c,Print_HP_Name__c,Quote_Expiration_Date__c,Quote_Comment__c,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
From QuoteIrai__c Where Id =:quoId];
@@ -1697,6 +1739,9 @@
//obsap 鏂板缁忛攢鍟�1瀛楁 fy staty
q.Agency1_entrust__c = quo.Agency1_entrust__c;
//obsap 鏂板缁忛攢鍟�1瀛楁 fy staty
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start
+ q.Agency2_entrust__c = quo.Agency2_entrust__c;
+ //DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end
// SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start
q.cancelMultiyearInsurance__c = quo.cancelMultiyearInsurance__c;
// SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end
@@ -1738,7 +1783,7 @@
//SWAG-CF589P銆愬鎵樸�戙�怭:OBSAP銆戞姤浠峰鎵樼浉鍏虫柊闇�姹傝瘎浼� fy Lead__c,Opportunity__c,
quo =[ SELECT Id,Name,Cancel_Decide__c,CreatedDate, PriceRefreshDate__c,Quote_Print_Date__c,//obsap 鏂板缁忛攢鍟�1瀛楁 fy satrt Agency1_entrust__c,SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start cancelMultiyearInsurance__c,
Quote_Date__c,QuoteToName__c,Quote_Expiration_Date__c,Quote_Comment__c,Tender_information__c,Agency1_entrust__c,Noteplus__c,Lead__c,Opportunity__c,cancelMultiyearInsurance__c,Headquarters__c,//DB202301106714 銆愭姤浠峰鎵樻敼鍠勩�慜BSAP閫氱煡閭欢鍙戦�侀偖绠变慨鏀� fy Headquarters__c
- TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,
+ TOTAL__c,Discount__c,Pricing__c,Preferential_Trading_Price__c,Contract__c,LastIraiUser__c,MultiYearWarrantyTotalPrice__c,QuoteTotal_Page__c,Estimation_List_Price__c,Agency2_entrust__c,//DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy
Print_HP_Name__c,Account__c,Agency_Hospital_Link__c,IraiUser__c,IraiSubject__c,CurrencyIsoCode,IraiName__c,QuoteIrai_Status__c,QuoteProportion__c,Note__c,IraiComment__c
, urgent__c //20230104 lt DB202212427301
FROM QuoteIrai__c Where Id =:q.Id];
diff --git a/force-app/main/default/pages/AccountQualifyAlert.page b/force-app/main/default/pages/AccountQualifyAlert.page
index 8626d85..52fad8b 100644
--- a/force-app/main/default/pages/AccountQualifyAlert.page
+++ b/force-app/main/default/pages/AccountQualifyAlert.page
@@ -4,7 +4,6 @@
<script type="text/javascript">
function init() {
var is_Alert_Qualify = '{!is_Alert_Qualify}';
- alert(is_Alert_Qualify)
if(is_Alert_Qualify == 'true'){
alert('鍖婚櫌淇℃伅鍙戠敓鍙樺寲锛岃閲嶆柊鐢宠鍖婚櫌璧勮川瀹℃壒锛�');
}
@@ -12,4 +11,4 @@
</script>
<body onload="init()">
</body>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
index 144577c..94a7016 100644
--- a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
+++ b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
@@ -10,7 +10,7 @@
blockme();
document.getElementById("allPage:allForm:allBlock:searchBlock:text1").value = "";
document.getElementById("allPage:allForm:allBlock:searchBlock:val1").value = "";
-
+
searchConsumableorderdetails();
}
var selectedSize = 0;
@@ -154,14 +154,14 @@
<apex:pageBlock id="EDCline_1" >
<apex:commandButton style="display:none"/>
<apex:commandButton onclick="EditConsumable();" value="缂栬緫" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
-
+
<apex:commandButton onclick="SorderJs();" value="鎻愪氦鐢宠" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble )}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF((editAble) && ambc.Change_status__c !='椹冲洖',true,false)}" />
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && editAble,true,false)}" />
<apex:commandButton onclick="DeleteConsumable();" value="鍒犻櫎" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
<apex:commandButton onclick="backOrderJs();" value="鍐嶇敵璇�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && !editAble,true,false)}" />
</apex:pageBlock>
-
+
<apex:pageBlock title="鍙樻洿鐢宠鍗曚俊鎭�" id="unEditable" rendered="{!!(editAble)}">
<table>
<colgroup>
@@ -181,9 +181,9 @@
<td align="right" >鐘� 鎬侊細</td>
<td align="left" ><apex:outputField id="OrderStatus_out" value="{!ambc.Change_status__c}" style="width:100px"/></td>
<!-- <td/> -->
- </tr>
+ </tr>
<tr>
-
+
<!-- <td/> -->
<td align="right">鍙樻洿鍘熷洜锛�</td>
<td align="left">
@@ -219,7 +219,7 @@
<col width="180px"/>
<col width="60px"/>
<col width="60px"/>
-
+
</colgroup>
<tr>
<td align="right"></td>
@@ -229,7 +229,7 @@
<td>
<apex:selectList value="{!text1}" id="text1" size="1" style="width:90px"><apex:selectOptions value="{!textOpts}"/>
</apex:selectList>
- </td>
+ </td>
<td>
<apex:inputText value="{!val1}"
id="val1" style="width:100px"/>
@@ -245,14 +245,14 @@
<tr >
<td colspan="3"/>
-
+
<td colspan="4" style="height:50px"> 鍙樻洿鍘熷洜锛�<!-- <apex:selectList value="{!ambc.ChangeReason__c}" id="changeReason01" size="1" style="width:204px" onchange="ChangeReasonjs('{!ambc.ChangeReason__c}');"><apex:selectOptions value="{!changeReasonOpts}" /> -->
<!-- </apex:selectList> -->
<apex:inputField value="{!ambc.ChangeReason__c}" style="width:200px"></apex:inputField>
</td>
<td colspan="4">鍙樻洿鍘熷洜鍏朵粬锛�<apex:inputText value="{!ambc.ChangeReason_text__c}" style="width:200px"/></td>
<!-- <td colspan="4">淇濅慨澶╂暟锛�<apex:inputText value="{!ambc.WarrantyDays__c}" style="width:200px"/></td> -->
-
+
</tr>
<!-- <tr></tr> -->
<tr>
@@ -263,7 +263,7 @@
<!-- <td colspan="4"> 淇濅慨澶╂暟锛�<apex:inputText value="{!ambc.WarrantyDays__c}" style="width:200px"/></td> -->
<!-- <td colspan="4"/> -->
</tr>
-
+
</table>
</apex:pageBlock>
<apex:outputPanel id="message">
@@ -311,14 +311,14 @@
</apex:pageBlock>
<!-- CHAN-BC6BV2 XHL AddStart 20190522 -->
- <apex:pageBlock title="闄勪欢" id="accessory" rendered="{!isShow}">
-
+ <apex:pageBlock title="鏂囦欢" id="accessory" rendered="{!isShow}">
+
<apex:pageBlockButtons location="top">
- <apex:commandButton value="闄勪欢涓婁紶" onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
+ <apex:commandButton value="鏂囦欢涓婁紶" onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
</apex:pageBlockButtons>
<apex:pageBlockTable value="{!contents}" var="attachment" >
-
-
+
+
<apex:column headerValue="鏍囬" style="width: 33%">
<apex:outputField value="{!attachment.Title}"/>
</apex:column>
@@ -337,4 +337,4 @@
</apex:form>
<script>
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/AssetModifyBelongs.page b/force-app/main/default/pages/AssetModifyBelongs.page
index 630ab4c..3361cbc 100644
--- a/force-app/main/default/pages/AssetModifyBelongs.page
+++ b/force-app/main/default/pages/AssetModifyBelongs.page
@@ -158,7 +158,7 @@
<apex:commandButton onclick="DeleteConsumable();" value="鍒犻櫎" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
<apex:commandButton onclick="backOrderJs();" value="鍐嶇敵璇�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && !editAble,true,false)}" />
</apex:pageBlock>
-
+
<apex:pageBlock title="鍙樻洿鐢宠鍗曚俊鎭�" id="unEditable" rendered="{!!(editAble)}">
<table>
<colgroup>
@@ -186,8 +186,8 @@
<td align="right" >鐩爣瀹㈡埛锛�</td>
<td align="left" ><apex:outputField value="{!ambc.AccountField__r.Name}"/></td>
<td/>
- </tr>
-
+ </tr>
+
<tr style='line-height: 25px;'>
<apex:outputPanel rendered="{!checkUser}">
<td align="right" >SPO琛ㄥ崟鍙凤細</td>
@@ -236,7 +236,7 @@
<col width="180px"/>
<col width="60px"/>
<col width="60px"/>
-
+
</colgroup>
<tr>
<td align="right"></td>
@@ -246,7 +246,7 @@
<td>
<apex:selectList value="{!text1}" id="text1" size="1" style="width:90px"><apex:selectOptions value="{!textOpts}"/>
</apex:selectList>
- </td>
+ </td>
<td>
<apex:inputText value="{!val1}"
id="val1" style="width:200px"/>
@@ -264,7 +264,7 @@
<td colspan="4" style="height:50px;"> 鍘熷鎴凤細<apex:outputField value="{!ambc.rawAccount__c}"/></td>
<td colspan="4">鐩爣瀹㈡埛锛�<apex:inputField id="OEC" value="{!ambc.AccountField__c}" style="height:25px;width:200px"/></td>
</tr>
-
+
<tr >
<apex:outputPanel rendered="{!checkUser}">
<td colspan="3"/>
@@ -275,11 +275,11 @@
<!-- </apex:selectList> -->
</td>
<!-- CHAN-B9B68N Stop -->
-
+
</tr>
<tr>
<td colspan="3"/>
-
+
<td colspan="4" style="height:50px;">
澶囨敞锛�<apex:inputText value="{!ambc.remark__c}" style="width:200px"/></td>
<!-- LZHU-BPJ8DF 20200513 Start -->
@@ -342,17 +342,17 @@
</table>
</apex:pageBlock>
-
+
<!-- CHAN-BC6BV2 XHL AddStart 20190522 -->
- <apex:pageBlock title="闄勪欢" id="accessory" rendered="{!isShow}">
-
+ <apex:pageBlock title="鏂囦欢" id="accessory" rendered="{!isShow}">
+
<apex:pageBlockButtons location="top">
- <apex:commandButton value="闄勪欢涓婁紶" onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
+ <apex:commandButton value="鏂囦欢涓婁紶" onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
</apex:pageBlockButtons>
-
+
<apex:pageBlockTable value="{!contents}" var="attachment" >
-
-
+
+
<apex:column headerValue="鏍囬" style="width: 33%">
<apex:outputField value="{!attachment.Title}"/>
</apex:column>
@@ -372,4 +372,4 @@
<script>
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/BandwidthExceeded.page b/force-app/main/default/pages/BandwidthExceeded.page
index ecf984b..b9efacb 100644
--- a/force-app/main/default/pages/BandwidthExceeded.page
+++ b/force-app/main/default/pages/BandwidthExceeded.page
@@ -12,6 +12,6 @@
<apex:param value="mailto:{!$Site.AdminEmailAddress}"/>
<apex:param value="{!$Label.site.email_us}"/>
</apex:outputText>
- </apex:define>
+ </apex:define>
</apex:composition>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/BidAnnounceIframe.page b/force-app/main/default/pages/BidAnnounceIframe.page
index 6db9279..02b5998 100644
--- a/force-app/main/default/pages/BidAnnounceIframe.page
+++ b/force-app/main/default/pages/BidAnnounceIframe.page
@@ -12,4 +12,4 @@
<script type="text/javascript">
showIframePage();
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/CM_SearchContactService.page b/force-app/main/default/pages/CM_SearchContactService.page
index 01a4cfe..78d43fa 100644
--- a/force-app/main/default/pages/CM_SearchContactService.page
+++ b/force-app/main/default/pages/CM_SearchContactService.page
@@ -4,6 +4,7 @@
<apex:includeScript value="{!URLFOR($Resource.AWSService, 'AWSService.js') }" />
<!-- 2022/02/15 寮犲崕寤� dependency end -->
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<style>
@@ -33,11 +34,16 @@
var aws_result = {};
searchContactAll();
function Foo(){
+ debugger
j$('[aws-id]').each(function(i,e){
let awsDataId = j$(e).attr('aws-id');
if (contact.hasOwnProperty(awsDataId)) {
let piInformation = '濮撳悕:'+contact[awsDataId].lastName +'<br/>' +'鎵嬫満鍙�:'+ (contact[awsDataId].mobilePhone ? contact[awsDataId].mobilePhone :'');
- j$(e).find('.decrypt').html(piInformation);
+ //deloitte-zhj 瑙ｅ瘑鑱旂郴浜轰俊鎭� 2023-07-05 start
+ //j$(e).find('.decrypt').html(piInformation);
+ console.log('j$(e) = ' + j$(e).find('.decrypt'));
+ j$(e)[0].innerText = contact[awsDataId].lastName
+ //deloitte-zhj 瑙ｅ瘑鑱旂郴浜轰俊鎭� 2023-07-05 end
}else{
console.log(awsDataId+' not in contact');
}
@@ -157,6 +163,7 @@
// createDiv.style.background="#dddddd";
// createDiv.style.position = "absolute";
// parentNode.appendChild(createDiv);
+ debugger
console.log('dataId:'+dataId+'awsDataId Value:'+awsDataId);
let piInformation = '濮撳悕:'+contact[awsDataId].lastName +'\n' +'鐢佃瘽:'+ (contact[awsDataId].mobilePhone?contact[awsDataId].mobilePhone:'');
document.getElementById(dataId+'_'+awsDataId).innerText = piInformation;
diff --git a/force-app/main/default/pages/CampaignCreate.page b/force-app/main/default/pages/CampaignCreate.page
index 547b500..39040de 100644
--- a/force-app/main/default/pages/CampaignCreate.page
+++ b/force-app/main/default/pages/CampaignCreate.page
@@ -1,5 +1,6 @@
<apex:page standardController="Campaign" showHeader="false" sidebar="false" extensions="CampaignCreateController" action="{!init}" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:stylesheet value="{!URLFOR($Resource.jquerysuggestcss)}"/>
diff --git a/force-app/main/default/pages/CampaignMember.page b/force-app/main/default/pages/CampaignMember.page
index 13f98ea..2f2930c 100644
--- a/force-app/main/default/pages/CampaignMember.page
+++ b/force-app/main/default/pages/CampaignMember.page
@@ -3,6 +3,7 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:stylesheet value="{!URLFOR($Resource.jquerysuggestcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquerysuggestjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
diff --git a/force-app/main/default/pages/DateModify.page b/force-app/main/default/pages/DateModify.page
index 2ed1326..bad9c65 100644
--- a/force-app/main/default/pages/DateModify.page
+++ b/force-app/main/default/pages/DateModify.page
@@ -1,5 +1,6 @@
<apex:page showHeader="false" sidebar="false" controller="DateModifyController" action="{!init}" id="allPage" title="鏃堕棿淇敼鐢宠" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:form id="allForm">
diff --git a/force-app/main/default/pages/DealerPersonnelInformationImport.page b/force-app/main/default/pages/DealerPersonnelInformationImport.page
index 27e170f..3b63e76 100644
--- a/force-app/main/default/pages/DealerPersonnelInformationImport.page
+++ b/force-app/main/default/pages/DealerPersonnelInformationImport.page
@@ -4,7 +4,7 @@
<script>
$Lightning.use("c:DealerPersonnelInformationImportApp", function() {
$Lightning.createComponent("c:DealerPersonnelInformationImport",
-{
+{
},
"TaskManageAppOutContainer",
function(cmp) {
@@ -12,4 +12,4 @@
});
});
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page b/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page
index b763653..44c46fc 100644
--- a/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page
+++ b/force-app/main/default/pages/ISO_DemandOperAndDemonsNew.page
@@ -1,6 +1,7 @@
<apex:page standardController="IS_Opportunity_Demand__c" extensions="ISO_DemandOperAndDemonsNewController" showHeader="true" sidebar="true" action="{!init}" id="allPage" title="SI璇环-闇�姹傝〃-鎵嬫湳闂�" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<!-- <apex:includeScript value="{!URLFOR($Resource.connection20)}"/> -->
@@ -319,6 +320,7 @@
border-collapse: collapse;
font-size:105%;
font-weight:bold;
+ padding-left:10px;
}
.conTh1{
@@ -606,7 +608,7 @@
</td>
</tr>
<tr>
- <td rowspan="4" class="tdPrivateKz" style="line-height: 84px;">鍖荤枟璁惧鎺у埗</td>
+ <td rowspan="4" class="tdPrivateKz" style="line-height: 84px;padding-left:10px">鍖荤枟璁惧鎺у埗</td>
<td class="tdPrivate">
<apex:inputField value="{!ISOppDemandOper1.Olympus_Camera_Host__c}"/>
濂ユ灄宸存柉鎽勫儚鏈轰富鏈�
diff --git a/force-app/main/default/pages/InMaintenance.page b/force-app/main/default/pages/InMaintenance.page
index 4200b62..d814d65 100644
--- a/force-app/main/default/pages/InMaintenance.page
+++ b/force-app/main/default/pages/InMaintenance.page
@@ -16,4 +16,4 @@
</apex:outputText>
</apex:define>
</apex:composition>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/InitCreateSolutionPage.page b/force-app/main/default/pages/InitCreateSolutionPage.page
index e3bbb6d..01d90bc 100644
--- a/force-app/main/default/pages/InitCreateSolutionPage.page
+++ b/force-app/main/default/pages/InitCreateSolutionPage.page
@@ -1,18 +1,19 @@
<apex:page standardController="SolutionProjectRequirements__c" showHeader="false" sidebar="false" lightningStylesheets="true">
<!-- Begin Default Content REMOVE THIS -->
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<script type="text/javascript">
- function init() {
+ function init() {
// url 璺緞
var str = '/a3k/e?Name=*&nooverride=1';
-
+
// 璺宠浆椤甸潰
window.open(str,'_self');
}
-
+
</script>
<body onload="init()">
-
+
</body>
<!-- End Default Content REMOVE THIS -->
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/LookupPage.page b/force-app/main/default/pages/LookupPage.page
index 1c10597..60ffd44 100644
--- a/force-app/main/default/pages/LookupPage.page
+++ b/force-app/main/default/pages/LookupPage.page
@@ -77,7 +77,7 @@
border-color: #c4c4c4;
color: #909090;
}
-
+
</style>
<!-- form 琛ㄥ崟 -->
<apex:form id="formId">
@@ -114,7 +114,7 @@
<!-- table 琛ㄦ牸鍒� 绮剧悽鎶�鏈� wql 2021/04/01 start-->
<apex:pageblock id="searchResults">
-
+
<!-- PleaseJudge 涓嬫璋冪敤鏃讹紝闇�鍒ゆ柇 -->
<apex:outputpanel rendered="{!IF(SObjectName == 'ModelLendingProduct__c', true, false)}">
<apex:pageblocktable id="tblResults" value="{!ModelCode}" var="a">
@@ -212,7 +212,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:FirstPage'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:FirstPage'))[0].classList.remove("btn");
- }
+ }
}
//涓婁竴椤�
@@ -227,7 +227,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:previous'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:previous'))[0].classList.remove("btn");
- }
+ }
}
//涓嬩竴椤�
if(j$(escapeVfId('pg:formId:next'))[0]){
@@ -241,7 +241,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:next'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:next'))[0].classList.remove("btn");
- }
+ }
}
//灏鹃〉
if(j$(escapeVfId('pg:formId:LastPage'))[0]){
@@ -255,7 +255,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:LastPage'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:LastPage'))[0].classList.remove("btn");
- }
+ }
}
}
@@ -269,7 +269,7 @@
if(window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingProductCodeId"))){
window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingProductCodeId")).val(id);
}
-
+
//璧嬪�煎埌鏃犳姤鍛婇〉闈�
if(window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingCodeId"))){
window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingCodeId")).val(modelId);
@@ -280,4 +280,4 @@
//鍒濆鍖栧幓鎺夐粯璁ゆ牱寮�
removeButtonStyle();
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/NewQuoteIrai.page b/force-app/main/default/pages/NewQuoteIrai.page
index 1bbe34f..85a6b4b 100644
--- a/force-app/main/default/pages/NewQuoteIrai.page
+++ b/force-app/main/default/pages/NewQuoteIrai.page
@@ -9,7 +9,415 @@
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquerydoubletapjs)}"/>
- <script type="text/javascript">
+
+ <style type="text/css">
+ div#iframelike {
+ height: 300px;
+ overflow: auto;
+ }
+ div#iframelikeheader {
+ height: 23px;
+ overflow: auto;
+ }
+ input {
+ font-size: 10.5px;
+ }
+ body {
+ font-size: 10.5px;
+ }
+
+ .visitorplace_results {
+ border: 1px solid gray;
+ background-color: white;
+ padding: 0;
+ margin: 0;
+ list-style: none;
+ position: absolute;
+ z-index: 10000;
+ display: none;
+ overflow:auto;
+ white-space:nowrap;
+ width:400px;
+ height:250px;
+ }
+ .visitorplace_results li {
+ padding: 2px 5px 2px 0px;
+ margin-left : 2px;
+ color: #101010;
+ text-align: left;
+ }
+ </style>
+
+ <apex:form id="mainForm">
+ <apex:outputText id="hiddenQuoid" value="{!quoid}" style="display:none;"/>
+ <apex:inputHidden id="changedAfterPrint" value="{!changedAfterPrint}"/>
+ <apex:inputHidden id="productStatusUpdated" value="{!productStatusUpdated}"/>
+ <apex:inputHidden id="idHiddenUserStateHospital" value="{!loginUser.State_Hospital__c}" />
+ <apex:actionFunction action="{!setProductEntry}" name="setProductEntry" reRender="mainForm" oncomplete="unblockUI();calPriceAll();">
+ <apex:param assignTo="{!setProduct_text}" name="setProduct_text" value=""/>
+ </apex:actionFunction>
+ <apex:actionFunction action="{!excelImport}" name="excelImport" reRender="mainForm" oncomplete="unblockUI();calPriceAll();">
+ <apex:param assignTo="{!excel_text}" name="select_index" value=""/>
+ </apex:actionFunction>
+ <apex:actionFunction action="{!Save}" name="Save" reRender="mainForm,message1" oncomplete="unblockUI();"/>
+ <apex:actionFunction action="{!OppReflection}" name="OppReflection" reRender="mainForm" oncomplete="unblockUI();"/>
+ <apex:actionFunction action="{!QuoteIrai}" name="QuoteIrai" reRender="mainForm,message1" oncomplete="unblockUI();"/>
+ <apex:pageBlock id="block">
+ <apex:inputHidden value="{!quo.CurrencyIsoCode}" id="CurrencyIsoCode"/>
+ <apex:inputHidden value="{!baseUrl}" id="baseUrl"/>
+ <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start -->
+ <apex:inputHidden value="{!qb.Estimation_List_Price}" id="hidden_Estimation"/>
+ <apex:inputHidden value="{!qb.QuoteTotal_Page}" id="hidden_quoTotalPrice"/>
+ <apex:inputHidden value="{!qb.MultiYearWarrantyTotalPrice}" id="hidden_MultiYearWarrantyTotalPrice_out"/>
+ <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 END -->
+ <apex:outputPanel id="message1">
+ <apex:messages styleClass="editListError"/>
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!errorflg}" >
+ <table width="100%">
+ <tr>
+ <td align="left"><div class="errorMsg">{!errorMessage}</div></td>
+ </tr>
+ </table>
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!Messageflg}" >
+ <table width="100%">
+ <tr>
+ <td align="left">{!Message}</td>
+ </tr>
+ </table>
+ </apex:outputPanel>
+ <div style="background:rgb(240 238 238);white-space:nowrap;padding:10px">
+ <table border="0">
+ <tr>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiSubject__c.Label}锛�</th>
+ <td style="text-align:left;width:220px;margin:10px">
+ <div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="idVisitorPlace" value="{!quo.IraiSubject__c}" onblur="vpClear2_delay();" onfocus="setVisitorPlace();" style="width:210px;"/></div>
+ <apex:inputHidden id="idVisitorPlaceId" value="{!quo.Account__c}"/>
+ <apex:inputHidden id="idVisitorPlaceHidden" value="{!quo.IraiSubject__c}" />
+ <apex:inputHidden id="idVisitorPlaceHiddenId" value="{!quo.Account__c}" />
+ </td>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiName__c.Label}锛�</th>
+ <td style="text-align:left;width:220px;margin:10px;"><apex:inputField value="{!quo.IraiName__c}" style="width:220px;"/></td>
+ <th style="text-align:right;width:60px;margin:10px;padding-left:10px"> {!$ObjectType.QuoteIrai__c.fields.IraiComment__c.Label}锛�</th>
+ <td style="text-align:left;width:220px;margin:10px;"><apex:inputField value="{!quo.IraiComment__c}" style="width:220px;"/></td>
+ <th style="text-align:right;width:60px;margin:10px;padding-left:10px">{!$ObjectType.QuoteIrai__c.fields.QuoteProportion__c.Label}锛�</th>
+ <td style="text-align:left;width:60px;margin:10px;"><apex:inputField value="{!quo.QuoteProportion__c}" style="width:70px;text-align:right;"/></td>
+ <th style="text-align:left;width:20px;margin:10px;">%</th>
+ <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.QuoteIrai_Status__c.Label}锛�</th>
+ <td style="text-align:left;width:80px;margin:10px;"><apex:outputField value="{!quo.QuoteIrai_Status__c}" style="width:80px;"/></td>
+ </tr>
+ </table>
+ <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start -->
+ <table border="0">
+ <tr>
+ <td> </td>
+ <!-- <th style="text-align:right">{!IF(displayFlg,'浜у搧鏍囧噯瀹氫环鎬婚','')}</th> -->
+ <th style="text-align:center;width:50px;white-space:nowrap;padding:20px;">浜у搧鏍囧噯瀹氫环鎬婚 : </th>
+ <td style="width:176px;padding:10px;">
+ <apex:outputText id="Estimation_Price" value="{0, number, ###,##0.00}"
+ style="text-align:right;width:100px;">
+ <apex:param value="{!qb.Estimation_List_Price}" />
+ </apex:outputText>
+ </td>
+ <th style="text-align:right;width:100px;white-space:nowrap;padding:10px;">鎶ヤ环鎬婚 : </th>
+ <!-- <th style="text-align:right;">{!IF(displayFlg,$Label.Total_Price,'')}</th> -->
+ <td style="width:180px;margin:10px;">
+ <apex:outputtext id="quoTotalPrice" value="{0, number, ###,##0.00}"
+ style="text-align:right;width:100px;">
+ <apex:param value="{!qb.QuoteTotal_Page}"/>
+ </apex:outputtext>
+ </td>
+
+ </tr>
+ </table>
+ <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 End -->
+ <table border="0">
+ <tr>
+ <th style="width:50px;margin:10px;"> </th>
+ <!-- 浜у搧閰嶅妫�绱㈡寜閽� -->
+ <td style="width:150px;margin:10px;"><apex:commandButton id="SetProduct" onclick="searchSetProduct();return false;" value="{!$Label.Set_Product}" rerender="dummy"/></td>
+ <!-- excel 瀵煎嚭鎸夐挳 -->
+ <td style="width:150px;margin:10px;"><apex:commandButton onclick="openQuoteExcelImport(event);return false;" value="{!$Label.Excel_Import}" rerender="dummy"/></td>
+ <td style="text-align:right;width:80px;margin:10px;"><apex:commandButton rerender="dummy" id="Btn_RowDelete" onclick="radioChecker2('del');return false;" value="{!$Label.deleteLabel}" style="width:60px;"/></td>
+ <td style="width:300px;margin:10px;">
+ <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:100px;"/>
+ <apex:commandButton rerender="dummy" id="Btn_RowDown" onclick="radioChecker2('down');return false;" value="{!$Label.Row_Down}" style="width:100px;"/>
+ </td>
+ <th style="text-align:right;width:80px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiUser__c.Label}锛�</th>
+ <!-- fy 20220512 -->
+ <!-- <apex:variable value="identif1" var="identif1" rendered="{!!(loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&&(loginUser.Salesdepartment_text__c == '5.鍗庝笢' || loginUser.Salesdepartment_text__c == '6.鍗庡崡'))}" > -->
+ <apex:variable value="identif1" var="identif1" rendered="{!!(loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&& obsflag)}" >
+
+ <td style="width:150px;margin:10px;"><apex:outputPanel id="IraiUserId"><apex:inputField id="IraiUser" value="{!quo.IraiUser__c}"/></apex:outputPanel></td>
+ </apex:variable>
+ <!-- fy 20220512 -->
+ <!-- <apex:variable value="identif" var="identif" rendered="{!loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&&(loginUser.Salesdepartment_text__c == '5.鍗庝笢' || loginUser.Salesdepartment_text__c == '6.鍗庡崡')}" > -->
+ <apex:variable value="identif" var="identif" rendered="{!loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&& obsflag}" >
+
+ <!-- <th style="text-align:right;width:20px;">obsap浜哄憳</th> -->
+ <td style="text-align:center;width:20px;margin:10px;"><apex:selectList value="{!quo.IraiUser__c}" size="1" style="width:120px" id="IraiUser" onchange="ObsapUsersChange()"><apex:selectOptions value="{!ObsapUsers}" id="obsapUsersList"/></apex:selectList></td>
+ </apex:variable>
+
+ <!-- 20230104 lt DB202212427301 start-->
+ <!-- <th style="text-align:right;width:80px;">{!$ObjectType.QuoteIrai__c.fields.LastIraiUser__c.Label}</th>
+ <td style="text-align:center;width:70px;"><apex:outputField id="LastIraiUser" value="{!quo.LastIraiUser__c}"/></td> -->
+ <!-- 20230104 lt DB202212427301 end-->
+
+ <!-- 20230104 lt DB202212427301 start-->
+ <th style="text-align:right;width:190px;margin:10px;">绱ф�ワ細</th>
+ <td style="text-align:center;width:10px;margin:10px;"><apex:inputField id="Urgent" value="{!quo.Urgent__c}"/></td>
+ <!-- 20230104 lt DB202212427301 end-->
+
+ <!-- 2020/02/18 绮剧悽鎶�鏈� 闊╅儴闀挎彁鍑哄厛闅愯棌 娌″繀瑕� Start-->
+ <!-- <th style="text-align:right;width:70px;">鎬昏</th>
+ <td style="text-align:right;width:80px;">
+ <apex:outputtext id="Estimation_List_Price" value="{0, number, ###,##0.00}"><apex:param value="{!total_ListPrice}"/></apex:outputtext>
+ <apex:inputHidden id="hidden_Estimation_List" value="{!total_ListPrice}"/>
+ </td> -->
+ <!-- 2020/02/18 绮剧悽鎶�鏈� 闊╅儴闀挎彁鍑哄厛闅愯棌 娌″繀瑕� end-->
+ </tr>
+ </table>
+ <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start -->
+ <table>
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td style="text-align:right;width:50px;margin:10px;"></td>
+ <th style="text-align:right;width:50px;margin:10px;" rowspan="3">
+ {!$ObjectType.QuoteIrai__c.fields.MultiYearWarrantyTotalPrice__c.Label}
+ : </th>
+ <!-- <td style="width:470px;"> -->
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
+ <td style="width:100px;" rowspan="3">
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
+ <apex:outputtext style="width: :100px" id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}"
+ >
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
+ <!-- style="text-align:right;width:180px;"> -->
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
+ <apex:param value="{!qb.MultiYearWarrantyTotalPrice}"/>
+ </apex:outputtext>
+ </td>
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
+ <th style="width:100px;"> </th>
+ <td style="text-align:right;width:50px;"></td>
+ <td style="text-align:right;width:50px;"></td>
+ <!--<th colspan="2" style="width:260px;text-align:center;">{!$Label.Sales_Name}??</th>-->
+
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
+ <!-- <apex:variable id="contractWarranty" value="{!1}" var="abc" rendered="{!IF(trade == '鍐呰部',true,false)}">
+
+ <th style="text-align:right;width:50px;">
+ {!$ObjectType.Quote.fields.MultiYearWarrantyTotalPrice__c.label}
+ : </th>
+ <td style="width:470px;">
+ <apex:outputtext id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}"
+ style="text-align:right;width:180px;">
+ <apex:param value="{!quo.MultiYearWarrantyTotalPrice__c}"/>
+ </apex:outputtext>
+ </td>
+ <th style="text-align:right;width:50px;">
+ {!$ObjectType.Quote.fields.multiYearWarranty__c.label}
+ : </th>
+ <td style="width:200px;"><apex:inputField id="multiYearWarranty" value="{!quo.multiYearWarranty__c}" onchange="callFromCancelgurantee_MD();" style="text-align:right;width:30px;" /></td>
+ </apex:variable> -->
+ </tr>
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
+ <tr>
+ <td ></td>
+ <td ></td>
+ <td ></td>
+ <th style="width:100px;text-align:right;">{!$Label.Sales_Name1}锛�</th>
+ <td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName1" value="{!quo.Agency1_entrust__c}" onChange=""/></td>
+ <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
+ <th style="width:100px;text-align:right;">澶氬勾淇濓細</th>
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+ <td colspan="2" style="text-align:left;"><apex:inputField id="cancelMultiyearInsurance" value="{!quo.cancelMultiyearInsurance__c}" onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
+ <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
+ </tr>
+ <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
+ <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start-->
+ <tr>
+ <td ></td>
+ <td ></td>
+ <td ></td>
+ <th style="width:100px;text-align:right;margin:10px;">{!$Label.Sales_Name2}锛�</th>
+ <td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName2" value="{!quo.Agency2_entrust__c}" onChange=""/></td>
+ <th style="width:100px;text-align:right;margin:10px;"></th>
+ <td colspan="2" style="width:120px;text-align:left;margin:10px;"></td>
+ </tr>
+ <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end-->
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 End -->
+ </div>
+ <table>
+ <tr>
+ <td> </td>
+ </tr>
+ </table>
+ <table style="width:1165px;background:rgb(240 238 238);" border="0">
+ <tr>
+ <th style="text-align:center;width:30px;"> <input type="checkbox" id="checkAll" onclick="selectAll()" style="height:15px;width:15px;"/></th>
+ <th style="text-align:center;width:15px;">No</th>
+ <th style="text-align:center;width:150px;">{!$Label.Asset_No}</th>
+ <th style="text-align:center;width:100px;">{!$Label.SFDA_Status}</th>
+ <th style="text-align:center;width:300px;">{!$Label.Product_Name}</th>
+ <th style="text-align:center;width:100px;">{!$Label.Quantity}</th>
+ <!-- CHAN-BHNBX6 2019/11/20 START -->
+ <th style="text-align:center;width:50px;">淇濅慨骞撮檺</th>
+ <!-- CHAN-BHNBX6 2019/11/20 END -->
+ <th style="text-align:center;width:85px;">ListPrice</th>
+ <th style="text-align:center;width:100px;">灏忚</th>
+ <!-- CHAN-BHNBX6 2019/11/20 START -->
+ <th style="text-align:center;width:100px;">NoDiscount灏忚</th>
+ <!-- CHAN-BHNBX6 2019/11/20 END -->
+ </tr>
+ </table>
+ <div id="iframelike" style="width:1183px;">
+ <input type="hidden" id="ListPriceTotal" value="0" />
+ <input type="hidden" id="UnitPriceTotal" value="0" />
+ <apex:pageblocktable value="{!activities}" var="s" id="lists" style="width:1165px;text-align:center;">
+
+ <apex:column style="width:20px;" >
+ <input type="checkbox" name="checklist" value="{!s.lineNo}" style="height:15px;width:15px;"/>
+ </apex:column>
+ <!-- No -->
+ <apex:column style="width:20px;text-align:right;" >
+ <apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Product2__c==null,null,s.lineNo + 1)}" style="width:10px;"/>
+ </apex:column>
+ <!-- 浜у搧缂栧彿-->
+ <apex:column style="text-align:center;width:150px;">
+ <apex:inputText id="Assert" style="width:120px;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value)" />
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+ <apex:inputHidden id="CanNotCancelledGurantee__c" value="{!s.CanNotCancelledGurantee}" />
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+ </apex:column>
+ <!-- NMPA鐘舵�� -->
+ <apex:column style="width:100px;text-align:center;">
+ <apex:outputField style="width:75px;" id="Status__c" value="{!s.PageObject.SFDA_Status__c}"/>
+ <apex:inputHidden id="SFDA" value="{!s.PageObject.SFDA_Status__c}"/>
+ </apex:column>
+ <!-- 浜у搧鍚嶇О -->
+ <apex:column style="width:300px;">
+
+ <apex:inputHidden id="Name__c" value="{!s.PageObject.Name__c}"/>
+ <apex:inputHidden id="url__c" value="{!s.PageObject.Product2__c}"/>
+ </apex:column>
+ <!-- 鏁伴噺 -->
+ <apex:column style="text-align:center;width:100px;">
+ <apex:inputField id="Quantity" style="width:50px;text-align:right;" value="{!s.PageObject.Quantity__c}" onclick="show('{!s.PageObject.GuaranteePeriod__c}')" onChange="calPrice('{!s.lineNo}')"/>
+ </apex:column>
+ <!-- 2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6 start -->
+ <apex:column style="width:50px;text-align:right;" >
+ <apex:outputLabel id="itemGuaranteePeriod" value="{!s.PageObject.GuaranteePeriod__c}" style="width:10px;"/>
+ </apex:column>
+ <!-- 2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6 end -->
+ <!-- ListPrice-->
+ <apex:column style="width:85px;text-align:center;">
+ <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
+ <apex:outputText style="width:85px;" id="ListPricetext" value="{0, number, ###,##0.00}">
+ <apex:param value="{!s.ListPrice_Page}" />
+ </apex:outputText>
+ </apex:outputPanel>
+ <apex:inputHidden id="ListPrice" value="{!s.ListPrice_Page}"/>
+ <apex:outputPanel layout="none" rendered="{!!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
+ <span style="width:85px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:ListPricetext">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
+ <script type="text/javascript">
+ j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':ListPrice')).val(toNum(0));
+ </script>
+ </apex:outputPanel>
+ </apex:column>
+ <!-- 灏忚 -->
+ <apex:column style="width:100px;text-align:center;">
+ <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
+ <apex:outputText style="width:80px;" id="ListPriceTotalText" value="{0, number, ###,##0.00}">
+ <apex:param value="{!s.ListPriceTotal_Page}" />
+ </apex:outputText>
+ </apex:outputPanel>
+ <apex:inputHidden id="ListPriceTotal" value="{!s.ListPriceTotal_Page}"/>
+ <apex:outputPanel layout="none" rendered="{!!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
+ <span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:ListPriceTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
+ <script type="text/javascript">
+ j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':ListPriceTotal')).val(toNum(0));
+ </script>
+ </apex:outputPanel>
+ <apex:inputHidden id="Product_Id" value="{!s.PageObject.Product2__c}"/>
+ <apex:inputHidden id="lineNo" value="{!s.lineNo}"/>
+ </apex:column>
+ <!-- CHAN-BHNBX6 NodisCount 灏忚 2019/11/20 START -->
+ <apex:column style="width:100px;text-align:center;">
+ <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ServicePrice__c.accessible}" >
+ <apex:outputText style="width:80px;" id="NoDiscountTotalText" value="{0, number, ###,##0.00}">
+ <apex:param value="{!s.NoDiscountTotal_Page}" />
+ </apex:outputText>
+ </apex:outputPanel>
+ <apex:inputHidden id="NoDiscountTotal" value="{!s.NoDiscountTotal_Page}"/>
+ <apex:inputHidden id="NoDiscount" value="{!s.NoDiscount_Page}"/>
+ <apex:outputPanel layout="none" rendered="{!!$ObjectType.QuoteIraiLineItem__c.fields.ServicePrice__c.accessible}" >
+ <span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:NoDiscountTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
+ <script type="text/javascript">
+ debugger
+ j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':NoDiscountTotal')).val(toNum(0));
+ </script>
+ </apex:outputPanel>
+
+
+ </apex:column>
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
+ <!-- <apex:column style="width:100px;text-align:right;">
+ <apex:outputPanel layout="none" rendered="{!IF(quo.cancelMultiyearInsurance__c =='瑕�' ||(quo.cancelMultiyearInsurance__c =='涓嶈' && s.CanNotCancelledGurantee == 'true' ),true,false)}" >
+ <apex:outputText style="width:80px;" id="NoDiscountTotalText" value="{0, number, ###,##0.00}">
+ <apex:param value="{!s.NoDiscountTotal_Page}" />
+ </apex:outputText>
+ </apex:outputPanel>
+ <apex:inputHidden id="NoDiscountTotal" value="{!s.NoDiscountTotal_Page}"/>
+ <apex:inputHidden id="NoDiscount" value="{!s.NoDiscount_Page}"/>
+ <apex:outputPanel layout="none" rendered="{!IF(quo.cancelMultiyearInsurance__c =='涓嶈'&& s.CanNotCancelledGurantee == 'false' ,true,false)}" >
+ <span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:NoDiscountTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
+ <script type="text/javascript">
+ j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':NoDiscountTotal')).val(toNum(0));
+ </script>
+ </apex:outputPanel>
+ </apex:column> -->
+ <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
+ <!-- CHAN-BHNBX6 NodisCount 灏忚 2019/11/20 END -->
+ </apex:pageBlockTable>
+ </div>
+
+ <BR></BR>
+ <table border="0">
+ <tr>
+ <td style="width:550px;" align="right">
+ <apex:inputField value="{!quo.Note__c}" style="width:550px;height:55px;"/>
+ </td>
+ <td>
+ <table border="0">
+ <tr>
+ <th style="width:15px"> </th>
+ <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
+ <td style="width:100px;" align="right"><apex:commandButton id="QuoteIraiBtn" action="{!checkIraiUser}" reRender="IraiUserId,message1" onclick="blockme();" oncomplete="iraiJs();return false;" value="鍙戦�佸鎵橀偖浠�" style="width:100px;white-space:nowrap;" disabled="{!Save_button}"/></td>
+ <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
+ <td style="width:100px;" align="right"><apex:commandButton action="{!checkIraiUser}" reRender="IraiUserId,hiddenQuoid,message1" onclick="blockme();" oncomplete="save2btn();return false;" value="{!$Label.Save_Button}" style="width:100px;" disabled="{!Save_button}" /></td>
+ <!-- 20230109 lt DB202212427301 start 娉ㄩ噴 -->
+ <!-- <td style="width:100px;" align="right"><apex:commandButton onclick="oppReflection2btn();return false;" rerender="hiddenQuoid" value="{!$Label.Opp_Button}" style="width:90px;" disabled="{!Save_button}"/></td>
+ <td style="width:100px;" align="right"><apex:commandButton action="{!Back}" rerender="hiddenQuoid" value="涓嶄繚瀛橈紙杩斿洖锛�" style="width:90px;"/></td>
+ <td style="width:100px;" align="right"><apex:commandButton value="浜у搧璇曠敤璇勪环OPD" style="width:95px;" onclick="openpdf('OPD');return false;" disabled="{!pdf_button}"/></td>
+ <td style="width:100px;" align="right"><apex:commandButton value="浜у搧璇曠敤璇勪环SIS" style="width:95px;" onclick="openpdf('SIS');return false;" disabled="{!pdf_button}"/></td> -->
+ <!-- 20230109 lt DB202212427301 end 娉ㄩ噴 -->
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </apex:pageBlock>
+ </apex:form>
+ <script type="text/javascript">
var QuoteEntryMaxLine = {!QuoteEntryMaxLine};
var displayCost = '{!displayCost}';
var quoid = '{!quoid}';
@@ -202,412 +610,4 @@
}
}
</script>
- <style type="text/css">
- div#iframelike {
- height: 300px;
- overflow: auto;
- }
- div#iframelikeheader {
- height: 23px;
- overflow: auto;
- }
- input {
- font-size: 10.5px;
- }
- body {
- font-size: 10.5px;
- }
-
- .visitorplace_results {
- border: 1px solid gray;
- background-color: white;
- padding: 0;
- margin: 0;
- list-style: none;
- position: absolute;
- z-index: 10000;
- display: none;
- overflow:auto;
- white-space:nowrap;
- width:400px;
- height:250px;
- }
- .visitorplace_results li {
- padding: 2px 5px 2px 0px;
- margin-left : 2px;
- color: #101010;
- text-align: left;
- }
- </style>
-
- <apex:form id="mainForm">
- <apex:outputText id="hiddenQuoid" value="{!quoid}" style="display:none;"/>
- <apex:inputHidden id="changedAfterPrint" value="{!changedAfterPrint}"/>
- <apex:inputHidden id="productStatusUpdated" value="{!productStatusUpdated}"/>
- <apex:inputHidden id="idHiddenUserStateHospital" value="{!loginUser.State_Hospital__c}" />
- <apex:actionFunction action="{!setProductEntry}" name="setProductEntry" reRender="mainForm" oncomplete="unblockUI();calPriceAll();">
- <apex:param assignTo="{!setProduct_text}" name="setProduct_text" value=""/>
- </apex:actionFunction>
- <apex:actionFunction action="{!excelImport}" name="excelImport" reRender="mainForm" oncomplete="unblockUI();calPriceAll();">
- <apex:param assignTo="{!excel_text}" name="select_index" value=""/>
- </apex:actionFunction>
- <apex:actionFunction action="{!Save}" name="Save" reRender="mainForm,message1" oncomplete="unblockUI();"/>
- <apex:actionFunction action="{!OppReflection}" name="OppReflection" reRender="mainForm" oncomplete="unblockUI();"/>
- <apex:actionFunction action="{!QuoteIrai}" name="QuoteIrai" reRender="mainForm,message1" oncomplete="unblockUI();"/>
- <apex:pageBlock id="block">
- <apex:inputHidden value="{!quo.CurrencyIsoCode}" id="CurrencyIsoCode"/>
- <apex:inputHidden value="{!baseUrl}" id="baseUrl"/>
- <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start -->
- <apex:inputHidden value="{!qb.Estimation_List_Price}" id="hidden_Estimation"/>
- <apex:inputHidden value="{!qb.QuoteTotal_Page}" id="hidden_quoTotalPrice"/>
- <apex:inputHidden value="{!qb.MultiYearWarrantyTotalPrice}" id="hidden_MultiYearWarrantyTotalPrice_out"/>
- <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 END -->
- <apex:outputPanel id="message1">
- <apex:messages styleClass="editListError"/>
- </apex:outputPanel>
- <apex:outputPanel rendered="{!errorflg}" >
- <table width="100%">
- <tr>
- <td align="left"><div class="errorMsg">{!errorMessage}</div></td>
- </tr>
- </table>
- </apex:outputPanel>
- <apex:outputPanel rendered="{!Messageflg}" >
- <table width="100%">
- <tr>
- <td align="left">{!Message}</td>
- </tr>
- </table>
- </apex:outputPanel>
- <div style="background:rgb(240 238 238);white-space:nowrap;padding:10px">
- <table border="0">
- <tr>
- <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiSubject__c.Label}</th>
- <td style="text-align:left;width:220px;margin:10px">
- <div class="requiredInput"><div class="requiredBlock"></div><apex:inputField id="idVisitorPlace" value="{!quo.IraiSubject__c}" onblur="vpClear2_delay();" onfocus="setVisitorPlace();" style="width:210px;"/></div>
- <apex:inputHidden id="idVisitorPlaceId" value="{!quo.Account__c}"/>
- <apex:inputHidden id="idVisitorPlaceHidden" value="{!quo.IraiSubject__c}" />
- <apex:inputHidden id="idVisitorPlaceHiddenId" value="{!quo.Account__c}" />
- </td>
- <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiName__c.Label}</th>
- <td style="text-align:left;width:220px;margin:10px;"><apex:inputField value="{!quo.IraiName__c}" style="width:220px;"/></td>
- <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiComment__c.Label}</th>
- <td style="text-align:left;width:220px;margin:10px;"><apex:inputField value="{!quo.IraiComment__c}" style="width:220px;"/></td>
- <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.QuoteProportion__c.Label}</th>
- <td style="text-align:left;width:60px;margin:10px;"><apex:inputField value="{!quo.QuoteProportion__c}" style="width:70px;text-align:right;"/></td>
- <th style="text-align:left;width:20px;margin:10px;">%</th>
- <th style="text-align:right;width:60px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.QuoteIrai_Status__c.Label}</th>
- <td style="text-align:left;width:80px;margin:10px;"><apex:outputField value="{!quo.QuoteIrai_Status__c}" style="width:80px;"/></td>
- </tr>
- </table>
- <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start -->
- <table border="0">
- <tr>
- <td> </td>
- <!-- <th style="text-align:right">{!IF(displayFlg,'浜у搧鏍囧噯瀹氫环鎬婚','')}</th> -->
- <th style="text-align:right;width:50px;white-space:nowrap;padding:20px;">浜у搧鏍囧噯瀹氫环鎬婚 : </th>
- <td style="width:176px;padding:10px;">
- <apex:outputText id="Estimation_Price" value="{0, number, ###,##0.00}"
- style="text-align:right;width:100px;">
- <apex:param value="{!qb.Estimation_List_Price}" />
- </apex:outputText>
- </td>
- <th style="text-align:right;width:100px;white-space:nowrap;padding:10px;">鎶ヤ环鎬婚 : </th>
- <!-- <th style="text-align:right;">{!IF(displayFlg,$Label.Total_Price,'')}</th> -->
- <td style="width:180px;margin:10px;">
- <apex:outputtext id="quoTotalPrice" value="{0, number, ###,##0.00}"
- style="text-align:right;width:100px;">
- <apex:param value="{!qb.QuoteTotal_Page}"/>
- </apex:outputtext>
- </td>
-
- </tr>
- </table>
- <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 End -->
- <table border="0">
- <tr>
- <th style="width:50px;margin:10px;"> </th>
- <!-- 浜у搧閰嶅妫�绱㈡寜閽� -->
- <td style="width:150px;margin:10px;"><apex:commandButton id="SetProduct" onclick="searchSetProduct();return false;" value="{!$Label.Set_Product}" rerender="dummy"/></td>
- <!-- excel 瀵煎嚭鎸夐挳 -->
- <td style="width:150px;margin:10px;"><apex:commandButton onclick="openQuoteExcelImport(event);return false;" value="{!$Label.Excel_Import}" rerender="dummy"/></td>
- <td style="text-align:right;width:80px;margin:10px;"><apex:commandButton rerender="dummy" id="Btn_RowDelete" onclick="radioChecker2('del');return false;" value="{!$Label.deleteLabel}" style="width:60px;"/></td>
- <td style="width:300px;margin:10px;">
- <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:100px;"/>
- <apex:commandButton rerender="dummy" id="Btn_RowDown" onclick="radioChecker2('down');return false;" value="{!$Label.Row_Down}" style="width:100px;"/>
- </td>
- <th style="text-align:right;width:80px;margin:10px;">{!$ObjectType.QuoteIrai__c.fields.IraiUser__c.Label}</th>
- <!-- fy 20220512 -->
- <!-- <apex:variable value="identif1" var="identif1" rendered="{!!(loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&&(loginUser.Salesdepartment_text__c == '5.鍗庝笢' || loginUser.Salesdepartment_text__c == '6.鍗庡崡'))}" > -->
- <apex:variable value="identif1" var="identif1" rendered="{!!(loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&& obsflag)}" >
-
- <td style="width:150px;margin:10px;"><apex:outputPanel id="IraiUserId"><apex:inputField id="IraiUser" value="{!quo.IraiUser__c}"/></apex:outputPanel></td>
- </apex:variable>
- <!-- fy 20220512 -->
- <!-- <apex:variable value="identif" var="identif" rendered="{!loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&&(loginUser.Salesdepartment_text__c == '5.鍗庝笢' || loginUser.Salesdepartment_text__c == '6.鍗庡崡')}" > -->
- <apex:variable value="identif" var="identif" rendered="{!loginUser !=null&&loginUser.Salesdepartment_text__c != null&&loginUser.Salesdepartment_text__c != ''&& obsflag}" >
-
- <!-- <th style="text-align:right;width:20px;">obsap浜哄憳</th> -->
- <td style="text-align:center;width:20px;margin:10px;"><apex:selectList value="{!quo.IraiUser__c}" size="1" style="width:120px" id="IraiUser" onchange="ObsapUsersChange()"><apex:selectOptions value="{!ObsapUsers}" id="obsapUsersList"/></apex:selectList></td>
- </apex:variable>
-
- <!-- 20230104 lt DB202212427301 start-->
- <!-- <th style="text-align:right;width:80px;">{!$ObjectType.QuoteIrai__c.fields.LastIraiUser__c.Label}</th>
- <td style="text-align:center;width:70px;"><apex:outputField id="LastIraiUser" value="{!quo.LastIraiUser__c}"/></td> -->
- <!-- 20230104 lt DB202212427301 end-->
-
- <!-- 20230104 lt DB202212427301 start-->
- <th style="text-align:right;width:190px;margin:10px;">绱ф�ワ細</th>
- <td style="text-align:center;width:10px;margin:10px;"><apex:inputField id="Urgent" value="{!quo.Urgent__c}"/></td>
- <!-- 20230104 lt DB202212427301 end-->
-
- <!-- 2020/02/18 绮剧悽鎶�鏈� 闊╅儴闀挎彁鍑哄厛闅愯棌 娌″繀瑕� Start-->
- <!-- <th style="text-align:right;width:70px;">鎬昏</th>
- <td style="text-align:right;width:80px;">
- <apex:outputtext id="Estimation_List_Price" value="{0, number, ###,##0.00}"><apex:param value="{!total_ListPrice}"/></apex:outputtext>
- <apex:inputHidden id="hidden_Estimation_List" value="{!total_ListPrice}"/>
- </td> -->
- <!-- 2020/02/18 绮剧悽鎶�鏈� 闊╅儴闀挎彁鍑哄厛闅愯棌 娌″繀瑕� end-->
- </tr>
- </table>
- <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start -->
- <table>
- <tr>
- <td> </td>
- </tr>
- <tr>
- <td style="text-align:right;width:50px;margin:10px;"></td>
- <th style="text-align:right;width:50px;margin:10px;" rowspan="3">
- {!$ObjectType.QuoteIrai__c.fields.MultiYearWarrantyTotalPrice__c.Label}
- : </th>
- <!-- <td style="width:470px;"> -->
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
- <td style="width:100px;" rowspan="3">
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
- <apex:outputtext style="width: :100px" id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}"
- >
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
- <!-- style="text-align:right;width:180px;"> -->
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
- <apex:param value="{!qb.MultiYearWarrantyTotalPrice}"/>
- </apex:outputtext>
- </td>
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
- <th style="width:100px;"> </th>
- <td style="text-align:right;width:50px;"></td>
- <td style="text-align:right;width:50px;"></td>
- <th colspan="2" style="width:260px;text-align:center;">{!$Label.Sales_Name}</th>
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
- <!-- <apex:variable id="contractWarranty" value="{!1}" var="abc" rendered="{!IF(trade == '鍐呰部',true,false)}">
-
- <th style="text-align:right;width:50px;">
- {!$ObjectType.Quote.fields.MultiYearWarrantyTotalPrice__c.label}
- : </th>
- <td style="width:470px;">
- <apex:outputtext id="MultiYearWarrantyTotalPrice_out" value="{0, number, ###,##0.00}"
- style="text-align:right;width:180px;">
- <apex:param value="{!quo.MultiYearWarrantyTotalPrice__c}"/>
- </apex:outputtext>
- </td>
- <th style="text-align:right;width:50px;">
- {!$ObjectType.Quote.fields.multiYearWarranty__c.label}
- : </th>
- <td style="width:200px;"><apex:inputField id="multiYearWarranty" value="{!quo.multiYearWarranty__c}" onchange="callFromCancelgurantee_MD();" style="text-align:right;width:30px;" /></td>
- </apex:variable> -->
- </tr>
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy start-->
- <tr>
- <td ></td>
- <td ></td>
- <td ></td>
- <th style="width:100px;text-align:right;">{!$Label.Sales_Name1}</th>
- <td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName1" value="{!quo.Agency1_entrust__c}" onChange=""/></td>
- <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
- <th style="width:100px;text-align:right;">澶氬勾淇�</th>
- <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
- <td colspan="2" style="text-align:left;"><apex:inputField id="cancelMultiyearInsurance" value="{!quo.cancelMultiyearInsurance__c}" onChange="cancelMultiyearInsurancechange()"/></td><!-- onChange="cancelMultiyearInsurancechange()"-->
- <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
- <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
- </tr>
- <!--obsap 鏂板缁忛攢鍟�1瀛楁 fy end-->
- <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy start-->
- <tr>
- <td ></td>
- <td ></td>
- <td ></td>
- <th style="width:100px;text-align:right;margin:10px;">{!$Label.Sales_Name2}</th>
- <td colspan="2" style="width:260px;text-align:right;"><apex:inputField style="width:230px;" id="SalesName2" value="{!quo.Agency2_entrust__c}" onChange=""/></td>
- <th style="width:100px;text-align:right;margin:10px;"></th>
- <td colspan="2" style="width:120px;text-align:left;margin:10px;"></td>
- </tr>
- <!--DB202302464682銆愭姤浠峰鎵樸�戞姤浠峰鎵樻敼鍠�224 fy end-->
- <tr>
- <td> </td>
- </tr>
- </table>
- <!-- CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 End -->
- </div>
- <table>
- <tr>
- <td> </td>
- </tr>
- </table>
- <table style="width:1165px;background:rgb(240 238 238);" border="0">
- <tr>
- <th style="text-align:center;width:15px;"> <input type="checkbox" id="checkAll" onclick="selectAll()" style="width:10px;"/></th>
- <th style="text-align:center;width:15px;">No</th>
- <th style="text-align:center;width:150px;">{!$Label.Asset_No}</th>
- <th style="text-align:center;width:100px;">{!$Label.SFDA_Status}</th>
- <th style="text-align:center;width:300px;">{!$Label.Product_Name}</th>
- <th style="text-align:center;width:100px;">{!$Label.Quantity}</th>
- <!-- CHAN-BHNBX6 2019/11/20 START -->
- <th style="text-align:center;width:50px;">淇濅慨骞撮檺</th>
- <!-- CHAN-BHNBX6 2019/11/20 END -->
- <th style="text-align:center;width:85px;">ListPrice</th>
- <th style="text-align:center;width:100px;">灏忚</th>
- <!-- CHAN-BHNBX6 2019/11/20 START -->
- <th style="text-align:center;width:100px;">NoDiscount灏忚</th>
- <!-- CHAN-BHNBX6 2019/11/20 END -->
- </tr>
- </table>
- <div id="iframelike" style="width:1183px;">
- <input type="hidden" id="ListPriceTotal" value="0" />
- <input type="hidden" id="UnitPriceTotal" value="0" />
- <apex:pageblocktable value="{!activities}" var="s" id="lists" style="width:1165px;">
-
- <apex:column style="width:20px;" >
- <input type="checkbox" name="checklist" value="{!s.lineNo}" style="width:10px;"/>
- </apex:column>
- <!-- No -->
- <apex:column style="width:20px;text-align:right;" >
- <apex:outputLabel id="indexNo" value="{!IF(s.PageObject.Product2__c==null,null,s.lineNo + 1)}" style="width:10px;"/>
- </apex:column>
- <!-- 浜у搧缂栧彿-->
- <apex:column style="text-align:center;width:150px;">
- <apex:inputText id="Assert" style="width:120px;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value)" />
- <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
- <apex:inputHidden id="CanNotCancelledGurantee__c" value="{!s.CanNotCancelledGurantee}" />
- <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
- </apex:column>
- <!-- NMPA鐘舵�� -->
- <apex:column style="width:100px;text-align:center;">
- <apex:outputField style="width:75px;" id="Status__c" value="{!s.PageObject.SFDA_Status__c}"/>
- <apex:inputHidden id="SFDA" value="{!s.PageObject.SFDA_Status__c}"/>
- </apex:column>
- <!-- 浜у搧鍚嶇О -->
- <apex:column style="width:300px;">
- <div id="Page:mainForm:block:lists:{!s.lineNo}:NameLink">
- <apex:outputLink style="width:300px;" value="{!baseUrl}/{!s.PageObject.Product2__c}" id="Nametext1" target="_blank">{!s.PageObject.Name__c}</apex:outputLink>
- </div>
- <apex:inputHidden id="Name__c" value="{!s.PageObject.Name__c}"/>
- <apex:inputHidden id="url__c" value="{!s.PageObject.Product2__c}"/>
- </apex:column>
- <!-- 鏁伴噺 -->
- <apex:column style="text-align:center;width:100px;">
- <apex:inputField id="Quantity" style="width:50px;text-align:right;" value="{!s.PageObject.Quantity__c}" onclick="show('{!s.PageObject.GuaranteePeriod__c}')" onChange="calPrice('{!s.lineNo}')"/>
- </apex:column>
- <!-- 2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6 start -->
- <apex:column style="width:50px;text-align:right;" >
- <apex:outputLabel id="itemGuaranteePeriod" value="{!s.PageObject.GuaranteePeriod__c}" style="width:10px;"/>
- </apex:column>
- <!-- 2019/11/12 淇濅慨骞撮檺 CHAN-BHNBX6 end -->
- <!-- ListPrice-->
- <apex:column style="width:85px;text-align:center;">
- <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
- <apex:outputText style="width:85px;" id="ListPricetext" value="{0, number, ###,##0.00}">
- <apex:param value="{!s.ListPrice_Page}" />
- </apex:outputText>
- </apex:outputPanel>
- <apex:inputHidden id="ListPrice" value="{!s.ListPrice_Page}"/>
- <apex:outputPanel layout="none" rendered="{!!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
- <span style="width:85px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:ListPricetext">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
- <script type="text/javascript">
- j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':ListPrice')).val(toNum(0));
- </script>
- </apex:outputPanel>
- </apex:column>
- <!-- 灏忚 -->
- <apex:column style="width:100px;text-align:center;">
- <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
- <apex:outputText style="width:80px;" id="ListPriceTotalText" value="{0, number, ###,##0.00}">
- <apex:param value="{!s.ListPriceTotal_Page}" />
- </apex:outputText>
- </apex:outputPanel>
- <apex:inputHidden id="ListPriceTotal" value="{!s.ListPriceTotal_Page}"/>
- <apex:outputPanel layout="none" rendered="{!!$ObjectType.QuoteIraiLineItem__c.fields.ListPrice__c.accessible}" >
- <span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:ListPriceTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
- <script type="text/javascript">
- j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':ListPriceTotal')).val(toNum(0));
- </script>
- </apex:outputPanel>
- <apex:inputHidden id="Product_Id" value="{!s.PageObject.Product2__c}"/>
- <apex:inputHidden id="lineNo" value="{!s.lineNo}"/>
- </apex:column>
- <!-- CHAN-BHNBX6 NodisCount 灏忚 2019/11/20 START -->
- <apex:column style="width:100px;text-align:center;">
- <apex:outputPanel layout="none" rendered="{!$ObjectType.QuoteIraiLineItem__c.fields.ServicePrice__c.accessible}" >
- <apex:outputText style="width:80px;" id="NoDiscountTotalText" value="{0, number, ###,##0.00}">
- <apex:param value="{!s.NoDiscountTotal_Page}" />
- </apex:outputText>
- </apex:outputPanel>
- <apex:inputHidden id="NoDiscountTotal" value="{!s.NoDiscountTotal_Page}"/>
- <apex:inputHidden id="NoDiscount" value="{!s.NoDiscount_Page}"/>
- <apex:outputPanel layout="none" rendered="{!!$ObjectType.QuoteIraiLineItem__c.fields.ServicePrice__c.accessible}" >
- <span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:NoDiscountTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
- <script type="text/javascript">
- debugger
- j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':NoDiscountTotal')).val(toNum(0));
- </script>
- </apex:outputPanel>
-
-
- </apex:column>
- <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start -->
- <!-- <apex:column style="width:100px;text-align:right;">
- <apex:outputPanel layout="none" rendered="{!IF(quo.cancelMultiyearInsurance__c =='瑕�' ||(quo.cancelMultiyearInsurance__c =='涓嶈' && s.CanNotCancelledGurantee == 'true' ),true,false)}" >
- <apex:outputText style="width:80px;" id="NoDiscountTotalText" value="{0, number, ###,##0.00}">
- <apex:param value="{!s.NoDiscountTotal_Page}" />
- </apex:outputText>
- </apex:outputPanel>
- <apex:inputHidden id="NoDiscountTotal" value="{!s.NoDiscountTotal_Page}"/>
- <apex:inputHidden id="NoDiscount" value="{!s.NoDiscount_Page}"/>
- <apex:outputPanel layout="none" rendered="{!IF(quo.cancelMultiyearInsurance__c =='涓嶈'&& s.CanNotCancelledGurantee == 'false' ,true,false)}" >
- <span style="width:80px;text-align:right;" id="Page:mainForm:block:lists:{!s.lineNo}:NoDiscountTotalText">{!IF(s.PageObject.Product2__c == null, ' ', 0.00)}</span>
- <script type="text/javascript">
- j$(escapeVfId('Page:mainForm:block:lists:'+ {!s.lineNo} + ':NoDiscountTotal')).val(toNum(0));
- </script>
- </apex:outputPanel>
- </apex:column> -->
- <!-- DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end -->
- <!-- CHAN-BHNBX6 NodisCount 灏忚 2019/11/20 END -->
- </apex:pageBlockTable>
- </div>
-
- <BR></BR>
- <table border="0">
- <tr>
- <td style="width:550px;" align="right">
- <apex:inputField value="{!quo.Note__c}" style="width:550px;height:55px;"/>
- </td>
- <td>
- <table border="0">
- <tr>
- <th style="width:15px"> </th>
- <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy start -->
- <td style="width:100px;" align="right"><apex:commandButton id="QuoteIraiBtn" action="{!checkIraiUser}" reRender="IraiUserId,message1" onclick="blockme();" oncomplete="iraiJs();return false;" value="鍙戦�佸鎵橀偖浠�" style="width:100px;white-space:nowrap;" disabled="{!Save_button}"/></td>
- <!-- SWAG-CKDATG 銆愬鎵樸�戙�怬BSAP-鎶ヤ环濮旀墭銆戞姤浠峰鎵橀」鐩敼鍠�1 fy end -->
- <td style="width:100px;" align="right"><apex:commandButton action="{!checkIraiUser}" reRender="IraiUserId,hiddenQuoid,message1" onclick="blockme();" oncomplete="save2btn();return false;" value="{!$Label.Save_Button}" style="width:100px;" disabled="{!Save_button}" /></td>
- <!-- 20230109 lt DB202212427301 start 娉ㄩ噴 -->
- <!-- <td style="width:100px;" align="right"><apex:commandButton onclick="oppReflection2btn();return false;" rerender="hiddenQuoid" value="{!$Label.Opp_Button}" style="width:90px;" disabled="{!Save_button}"/></td>
- <td style="width:100px;" align="right"><apex:commandButton action="{!Back}" rerender="hiddenQuoid" value="涓嶄繚瀛橈紙杩斿洖锛�" style="width:90px;"/></td>
- <td style="width:100px;" align="right"><apex:commandButton value="浜у搧璇曠敤璇勪环OPD" style="width:95px;" onclick="openpdf('OPD');return false;" disabled="{!pdf_button}"/></td>
- <td style="width:100px;" align="right"><apex:commandButton value="浜у搧璇曠敤璇勪环SIS" style="width:95px;" onclick="openpdf('SIS');return false;" disabled="{!pdf_button}"/></td> -->
- <!-- 20230109 lt DB202212427301 end 娉ㄩ噴 -->
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </apex:pageBlock>
- </apex:form>
</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/OFSHoverView.page b/force-app/main/default/pages/OFSHoverView.page
index c0c695c..806d8d9 100644
--- a/force-app/main/default/pages/OFSHoverView.page
+++ b/force-app/main/default/pages/OFSHoverView.page
@@ -15,4 +15,4 @@
<div id="mydiv" class="individualPalette lookupHoverDetail lookupHoverDetailOverridable" style="visibility: visible;"> </div>
</body>
</html>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/SI_Opportunity_Response.page b/force-app/main/default/pages/SI_Opportunity_Response.page
index 8500785..da09560 100644
--- a/force-app/main/default/pages/SI_Opportunity_Response.page
+++ b/force-app/main/default/pages/SI_Opportunity_Response.page
@@ -1,5 +1,6 @@
<apex:page standardController="Opportunity" extensions="SI_Opportunity_ResponseController" showHeader="false" sidebar="false" action="{!init}" id="allPage" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<script type="text/javascript">
diff --git a/force-app/main/default/pages/SearchProductIrai.page b/force-app/main/default/pages/SearchProductIrai.page
index 856b17e..2fc5e22 100644
--- a/force-app/main/default/pages/SearchProductIrai.page
+++ b/force-app/main/default/pages/SearchProductIrai.page
@@ -1,5 +1,6 @@
<apex:page id="Page" standardController="Product2" extensions="SearchProductController" sidebar="false" showHeader="false" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<script>
@@ -53,22 +54,22 @@
var CanNotCancelledGurantee__c = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":CanNotCancelledGurantee__c")).val();
//DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
- //CHAN-BHNBX6 2019/11/20 START
- var GuaranteePeriod = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":GuaranteePeriod")).value();
+ //CHAN-BHNBX6 2019/11/20 START
+ var GuaranteePeriod = j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":GuaranteePeriod")).value();
//nodiscount 灏忚
- var Intra_Trade_Service_RMB =j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_RMB")).value();
+ var Intra_Trade_Service_RMB =j$(escapeVfId("Page:mainForm:idSearchSetProduct:idRezultVisitor:"+ i +":Intra_Trade_Service_RMB")).value();
//CHAN-BHNBX6 2019/11/20 END
//No
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":indexNo")).text(parseInt(lineno)+1);
//瑁藉搧鍨嬬暘
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Assert")).val(Asset_Model_No__c);
-
+
//Status__c
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Status__c")).text(SFDA_Status__c);
//SFDA hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":SFDA")).val(SFDA_Status__c);
-
+
//DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
//鍙栨秷甯傚満澶氬勾淇�
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":CanNotCancelledGurantee__c")).val(CanNotCancelledGurantee__c);
@@ -85,9 +86,9 @@
//ListPrice
var ListPrice = 0;
var Cost_c = 0;
- //CHAN-BHNBX6 2019/11/20 START
+ //CHAN-BHNBX6 2019/11/20 START
var NoDiscount = 0;
-
+
if(trade == "CNY") {
ListPrice = Intra_Trade_List_RMB__c;
Cost_c = Intra_Trade_Cost_RMB__c;
@@ -106,10 +107,10 @@
//CHAN-BHNBX6 NoDiscount 2019/11/20 START
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscount")).val(NoDiscount);
//CHAN-BHNBX6 NoDiscount 2019/11/20 END
- //鏁伴噺
+ //鏁伴噺
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Quantity")).val(1);
-
- //CHAN-BHNBX6 淇濅慨骞撮檺 2019/11/20 START
+
+ //CHAN-BHNBX6 淇濅慨骞撮檺 2019/11/20 START
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":itemGuaranteePeriod")).text(GuaranteePeriod);
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":itemGuaranteePeriod")).val(GuaranteePeriod);
//CHAN-BHNBX6 淇濅慨骞撮檺 2019/11/20 END
@@ -118,20 +119,20 @@
//鍗樹綅
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Qty")).text();
-
+
//灏忚▓ 涓荤敾闈D鍙樻洿锛岄�昏緫涓嶅彉璁惧�糏D鍙樻洿
// window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":TotalPrice")).text(top.window.opener.toNumComma(ListPrice));
-
+
//Subtotal__c hidden
// window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Subtotal__c")).val(ListPrice);
//灏忚▓lw
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ListPriceTotalText")).text(top.window.opener.toNumComma(ListPrice));
-
+
//ListPriceTotal hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":ListPriceTotal")).val(ListPrice);
- //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 START
+ //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 START
//DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
// var cancelMultiyearInsurance = top.window.opener.j$(escapeVfId("Page:mainForm:block:cancelMultiyearInsurance")).val();
// var NoDiscount1;
@@ -144,50 +145,50 @@
//DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscountTotalText")).text(top.window.opener.toNumComma(NoDiscount));
- //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 END
+ //CHAN-BHNBX6 nodiscount 灏忚 2019/11/20 END
// window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NoDiscountTotal")).val(Intra_Trade_Service_RMB);
//NameCode hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":NameCode")).val(NameCode);
-
+
//Product_Name hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Name")).val(name);
-
+
//Product_SFDA hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_SFDA")).val(SFDA_Status__c);
-
+
//Sales_Possibility hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Sales_Possibility")).val(Sales_Possibility);
-
+
//Product_ListPrice hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_ListPrice")).val(ListPrice);
-
+
//Product_Cost hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Cost")).val(Cost_c);
-
+
//Cost hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Cost")).val(Cost_c);
-
+
//CostSubTotal hidden Cost_c * Quantity;
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":CostSubTotal")).val(Cost_c);
-
+
//Bsscategory hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Bsscategory")).val(Bsscategory);
-
+
//Product_Id hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":Product_Id")).val(Product2Id);
-
+
//PricebookEntryId hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":PricebookEntryId")).val(PricebookEntryId);
-
+
//lineNo hidden
window.opener.j$(escapeVfId("Page:mainForm:block:lists:"+ lineno +":lineNo")).val(parseInt(lineno));
}
</script>
<style type="text/css">
div#iframelike {
-
+
height: 300px;
overflow-y: auto;
overflow-x: hidden;
@@ -198,9 +199,9 @@
<apex:messages styleClass="editListError"/>
</apex:outputPanel>
<apex:form id="mainForm">
- <apex:pageBlock id="idSearchSetProduct" title="{!$Label.Product_Search}">
+ <apex:pageBlock id="idSearchSetProduct" title="{!$Label.Product_Search}" >
<apex:inputHidden id="Trade" value="{!Trade}"/>
- <table width="900" border="0" style="background-color:#DCDCDC">
+ <table width="1000" border="0" style="background-color:#DCDCDC;">
<colgroup>
<col width="12" />
<col width="50" /> <!-- lighting鍗囩骇 20230210 lt 鍚嶇О涓茶闂 20==50 -->
@@ -231,7 +232,7 @@
<td style="border-bottom: 1px solid #888;" colspan="15"> </td>
</tr>
</table>
- <table width="900" border="0" style="background-color:#DCDCDC">
+ <table width="1000" border="0" style="background-color:#DCDCDC">
<tr>
<td width="12"> </td>
<th valign="top">{!$Label.Search_Result}</th>
@@ -240,14 +241,14 @@
<table border="0">
<tr>
<td>
- <div id="iframelike" style="width:800px">
+ <div id="iframelike" style="width:900px">
<!-- 20221020 ljh SWAG-CJ98AJ start-->
<!-- <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="9" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,35px"> -->
- <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="10" columnsWidth="25px,120px,120px,280px,60px,60px,60px,60px,35px">
+ <apex:pageBlockTable id="idRezultVisitor" value="{!cl}" var="c" border="1" columns="10" columnsWidth="40px,120px,120px,280px,80px,80px,80px,80px,80px,40px">
<!-- 20221020 ljh SWAG-CJ98AJ end -->
- <apex:column style="width:15px;" >
+ <apex:column >
<apex:facet name="header">{!$Label.Selected}</apex:facet>
- <input type="checkbox" name="checklist" value="" style="width:10px;"/>
+ <input type="checkbox" name="checklist" value="" style="width:15px;"/>
</apex:column>
<apex:column >
<apex:facet name="header">{!$Label.Asset_No}</apex:facet>
@@ -319,4 +320,4 @@
var trade = window.opener.j$(escapeVfId("Page:mainForm:block:CurrencyIsoCode")).val();
j$(escapeVfId("Page:mainForm:idSearchSetProduct:Trade")).val(trade);
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/UnderConstruction.page b/force-app/main/default/pages/UnderConstruction.page
index bafc364..50fd9a1 100644
--- a/force-app/main/default/pages/UnderConstruction.page
+++ b/force-app/main/default/pages/UnderConstruction.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="false" title="{!$Label.site.site_under_construction}" lightningStylesheets="true">
+<apex:page showHeader="false" title="{!$Label.site.site_under_construction}" lightningStylesheets="true">
<apex:composition template="StdExceptionTemplate">
<apex:define name="icon">
<apex:image url="{!URLFOR($Resource.SiteSamples, 'img/tools.gif')}"/>
@@ -16,4 +16,4 @@
</apex:outputText>
</apex:define>
</apex:composition>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/genjinbaobiao.page b/force-app/main/default/pages/genjinbaobiao.page
index a41faad..e4a2c7e 100644
--- a/force-app/main/default/pages/genjinbaobiao.page
+++ b/force-app/main/default/pages/genjinbaobiao.page
@@ -4,7 +4,7 @@
銆愰噸瑕併�戣窡杩涙姤琛� <BR/><BR/>
<A href="{!$Label.Url_Head_Standard}/00O100000027APj" target="_blank">002-0:璇环璺熻繘鎶ヨ〃</A>
<BR/><BR/>
-<A href="{!$Label.Url_Head_Standard}/00O100000027AWV" target="_blank">002-1:娉ㄦ畫璺熻繘鎶ヨ〃
+<A href="{!$Label.Url_Head_Standard}/00O100000027AWV" target="_blank">002-1:娉ㄦ畫璺熻繘鎶ヨ〃
</A>
<BR/><BR/>
@@ -20,4 +20,4 @@
<BR/>
</DIV>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/maintenanceContractNotOpen.page b/force-app/main/default/pages/maintenanceContractNotOpen.page
index 8748887..67b2ab8 100644
--- a/force-app/main/default/pages/maintenanceContractNotOpen.page
+++ b/force-app/main/default/pages/maintenanceContractNotOpen.page
@@ -12,4 +12,4 @@
});
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/taskFeedback.page b/force-app/main/default/pages/taskFeedback.page
index 99bad40..393b43f 100644
--- a/force-app/main/default/pages/taskFeedback.page
+++ b/force-app/main/default/pages/taskFeedback.page
@@ -14,4 +14,4 @@
});
});
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1