From b28b7983fd65d7e3da0e6a57ba1754899f036971 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 06 六月 2023 18:03:11 +0800
Subject: [PATCH] 修改页面以及按钮
---
force-app/main/default/pages/ISO_DemandOperAndDemonsJump.page | 2
force-app/main/default/pages/Solution_ProgrammeEdit.page | 2
force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js | 105 +++++++++
force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js-meta.xml | 24 ++
force-app/main/default/pages/Solution_ProgrammeClone.page | 2
force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js-meta.xml | 11 +
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js | 42 ++-
force-app/main/default/pages/SubAuthorizedCreate.page | 2
force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.html | 7
force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.css | 22 ++
force-app/main/default/classes/lexLightingButtonConstant.cls | 2
force-app/main/default/classes/lexOpportunitySpecialApplyController.cls | 41 +++
force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.css | 10
force-app/main/default/pages/Solution_ProgrammeDelete.page | 2
force-app/main/default/lwc/lexSpecSubmit/__tests__/lexSpecSubmit.test.js | 25 ++
force-app/main/default/classes/lexOpportunitySpecialApplyController.cls-meta.xml | 5
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html | 6
force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js | 32 ++
force-app/main/default/pages/taskManage.page | 2
force-app/main/default/classes/lexPCLLostReportLwcController.cls | 270 ------------------------
force-app/main/default/lwc/lexSpecilaApplyCreate/__tests__/lexSpecilaApplyCreate.test.js | 25 ++
force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.html | 13 +
force-app/main/default/pages/SolApproval.page | 2
23 files changed, 358 insertions(+), 296 deletions(-)
diff --git a/force-app/main/default/classes/lexLightingButtonConstant.cls b/force-app/main/default/classes/lexLightingButtonConstant.cls
index a8207e4..498e06e 100644
--- a/force-app/main/default/classes/lexLightingButtonConstant.cls
+++ b/force-app/main/default/classes/lexLightingButtonConstant.cls
@@ -55,6 +55,8 @@
public static final String STATUS_QIS_FSE_COMPLATED = 'FSE濉啓瀹屾瘯';
//QIS鐨勭姸鎬佲�樺畬姣曗��
public static final String STATUS_QIS_COMPLATED = '瀹屾瘯';
+ //璇环娉ㄦ畫鐗规畩瀵瑰簲鐨勭姸鎬佲�樺凡鎻愪氦鈥�
+ public static final String STATUS_OPPORTUNITY_SPECIAL_APPLY_SUBMIT = '宸叉彁浜�';
//鎷涙爣椤圭洰鐨勯樁娈佃ˉ鍏呰鏄庘��3-1锛氬簾鏍囧叕鍛娾��
public static final String SUB_INFO_TYPE_SCRAPPED_LABEL = '3-1锛氬簾鏍囧叕鍛�';
//鎷涙爣椤圭洰鐨勯樁娈佃ˉ鍏呰鏄庘��3-2锛氭祦鏍囧叕鍛娾��
diff --git a/force-app/main/default/classes/lexOpportunitySpecialApplyController.cls b/force-app/main/default/classes/lexOpportunitySpecialApplyController.cls
new file mode 100644
index 0000000..492a60f
--- /dev/null
+++ b/force-app/main/default/classes/lexOpportunitySpecialApplyController.cls
@@ -0,0 +1,41 @@
+public with sharing class lexOpportunitySpecialApplyController {
+ @AuraEnabled
+ public static InitData initForSpecSubmitButton(String recordId){
+ InitData res = new InitData();
+ try {
+ OpportunitySpecialApply__c opp = [
+ select
+ Apply_Reason__c,
+ Is_upload_file__c,
+ Status__c
+ from OpportunitySpecialApply__c where Id =: recordId
+ ];
+ res.applyReason = opp.Apply_Reason__c;
+ res.isUploadFile = opp.Is_upload_file__c;
+ res.status = opp.Status__c;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ return res;
+ }
+ @AuraEnabled
+ public static string updateForSpecSubmitButton(String recordId){
+ OpportunitySpecialApply__c opp = new OpportunitySpecialApply__c();
+ try {
+ opp.Id = recordId;
+ opp.Status__c = lexLightingButtonConstant.STATUS_OPPORTUNITY_SPECIAL_APPLY_SUBMIT;
+ update opp;
+ return '';
+ } catch (Exception e) {
+ return e.getMessage();
+ }
+ }
+ public class InitData{
+ @AuraEnabled
+ public String applyReason;
+ @AuraEnabled
+ public Boolean isUploadFile;
+ @AuraEnabled
+ public String status;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexOpportunitySpecialApplyController.cls-meta.xml b/force-app/main/default/classes/lexOpportunitySpecialApplyController.cls-meta.xml
new file mode 100644
index 0000000..45cccbd
--- /dev/null
+++ b/force-app/main/default/classes/lexOpportunitySpecialApplyController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>57.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexPCLLostReportLwcController.cls b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
index 3a4b157..9ec6918 100644
--- a/force-app/main/default/classes/lexPCLLostReportLwcController.cls
+++ b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
@@ -31,29 +31,6 @@
public static integer secondNum {get; set;}
// add tcm 20211122 end
- @AuraEnabled
- public static LostReport getLostReport(){
- try {
- return LostReport;
- } catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
- }
- }
-
- @AuraEnabled( cacheable = true )
- public static List< Account > getAccounts() {
-
- return [ SELECT Id, Name, Industry FROM Account LIMIT 10 ];
-
- }
-
- @AuraEnabled( cacheable = true )
- public static void saveAccounts(List<Account> accList){
- Insert accList;
- /*if(accList.size()>0 && accList != null){
- insert accList;
- }*/
- }
@AuraEnabled
public static String getPickList(String objectName, String fieldName) {
@@ -103,27 +80,6 @@
pickList.put('鍏朵粬', qita);
return JSON.serialize(pickList);
}
- @AuraEnabled
- public static String getPickListByFilter(String objectName,String fieldName,String controlFieldName,String controlFieldValue){
- try {
- Schema.DescribeFieldResult fieldDescribe = Schema.getGlobalDescribe().get(objectName).getDescribe().fields.getMap().get(fieldName).getDescribe();
- // 濡傛灉璇ュ瓧娈典负閫夐」鍒楄〃绫诲瀷锛屽垯鑾峰彇閫夐」鍒楄〃
- List<Schema.PicklistEntry> picklistValues = fieldDescribe.getPicklistValues();
- // 鏍规嵁鎺у埗瀛楁鐨勫�肩瓫閫夊嚭瀵瑰簲鐨勯�夐」
- List<Map<String, Object>> lstPickvals = new List<Map<String, Object>>();
- for (Schema.PicklistEntry entry : picklistValues) {
- if (entry.isActive() && entry.getValue().startsWith(controlFieldValue)) {
- lstPickvals.add(new Map<String, Object>{'label' => entry.getValue(), 'value' => entry.getValue()});
- }
- }
- String jsonStr = JSON.serialize(lstPickvals);
- return jsonStr;
- } catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
- }
- }
-
-
@AuraEnabled
public static Map<string,object> init (string oppId1,string lostReportId1,string pageStatus1,string lostType1,string submitFlag1){
try {
@@ -288,176 +244,6 @@
maps.put('LostReport', LostReport);
return maps;
}
- //鍐欏埌js
- // 缂栬緫 鍙湁绯荤粺绠＄悊鍛樻垨鑰呰崏妗堜腑鍙互缂栬緫
- @AuraEnabled
- public static String edit2(){
- if( userinfo.getProfileId() == (ID) '00e10000000Y3o5AAC' ||
- '鑽夋'.equals(LostReport.LostReport.Report_Status__c)
- ) {
- pageStatus = 'Edit';
- init1();
- }
- else{
- return '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘杩涜缂栬緫锛�';
- }
- return null;
- }
- // 璁剧疆鍝佺墝
- @AuraEnabled
- public static void setBrand(){
- list<LostBrand> LostBrandlist = LostReport.LostBrands;
- LostBrand tempBrand = LostBrandlist.get(setBrandNo);
- string brandName = tempBrand.lostBrand.Lost_By_Company__c;
- // fy SWAG-CCC6F6 start
- if(!'鍏朵粬'.equals(tempBrand.lostBrand.Lost_By_Company_Mannual__c)){
- tempBrand.lostBrand.Lost_By_Company_Mannual__c = null;
- }
- system.debug('aaa5+++'+tempBrand.lostBrand.Lost_By_Company_Mannual__c);
- // fy SWAG-CCC6F6 end
- // ID compID = CompetitionMap.get(brandName);
- for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
- // test
- // tempLostProduct.LostProductss.Competitor__c = compID;
- tempLostProduct.LostProductss.LostBrandName__c = brandName;
- tempLostProduct.LostProductss.LostProduct__c = null;
- tempLostProduct.LostProductss.LostProductMannual__c = null;
- tempLostProduct.LostProductss.Quantity__c = null;
- tempLostProduct.LostProductss.ProductClass__c = null;
- tempLostProduct.LostProductss.ProductCategory__c = null;
- tempLostProduct.bool=false;
- }
- }
- // 璁剧疆鍝佺墝
- @AuraEnabled
- public static void setbrandmannual(){
- list<LostBrand> LostBrandlist = LostReport.LostBrands;
- LostBrand tempBrand = LostBrandlist.get(setBrandNo);
- string brandName = tempBrand.lostBrand.Lost_By_Company__c;
- String brandNameMannual = tempBrand.lostBrand.Lost_By_Company_Mannual__c;
- // ID compID = CompetitionMap.get(brandName);
- for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
- // test
- // tempLostProduct.LostProductss.Competitor__c = compID;
- system.debug('aaaa3++'+brandNameMannual);
- if ('鍏朵粬'.equals(brandName) && brandNameMannual != null && !''.equals(brandNameMannual)) {
- tempLostProduct.LostProductss.LostBrandName__c = brandNameMannual;
- // tempLostProduct.LostProductss.LostProduct__c = null;
- // tempLostProduct.LostProductss.LostProductMannual__c = null;
- // tempLostProduct.LostProductss.Quantity__c = null;
- // tempLostProduct.LostProductss.ProductClass__c = null;
- // tempLostProduct.LostProductss.ProductCategory__c = null;
- // tempLostProduct.bool=false;
- }
- }
- }
- // 淇濆瓨
- // @AuraEnabled
- // public static String save(LostReport report){
- // try {
- // if(!dataEntry(report)) {
- // return null;
- // }
-
- // // brandCount = LostReport.LostBrands.size();
- // pageStatus = 'View';
- // return '淇濆瓨鎴愬姛锛�';
- // } catch (Exception e) {
- // return e.getMessage();
- // }
- // }
- //璇诲彇骞舵瀯寤虹珵浜夊鎵嬪搧鐗�
- // public void BrandmapSet(){
- // CompetitionMap = new map<string, id>();
- // list <Competition_Company__c> competitionList
- // = [select id,name from Competition_Company__c];
- // for(Competition_Company__c tempComp : competitionList ) {
- // CompetitionMap.put(tempComp.name, tempComp.id);
- // }
-
- // }
- // 鏁版嵁妫�鏌�
- @AuraEnabled
- public static boolean DataCheck(LostReport report){
- LostReport = report;
- boolean dataCheck = true;
- if(string.isBlank(LostReport.LostReport.LostType__c))
- {
- LostReport.LostReport.LostType__c.addError('蹇呴』濉啓澶卞崟绫诲瀷锛�');
- dataCheck = false;
- }
- for(LostBrand tempLostBrand : LostReport.LostBrands ) {
- system.debug('aaaa1++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
- if(string.isblank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
- tempLostBrand.lostBrand.Lost_By_Company__c.addError('璇峰～鍐欏け鍗曞搧鐗岋紒');
- dataCheck = false;
- }// fy SWAG-CCC6F6 start
- else if('鍏朵粬'.equals(tempLostBrand.lostBrand.Lost_By_Company__c)&&string.isblank(tempLostBrand.lostBrand.Lost_By_Company_Mannual__c)){
- tempLostBrand.lostBrand.Lost_By_Company_Mannual__c.addError('璇峰～鍐欏け鍗曞搧鐗岋紙鎵嬪姩锛夛紒');
- dataCheck = false;
- }// fy SWAG-CCC6F6 end
- system.debug('aaaa2++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
- if(tempLostBrand.lostBrand.LostPrice__c == null) {
- tempLostBrand.lostBrand.LostPrice__c.addError('澶卞崟閲戦蹇呭～锛�');
- dataCheck = false;
- }
- if(string.isblank(tempLostBrand.lostBrand.Lost_reason_main__c )) {
- tempLostBrand.lostBrand.Lost_reason_main__c.addError('澶卞崟鐞嗙敱(涓�)蹇呭～锛�');
- dataCheck = false;
- }
- if(string.isblank(tempLostBrand.lostBrand.Agency__c )) {
- tempLostBrand.lostBrand.Agency__c.addError('涓爣缁忛攢鍟嗗繀濉紒');
- dataCheck = false;
- }
- // 妫�鏌ユ槸鍚︽湁瓒呰繃1涓湁鏁扮殑浜у搧
- integer productCount = 0;
- for( PCLLostProducts temlostProduct : tempLostBrand.LostProducts) {
- if (temlostProduct.LostProductss.LostProduct__c != null || temlostProduct.LostProductss.LostProductMannual__c != null) {
- System.debug('澶卞崟鍨嬪彿' + temlostProduct.LostProductss.LostProduct__c);
- System.debug('澶卞崟鍨嬪彿鎵嬪姩' + temlostProduct.LostProductss.LostProductMannual__c);
- productCount ++;
- }
- // update tcm 20211123 start
- if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&(temlostProduct.LostProductss.Quantity__c==null || temlostProduct.LostProductss.Quantity__c ==0)) {
- temlostProduct.LostProductss.Quantity__c.addError('璇峰～鍐欏け鍗曟暟閲忥紒');
- dataCheck = false;
- }
- if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&temlostProduct.LostProductss.ProductCategory__c==null) {
- if (temlostProduct.LostProductss.ProductClass__c==null) {
- temlostProduct.LostProductss.ProductClass__c.addError('澶卞崟浜у搧绫诲埆蹇呭～锛�');
- temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭～锛�');
- }else {
- temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭～锛�');
- }
- dataCheck = false;
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
- if ((temlostProduct.LostProductss.LostProduct__c==null && temlostProduct.LostProductss.LostProductMannual__c==null)&&(temlostProduct.LostProductss.ProductCategory__c!=null||temlostProduct.LostProductss.Quantity__c!=null)) {
- if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
- temlostProduct.LostProductss.LostProduct__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
- } else{
- temlostProduct.LostProductss.LostProductMannual__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
- }
- dataCheck = false;
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
- // update tcm 20211123 end
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
- if (productCount == 0 && tempLostBrand.LostProducts != null && tempLostBrand.LostProducts.size() > 0) {
- if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
- tempLostBrand.LostProducts[0].LostProductss.LostProduct__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
- }else{
- tempLostBrand.LostProducts[0].LostProductss.LostProductMannual__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
- }
- dataCheck = false;
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
- }
-
-
- return dataCheck;
- }
@AuraEnabled
public static String searchBrands(){
String ObjectApi_name = 'PCLLostBrand__c';
@@ -480,17 +266,6 @@
}
String jsonStr = JSON.serialize(lstPickvals);
return jsonStr;
- }
- public static list<LostBrand> brandcopy(LostReport report){
- list<LostBrand> tempbrands = new list<LostBrand>();
- for(LostBrand tempbrand: report.LostBrands) {
- LostBrand LostBrand =
- new LostBrand(tempbrand.lineNo,tempbrand.LostProducts );
- LostBrand.lostBrand = tempbrand.lostBrand.clone();
- LostBrand.lostBrand.id = tempbrand.lostBrand.id;
- tempbrands.add(LostBrand);
- }
- return tempbrands;
}
// 鏁版嵁褰曞叆
@AuraEnabled
@@ -679,51 +454,6 @@
return lostBrand;
}
- // 鍒犻櫎鍝佺墝 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄垹闄ら偅涓搧鐗�
- @AuraEnabled
- public static String Remove(){
- system.debug('RemoveBrandNo:'+RemoveBrandNo);
- list<LostBrand> tempLostBrands = new List<lostBrand>();
- Integer i = 0;
- for(integer j = 0; j< LostReport.LostBrands.size(); j++ ) {
- LostBrand templostBrand = LostReport.LostBrands.get(j);
- if(j != RemoveBrandNo) {
- templostBrand.lineNo = i;
- tempLostBrands.add(templostBrand);
- i++;
- }else if(!string.isBlank(templostBrand.lostBrand.id)) {
- deleteBrandIDSet.add(templostBrand.lostBrand.id);
- }
- }
-
- LostReport.LostBrands = tempLostBrands;
-
- brandCount = LostReport.LostBrands.size();
- return null;
- }
- // 娣诲姞鍨嬪彿锛� 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄坊鍔犲埌閭ｄ釜鍝佺墝
- // update tcm 20211125 娣诲姞鍨嬪彿鏃惰嚜鍔ㄥ甫鍑哄搧鐗� start
- @AuraEnabled
- public static String addProduct(){
- system.debug('brandNo:'+brandNo);
- LostBrand tempLostBrand = LostReport.LostBrands.get(brandNo);
- // PCLLostProduct__c plp = new PCLLostProduct__c(Competitor__c=CompetitionMap.get(LostReport.LostBrands[brandNo].lostBrand.Lost_By_Company__c));
- string brandName = tempLostBrand.lostBrand.Lost_By_Company__c;
- PCLLostProduct__c plp = new PCLLostProduct__c();
- plp.LostBrandName__c = brandName;
- tempLostBrand.LostProducts.add(new PCLLostProducts(tempLostBrand.LostProducts.size(),plp));
- tempLostBrand.ProductSize = tempLostBrand.LostProducts.size();
- return null;
- }
- @AuraEnabled
- public static PCLLostProducts getLostProduct(){
- try {
- PCLLostProduct__c plp = new PCLLostProduct__c();
- return new PCLLostProducts(0,plp);
- } catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
- }
- }
// update tcm 20211125 娣诲姞鍨嬪彿鏃惰嚜鍔ㄥ甫鍑哄搧鐗� end
// 椤甸潰鐨勬暟鎹粨鏋�
public class LostReport {
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
index 10c9509..15ad499 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-20 17:16:48
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-06-06 10:33:07
+ * @LastEditTime: 2023-06-06 14:00:41
-->
<template>
@@ -25,7 +25,7 @@
</lightning-layout>
<div style="margin-top: 5px">
<lightning-layout>
- <lightning-layout-item size="2" padding="around-small">
+ <lightning-layout-item size="3" padding="around-small">
<div class="slds-form_horizontal my-combobox">
<label class="slds-form-element__label">澶卞崟绫诲瀷锛�</label>
<lightning-combobox name="progress" value={LostReport.lostReport.LostType__c} options={RecordTypeOptions}
@@ -33,7 +33,7 @@
</lightning-combobox>
</div>
</lightning-layout-item>
- <lightning-layout-item size="3" padding="around-small">
+ <lightning-layout-item size="4" padding="around-small">
<div style="padding: 10px 3px;font: 16px;">澶卞崟鎬婚噾棰濓紙鍏冿級:{LostReport.lostReport.LostTotalAmount__c}</div>
</lightning-layout-item>
<lightning-layout-item size="3" padding="around-small">
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
index d3d0d93..165b16c 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-20 15:04:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-06-06 10:51:30
+ * @LastEditTime: 2023-06-06 13:27:33
*/
const columns2=[
{ label: '--鏃�--', value: '' },
@@ -31,7 +31,7 @@
];
const columns3 = [
{label : "澶卞崟鍝佺墝",fieldName : "LostBrandName__c"},
- {label : "澶卞崟瀵规墜鍨嬪彿",fieldName : "LostProduct__c"},
+ {label : "澶卞崟瀵规墜鍨嬪彿",fieldName : "productName"},
{label : "澶卞崟鏁伴噺",fieldName : "Quantity__c",type : "number"},
{label : "澶卞崟瀵规墜鍨嬪彿(鎵嬪姩)",fieldName : "LostProductMannual__c"},
{label : "澶卞崟浜у搧绫诲埆",fieldName : "ProductClass__c"},
@@ -171,7 +171,9 @@
var products = this.LostReport.LostBrands[this.tableflag].LostProducts;
var productList = [];
products.forEach(product=>{
- productList.push(product.LostProductss);
+ var newProduct = JSON.parse(JSON.stringify(product));
+ newProduct.LostProductss.productName = newProduct.productName;
+ productList.push(newProduct.LostProductss);
});
this.tableflag++;
return productList;
@@ -201,6 +203,12 @@
get isEdit(){
if(this.status.pageStatus == 'Edit'){
+ return true;
+ }
+ return false;
+ }
+ get isSubmit(){
+ if(this.submitFlag){
return true;
}
return false;
@@ -349,22 +357,24 @@
if(result.error){
this.showToast(result.error,"error");
}else{
- var report = JSON.parse(result.LostReport);
- var index1 = 0;
- this.LostReport.LostBrands.forEach(brand=>{
- brand.lostBrand.Id = report.LostBrands[index1].lostBrand.Id;
- var index2 = 0;
- brand.LostProducts.forEach(product=>{
- product.LostProductss.Id = report.LostBrands[index1].LostProducts[index2].LostProductss.Id;
- index2++;
- });
- index1++;
- });
+ // var report = JSON.parse(result.LostReport);
+ // var index1 = 0;
+ // this.LostReport.LostBrands.forEach(brand=>{
+ // brand.lostBrand.Id = report.LostBrands[index1].lostBrand.Id;
+ // var index2 = 0;
+ // brand.LostProducts.forEach(product=>{
+ // product.LostProductss.Id = report.LostBrands[index1].LostProducts[index2].LostProductss.Id;
+ // index2++;
+ // });
+ // index1++;
+ // });
+ this.LostReport = JSON.parse(result.LostReport);
this.reportId = result.reportId;
- this.LostReport.lostReport.Id = result.reportId;
- console.log(this.LostReport);
+ // this.LostReport.lostReport.Id = result.reportId;
+ // console.log(this.LostReport);
this.status.pageStatus = 'View';
this.tableflag = 0;
+ console.log(this.LostReport);
}
}).catch(error=>{
console.log("error");
diff --git a/force-app/main/default/lwc/lexSpecSubmit/__tests__/lexSpecSubmit.test.js b/force-app/main/default/lwc/lexSpecSubmit/__tests__/lexSpecSubmit.test.js
new file mode 100644
index 0000000..4bf64fb
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecSubmit/__tests__/lexSpecSubmit.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexSpecSubmit from 'c/lexSpecSubmit';
+
+describe('c-lex-spec-submit', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-spec-submit', {
+ is: LexSpecSubmit
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.css b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.css
new file mode 100644
index 0000000..d3a1bf5
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.css
@@ -0,0 +1,10 @@
+.specSubmitHolder{
+ position: relative;
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+}
+.container .uiContainerManager{
+ display: none !important;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.html b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.html
new file mode 100644
index 0000000..87b4e9e
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.html
@@ -0,0 +1,7 @@
+<template>
+ <div class="specSubmitHolder" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js
new file mode 100644
index 0000000..8faac9a
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js
@@ -0,0 +1,105 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-06-06 15:41:32
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-06-06 16:40:51
+ */
+import { api, wire,LightningElement } from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import updateForSpecSubmitButton from '@salesforce/apex/lexOpportunitySpecialApplyController.updateForSpecSubmitButton';
+import init from '@salesforce/apex/lexOpportunitySpecialApplyController.initForSpecSubmitButton';
+import { updateRecord } from 'lightning/uiRecordApi';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
+export default class LexSpecSubmit extends LightningElement {
+ @api recordId;
+ applyReason;
+ isUploadFile;
+ status;
+ IsLoading = true;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ title: '',
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ }
+
+
+ updateRecordView(recordId) {
+ updateRecord({fields: { Id: recordId }});
+ }
+
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ this.applyReason = result.applyReason;
+ this.isUploadFile = result.isUploadFile;
+ this.status = result.status;
+ this.specSubmit();
+ }).catch(error=>{
+ console.log("error");
+ console.log(error);
+ });
+ }
+ specSubmit(){
+ var reason = this.applyReason;
+ var file = this.isUploadFile;
+ var status = this.status;
+
+ if((reason == '鎷涙爣璐ㄧ枒'||reason == '鍙栨秷鎷涙爣') && (file == false)){
+ this.showToast('璇蜂笂浼犻檮浠躲��','error');
+ return;
+ }
+ if(status != '鑽夋涓�'&& status != '椹冲洖'){
+ this.showToast('褰撳墠鐘舵�佹棤娉曟彁浜ゅ鎵广��','error');
+ return;
+ }
+ this.handleConfirmClick('涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵');
+ }
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+ });
+ console.log(result);
+ if(result){
+ updateForSpecSubmitButton({
+ recordId: this.recordId
+ }).then(result=>{
+ if(result){
+ this.showToast(result,'error');
+ }else{
+ this.showToast('瀹℃壒鎻愪氦鎴愬姛銆�','success');
+ this.updateRecordView(this.recordId);
+ this.IsLoading = false;
+ }
+ this.dispatchEvent(new CloseActionScreenEvent());
+ });
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js-meta.xml b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js-meta.xml
new file mode 100644
index 0000000..3392981
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecilaApplyCreate/__tests__/lexSpecilaApplyCreate.test.js b/force-app/main/default/lwc/lexSpecilaApplyCreate/__tests__/lexSpecilaApplyCreate.test.js
new file mode 100644
index 0000000..3ab1eb3
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecilaApplyCreate/__tests__/lexSpecilaApplyCreate.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexSpecilaApplyCreate from 'c/lexSpecilaApplyCreate';
+
+describe('c-lex-specila-apply-create', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-specila-apply-create', {
+ is: LexSpecilaApplyCreate
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.css b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.css
new file mode 100644
index 0000000..95c1c55
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.css
@@ -0,0 +1,22 @@
+.holder{
+ position: relative;
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+}
+
+.container .uiContainerManager{
+ display : none !important;
+}
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #feb75d;
+ display: flex;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.html b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.html
new file mode 100644
index 0000000..2dfa0c5
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.html
@@ -0,0 +1,13 @@
+<template>
+ <div class="holder" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div>
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js
new file mode 100644
index 0000000..cbb6767
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js
@@ -0,0 +1,32 @@
+import { LightningElement,api, track, wire } from 'lwc';
+import {CurrentPageReference} from 'lightning/navigation';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { NavigationMixin } from 'lightning/navigation';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+export default class LexSpecilaApplyCreate extends NavigationMixin(LightningElement) {
+ @api oppId;
+ @api oppName;
+ @api oppForecastStatus;
+ msg;
+ IsLoading = true;
+ connectedCallback(){
+ // const defaultValues = encodeDefaultFieldValues({
+ // Opportunity__c: this.oppId, // 鍏宠仈涓昏褰� ID
+ // Apply_Content_Old__c: this.oppForecastStatus == undefined ? '' : this.oppForecastStatus
+ // });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'OpportunitySpecialApply__c',
+ actionName: 'new'
+ },
+ // state: {
+ // defaultFieldValues: defaultValues,
+ // RecordTypeId: '01210000000gTCW'
+ // }
+ });
+ // var url = 'a3W/e?RecordType=01210000000gTCW&CF00N10000008qvFQ='+ encodeURIComponent(this.oppName) + '&CF00N10000008qvFQ_lkid='+ encodeURIComponent(this.oppId) + '&00N10000008qvFX='+ encodeURIComponent(this.oppForecastStatus)+'&retURL='+ encodeURIComponent(this.oppId);
+ // window.location.href = url;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js-meta.xml b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js-meta.xml
new file mode 100644
index 0000000..5354ac9
--- /dev/null
+++ b/force-app/main/default/lwc/lexSpecilaApplyCreate/lexSpecilaApplyCreate.js-meta.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__AppPage</target>
+ <target>lightning__RecordPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ <!-- 灞忓箷娴侀厤缃� -->
+ <target>lightning__FlowScreen</target>
+ </targets>
+
+ <!-- 瀹氫箟鍙橀噺 -->
+
+ <targetConfigs>
+ <targetConfig targets="lightning__FlowScreen">
+ <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
+ <property name="oppId" type="String" label="oppId"/>
+ <property name="oppName" type="String" label="oppName"/>
+ <property name="oppForecastStatus" type="String" label="oppForecastStatus"/>
+ </targetConfig>
+ </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/pages/ISO_DemandOperAndDemonsJump.page b/force-app/main/default/pages/ISO_DemandOperAndDemonsJump.page
index 8ce224a..caeea98 100644
--- a/force-app/main/default/pages/ISO_DemandOperAndDemonsJump.page
+++ b/force-app/main/default/pages/ISO_DemandOperAndDemonsJump.page
@@ -1,4 +1,4 @@
-<apex:page standardController="IS_Opportunity_Demand__c" extensions="ISO_DemandOperAndDemonsJumpController" action="{!init}">
+<apex:page standardController="IS_Opportunity_Demand__c" extensions="ISO_DemandOperAndDemonsJumpController" action="{!init}" lightningStylesheets="true">
<script type="text/javascript">
// TODO js銇仸鏃ュ牨鐢婚潰鑹插鏇�
window.location.href = '/apex/{!lid}';
diff --git a/force-app/main/default/pages/SolApproval.page b/force-app/main/default/pages/SolApproval.page
index 0a5043e..407458f 100644
--- a/force-app/main/default/pages/SolApproval.page
+++ b/force-app/main/default/pages/SolApproval.page
@@ -1,4 +1,4 @@
-<apex:page sidebar="true" standardController="Solution_Programme__c">
+<apex:page sidebar="true" standardController="Solution_Programme__c" lightningStylesheets="true">
<!-- <apex:relatedList list="ProcessSteps" ></apex:relatedList>-->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<script type="text/javascript">
diff --git a/force-app/main/default/pages/Solution_ProgrammeClone.page b/force-app/main/default/pages/Solution_ProgrammeClone.page
index b921e68..54a42ff 100644
--- a/force-app/main/default/pages/Solution_ProgrammeClone.page
+++ b/force-app/main/default/pages/Solution_ProgrammeClone.page
@@ -1,3 +1,3 @@
-<apex:page standardController="Solution_Programme__c" extensions="CreateSolCloneController" title="Solution_Programme__c" action="{!checkRecordTypeEDIT}">
+<apex:page standardController="Solution_Programme__c" extensions="CreateSolCloneController" title="Solution_Programme__c" action="{!checkRecordTypeEDIT}" lightningStylesheets="true">
</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/Solution_ProgrammeDelete.page b/force-app/main/default/pages/Solution_ProgrammeDelete.page
index 1c50efd..0c6ce87 100644
--- a/force-app/main/default/pages/Solution_ProgrammeDelete.page
+++ b/force-app/main/default/pages/Solution_ProgrammeDelete.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Solution_Programme__c" extensions="Solution_ProgrammeDeleteController" action="{!init}" sidebar="true">
+<apex:page standardController="Solution_Programme__c" extensions="Solution_ProgrammeDeleteController" action="{!init}" sidebar="true" lightningStylesheets="true">
<apex:outputPanel layout="none" rendered="{!IF(is_Alert_Delete, false,true )}">
<apex:form >
<apex style="font-size: 18px;">Solution鏂规鍙湁鐘舵�佷负鑽夋涓椂鎵嶅彲鍒犻櫎</apex><br/>
diff --git a/force-app/main/default/pages/Solution_ProgrammeEdit.page b/force-app/main/default/pages/Solution_ProgrammeEdit.page
index bc7036f..c8ff595 100644
--- a/force-app/main/default/pages/Solution_ProgrammeEdit.page
+++ b/force-app/main/default/pages/Solution_ProgrammeEdit.page
@@ -1,3 +1,3 @@
-<apex:page standardController="Solution_Programme__c" extensions="CreateSolEditController" title="Solution_Programme__c" action="{!checkRecordTypeEDIT}">
+<apex:page standardController="Solution_Programme__c" extensions="CreateSolEditController" title="Solution_Programme__c" action="{!checkRecordTypeEDIT}" lightningStylesheets="true">
</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/SubAuthorizedCreate.page b/force-app/main/default/pages/SubAuthorizedCreate.page
index e0e1822..21c9564 100644
--- a/force-app/main/default/pages/SubAuthorizedCreate.page
+++ b/force-app/main/default/pages/SubAuthorizedCreate.page
@@ -1,5 +1,5 @@
<!-- 闇�瑕佹寜鐓ц浆鎺堟潈瀛楁鐨処D 鏀硅繖閲�-->
-<apex:page standardController="SubAuthorized__c" showHeader="false" sidebar="false">
+<apex:page standardController="SubAuthorized__c" showHeader="false" sidebar="false" lightningStylesheets="true">
<script type="text/javascript">
function init() {
var str = '/a3Q/e?&Name=*';
diff --git a/force-app/main/default/pages/taskManage.page b/force-app/main/default/pages/taskManage.page
index 7f42547..71696ac 100644
--- a/force-app/main/default/pages/taskManage.page
+++ b/force-app/main/default/pages/taskManage.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="false" sidebar="false" id="allPage" title="浠诲姟绠＄悊琛�">
+<apex:page showHeader="false" sidebar="false" id="allPage" title="浠诲姟绠＄悊琛�" lightningStylesheets="true">
<apex:includeLightning />
<div style="width:100%;height:100%;" id="TaskManageAppOutContainer" />
--
Gitblit v1.9.1