From a2dbc98cd7d7925d6ed2b1b3d454aba9610e23c5 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期四, 18 五月 2023 14:04:10 +0800
Subject: [PATCH] 新建新服务合同报价
---
force-app/main/default/pages/CICReport.page | 2 +-
force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js | 5 ++++-
force-app/main/default/pages/MCLastMContract.page | 2 +-
force-app/main/default/classes/otherButtonMaintenanceContractCtl.cls | 7 +++++--
force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js-meta.xml | 7 +++++++
5 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/classes/otherButtonMaintenanceContractCtl.cls b/force-app/main/default/classes/otherButtonMaintenanceContractCtl.cls
index 771838e..3caa6cb 100644
--- a/force-app/main/default/classes/otherButtonMaintenanceContractCtl.cls
+++ b/force-app/main/default/classes/otherButtonMaintenanceContractCtl.cls
@@ -31,7 +31,7 @@
res.Name = report.Name;
res.ContractQuotationOrNotC = report.Contract_quotation_or_not__c;
res.PaymentPlanSumFirstC = report.Payment_Plan_Sum_First__c;
-
+ res.RecordTypeId1 = Schema.SObjectType.Maintenance_Contract__c.getRecordTypeInfosByName().get('鏈嶅姟鍚堝悓').getRecordTypeId();
System.debug(LoggingLevel.INFO, '*** res: ' + res);
}catch(Exception e){
System.debug(LoggingLevel.INFO, '*** e: ' + e);
@@ -109,6 +109,9 @@
@AuraEnabled
public String RecordTypeId;
@AuraEnabled
- public Boolean URFContractC;
+ public Boolean URFContractC;
+ @AuraEnabled
+ public ID RecordTypeId1;
+
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js
index 9adcd42..89df914 100644
--- a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js
+++ b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js
@@ -44,6 +44,7 @@
this.StatusC = result.StatusC;
this.IsRecognitionModelC = result.IsRecognitionModelC;
this.RecordTypeId = result.RecordTypeId;
+ this.RecordTypeId1 = result.RecordTypeId1;
this.URFContractC = result.URFContractC;
this.CustomNewMC();
@@ -58,15 +59,17 @@
CustomNewMC() {
if ( this.StatusC != "寮曞悎涓�") {
alert("缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环");
+ window.history.go(-1);
} else {
//缁翠慨鍚堝悓鏂板缓鎶ヤ环鏃讹紝濡傛灉鏄厛娆惧璞★紝寮瑰嚭瀵硅瘽妗嗘彁绀� thh 20220304 start
if (this.IsRecognitionModelC == 1) {
if (!confirm("璇ョ粡閿�鍟嗕负鍏堟瀵硅薄锛屾槸鍚︾户缁柊寤烘姤浠凤紵")) {
+ window.history.go(-1);
return;
}
}
//缁翠慨鍚堝悓鏂板缓鎶ヤ环鏃讹紝濡傛灉鏄厛娆惧璞★紝寮瑰嚭瀵硅瘽妗嗘彁绀� thh 20220304 end
- if (this.RecordTypeId == "01210000000gTYq") {
+ if (this.RecordTypeId == this.RecordTypeId1) {
if (this.URFContractC == "0") {
window.open("/apex/SelectAssetEstimateVM?mcid=" + this.Id, "_top");
} else {
diff --git a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js-meta.xml b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js-meta.xml
index 3392981..d1d71cc 100644
--- a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js-meta.xml
+++ b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js-meta.xml
@@ -7,5 +7,12 @@
<target>lightning__AppPage</target>
<target>lightning__HomePage</target>
<target>lightning__RecordAction</target>
+ <target>lightning__FlowScreen</target>
</targets>
+ <!-- 瀹氫箟鍙橀噺 -->
+ <targetConfigs>
+ <targetConfig targets="lightning__FlowScreen">
+ <property name="recordId" type="String" label="recordId"/>
+ </targetConfig>
+ </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/pages/CICReport.page b/force-app/main/default/pages/CICReport.page
index ab88180..19e8923 100644
--- a/force-app/main/default/pages/CICReport.page
+++ b/force-app/main/default/pages/CICReport.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="false" sidebar="false">
+<apex:page showHeader="false" sidebar="false" lightningStylesheets="true">
<DIV align="left">
740_CIC 鎶ヨ〃
diff --git a/force-app/main/default/pages/MCLastMContract.page b/force-app/main/default/pages/MCLastMContract.page
index a3782de..2f71795 100644
--- a/force-app/main/default/pages/MCLastMContract.page
+++ b/force-app/main/default/pages/MCLastMContract.page
@@ -1,4 +1,4 @@
-<apex:page controller="MCLastMContractController" tabStyle="Maintenance_Contract_Estimate__c" sidebar="false" showHeader="false" id="allPage" action="{!init}" title="缁鍚堝悓淇℃伅">
+<apex:page controller="MCLastMContractController" tabStyle="Maintenance_Contract_Estimate__c" sidebar="false" showHeader="false" id="allPage" action="{!init}" title="缁鍚堝悓淇℃伅" lightningStylesheets="true">
<apex:pageMessages />
<!-- update by rentongxiao 2020-09-09 start -->
<!-- <apex:form id="allForm">
--
Gitblit v1.9.1