From e6a0a7f9ffb463c5ce78d6770b09eac739f88b15 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 24 五月 2023 16:57:53 +0800
Subject: [PATCH] 优化确认框以及修改页面

---
 force-app/main/default/lwc/lexOPDReportFlowLwc/lexOPDReportFlowLwc.js                 |   16 
 force-app/main/default/pages/Opportunity12Rating.page                                 |    2 
 force-app/main/default/classes/OpportunityLightingButtonController.cls                |   38 +
 force-app/main/default/pages/MaintenanceProductData.page                              |    2 
 force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js               |  494 +++++++++------
 force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.html                       |    8 
 force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.html           |    1 
 force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js                         |   70 +
 force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.html           |    3 
 force-app/main/default/lwc/lexOPDReportConsumFlowLwc/lexOPDReportConsumFlowLwc.js     |    2 
 force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js                               |   45 +
 force-app/main/default/classes/OpportunityWebService.cls                              |   90 ++
 force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js   |   75 +
 force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js             |   95 +-
 force-app/main/default/pages/AdvanceOpportunity.page                                  |    2 
 force-app/main/default/lwc/lexInputLookupCell/lexInputLookupCell.html                 |    8 
 force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.html                             |    1 
 force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.js                         |    2 
 force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js             |   65 +
 force-app/main/default/lwc/lexStockApply/lexStockApply.js                             |  119 ++-
 force-app/main/default/lwc/lexStockApply/lexStockApply.html                           |    1 
 force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html             |  336 +++++++--
 force-app/main/default/lwc/lexLoseBid/lexLoseBid.html                                 |    1 
 force-app/main/default/lwc/lexLoseBid/lexLoseBid.js                                   |   45 +
 force-app/main/default/classes/lexPCLLostReportLwcController.cls                      |  325 +++++++---
 force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.html |    1 
 force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.html                       |    1 
 27 files changed, 1,238 insertions(+), 610 deletions(-)

diff --git a/force-app/main/default/classes/OpportunityLightingButtonController.cls b/force-app/main/default/classes/OpportunityLightingButtonController.cls
index 55cccf5..e88cb1e 100644
--- a/force-app/main/default/classes/OpportunityLightingButtonController.cls
+++ b/force-app/main/default/classes/OpportunityLightingButtonController.cls
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-04-12 11:16:07
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 13:40:51
+ * @LastEditTime: 2023-05-24 16:34:15
  */
 public with sharing class OpportunityLightingButtonController {
     @AuraEnabled
@@ -680,6 +680,42 @@
             throw new AuraHandledException(e.getMessage());
         }
     }
+    @AuraEnabled
+    public static String changeTrade(String oppId){
+
+        List<Quote> quoList = [select id from Quote where OpportunityId = :oppId];
+        List<OpportunityLineItem> oppLI = [select id from OpportunityLineItem where Opportunity.id = :oppId];
+
+        Opportunity opp = new Opportunity();
+        opp.id = oppId;
+        opp.Estimation_Decision__c = false;
+        opp.Estimation_Id__c = null;
+        opp.Quote_Update_Sum__c = null;
+        opp.Estimation_No__c = null;
+        opp.Estimation_Proposal_Date__c = null;
+        opp.Estimation_Name__c = null;
+        // LHJ SWAG-C9QAAJ 鍘绘帀 Start
+        // opp.Authorized_Finish_Sales__c = null;
+        // opp.Authorized_DB_No__c = null;
+        // opp.Authorized_Date__c = null;
+        // opp.Autholization_Activated_Date__c = null;
+        // opp.Bidding_Content__c = null;
+        // opp.Bid_Date__c = null;
+        // opp.Bidding_No__c = null;
+        // opp.Bidding_Project_Name__c = null;
+        // LHJ End
+
+        Savepoint sp = Database.setSavepoint();
+        try {
+            delete quoList;
+            delete oppLI;
+            update opp;
+            return '1';     
+        } catch (Exception ex) {
+            Database.rollback(sp);
+            return  ex.getMessage() + ' | Line:' + ex.getLineNumber();
+        }
+    }
     public class InitData{
         @AuraEnabled
         public Boolean directLossFLG;
diff --git a/force-app/main/default/classes/OpportunityWebService.cls b/force-app/main/default/classes/OpportunityWebService.cls
index 31ce276..d5bd86b 100644
--- a/force-app/main/default/classes/OpportunityWebService.cls
+++ b/force-app/main/default/classes/OpportunityWebService.cls
@@ -1,6 +1,5 @@
 global class OpportunityWebService {
     
-    @AuraEnabled
     WebService static String changeTrade(String oppId){
 
         List<Quote> quoList = [select id from Quote where OpportunityId = :oppId];
@@ -43,7 +42,7 @@
     public OpportunityWebService() {
         this.parameter = 'value';
     }
-    @AuraEnabled
+
     WebService static String oppCheck(String oppid, String saveFlg) {
 
         Map<Id, String> proMap= new Map<Id, String>();
@@ -68,7 +67,7 @@
         }
         return strRet;
     }
-    @AuraEnabled
+
     // LHJ 闃胯タ璧涘妫�鏌� Start
     WebService  static String checkDangerItem(String agency1) {
         //娌℃湁鍗卞寲鍝佽瘉鐓х殑鎻愮ず淇℃伅
@@ -392,7 +391,6 @@
         }
 
     }
-    @AuraEnabled
     WebService static String updReg(String  oppid) {
 
         List<OpportunityLineItem> updList = new List<OpportunityLineItem>();
@@ -420,6 +418,7 @@
     //SWAG-CG88AG銆愬鎵樸�戞彁鍑轰环鏍肩敵璇锋槸鍦ㄥ崗璁湁鏁堟湡鍐咃紝鍏佽WIN fy end 
 
     //璐告槗鍚堣 20230307 you start
+    //钀ヤ笟鎷︽埅鎻愰啋
     WebService static Boolean accSendEmail(String  AccDealerBlacklist,String accname,String angency1,String angency2,String ownerids,String ddid,String oppid) {
       //鍙戦�侀偖浠�
         List<Messaging.SingleEmailMessage> sendMails = new List<Messaging.SingleEmailMessage>();
@@ -437,7 +436,6 @@
         for (User u : UsrList){
             MailsList.add(u.email);
         }
-        MailsList.add('youchang@prec-tech.com');
         system.debug('111===:'+MailsList);
         if (MailsList!=null&&MailsList.size()>0){
             String title = '';
@@ -459,7 +457,7 @@
             }else if(AccDealerBlacklist=='1'){
                 body += '榛戝悕鍗曠殑瀹㈡埛涓猴細' + accname+ '<br/>';
             }else if(AccDealerBlacklist=='2'){
-                body += '榛戝悕鍗曠殑缁忛攢鍟�1涓猴細' + angency2+ '<br/>';
+                body += '榛戝悕鍗曠殑缁忛攢鍟�1涓猴細' + angency1+ '<br/>';
             }else if(AccDealerBlacklist=='3'){
                 body += '榛戝悕鍗曠殑缁忛攢鍟�2涓猴細' + angency2+ '<br/>';
             }
@@ -501,6 +499,86 @@
         }
         return rs;
     }
+    //鏈嶅姟鎷︽埅鎻愰啋 
+    //銆愭柊寤鸿浠枫�戞鏌ョ偣浠呴�氱煡鍚堝悓缁� sendalert=Main_Con 
+    //銆愭姤浠稤ecide銆戞鏌ョ偣閭欢閫氱煡浜哄憳锛氬悎鍚岀粍銆丗SE棰嗗銆佹湇鍔″姪鐞�(鏍囩) sendalert=decide_con
+    WebService static Boolean accSendEmailFW(String  AccDealerBlacklist,String accname,String angency,String mcid,String sendalert,String[] FSEStr) {
+      //鍙戦�侀偖浠�
+        List<Messaging.SingleEmailMessage> sendMails = new List<Messaging.SingleEmailMessage>();
+        List<String>  MailsList = new List<String>();
+        List<String> userIdList = new List<String>();
+        //鍚堝悓缁�
+        List<GroupMember> groupmemberList = [SELECT GroupId,Id,UserOrGroupId FROM GroupMember where Group.DeveloperName = 'TradeComplianceGroup'];
+        Set<String> GroupMap = new Set<String>();
+        List<GroupMember> gmInsertList = new List<GroupMember>();
+        if(groupmemberList != null && groupmemberList.size()>0){
+            for (GroupMember gm : groupmemberList) {
+               GroupMap.add(gm.UserOrGroupId);
+            }
+        }
+        
+         //璇环鎵�鏈変汉锛屼骇鍝佹媴褰擄紝鍙戦偖浠�
+        List<User> UsrList = [SELECT email FROM user WHERE id in :GroupMap or id in :FSEStr]; 
+        //鑾峰彇鍚勪釜鐢ㄦ埛鐨別mail
+        for (User u : UsrList){
+            MailsList.add(u.email);
+        }
+        ////decide 杩涙潵鏈嶅姟鍔╃悊 6涓汉 
+        //if(sendalert=='decide_con'){
+        //    String toEmailAddress = System.Label.TradeComplianceStatusSendEmailFW;  
+        //    String[] toAddresses = toEmailAddress.split(',');
+        //    for(String toa:toAddresses){
+        //       MailsList.add(toa); 
+        //    }
+        //}
+
+        //MailsList.add('youchang@prec-tech.com');
+
+        system.debug('111===:'+MailsList);
+        if (MailsList!=null&&MailsList.size()>0){
+            String title = '';
+            String body = '';
+            title = '鍖婚櫌/缁忛攢鍟嗘秹鍙婇粦鍚嶅崟';
+            String accname1 = accname==null ? '' :accname;
+            String angency1 = angency==null ? '' :angency;
+            if(AccDealerBlacklist=='1' || AccDealerBlacklist=='intercept'){
+                body += '榛戝悕鍗曠殑瀹㈡埛涓猴細' + accname1 + '<br/>';
+                body += '榛戝悕鍗曠殑缁忛攢鍟嗕负锛�' + angency1 + '<br/>';
+            }
+           
+            body += '<a href="' + System.Label.Environment_Url + mcid + '">'
+                    + System.Label.Environment_Url+ mcid +'</a><br/>'; 
+            body += '璋㈣阿锛�';
+  
+            Messaging.SingleEmailMessage messageNEW = new Messaging.SingleEmailMessage();
+            messageNEW.setSubject(title);
+            messageNEW.setHtmlBody(body);
+            messageNEW.setCharset('UTF-8');
+            messageNEW.setToAddresses(MailsList); 
+            
+            sendMails.add(messageNEW);
+
+        }                      
+            
+        boolean rs = true;
+        if (sendMails.size() > 0) {
+            Messaging.Email[] allMails = new Messaging.Email[]{};
+            for(Integer j = 0; j < sendMails.size(); j++) {
+                allMails.add(sendMails.get(j));
+            }
+            system.debug('222===:'+allMails);
+        
+            Messaging.SendEmailResult[] results = Messaging.sendEmail(allMails);
+            System.debug('results 缁撴灉 :'+results);
+            for (Integer i = 0; i < results.size(); i++) {
+                if (results[i].success == false) {
+                    system.debug('=====send mail error:' + results[i].errors[0].message);
+                    rs = false;
+                }   
+            }
+        }
+        return rs;
+    }
     //璐告槗鍚堣 20230307 you end
 
 }
\ 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 7f4160e..1c42b9f 100644
--- a/force-app/main/default/classes/lexPCLLostReportLwcController.cls
+++ b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
@@ -1,46 +1,144 @@
 public with sharing class lexPCLLostReportLwcController {
-	@AuraEnabled
+
 	public static Product2 pro2 { get; set; }
-	@AuraEnabled
+
 	public static string oppId { get; set; }
-	@AuraEnabled
+
 	public static string lostReportId { get; set; }
 	// 褰撳墠椤甸潰鐘舵�� Create,View and Edit, MarketEdit
-	@AuraEnabled
+
 	public static string pageStatus { get; set; }
 	// 澶卞崟锛岄儴鍒嗗け鍗�
-	@AuraEnabled
+
 	public static string lostType {get; set;}
 	public  static Set<ID> deleteBrandIDSet = new Set<ID>();
-	@AuraEnabled
+
 	public static string submitFlag {get; set;}
-	@AuraEnabled
+
 	public static LostReport LostReport {get; set;}
-	@AuraEnabled
+
 	public static integer brandNo {get; set;}
-	@AuraEnabled
+
 	public static integer RemoveBrandNo {get; set;}
-	@AuraEnabled
+
 	public static integer setBrandNo {get; set;}
-	@AuraEnabled
+
 	public static integer brandCount {get; set;}
 	// add tcm 20211122 start
-	@AuraEnabled
+
 	public static integer topNum {get; set;}
-	@AuraEnabled
+
 	public static integer secondNum {get; set;}
 	// add tcm 20211122 end
-	// 鍒濆鍖�
+
 	@AuraEnabled
-	public static void initForApex(string oppId1,string lostReportId1,string pageStatus1,string lostType1,string submitFlag1){
-		oppId = oppId1;
-		lostReportId = lostReportId;
-		pageStatus = pageStatus1;
-		lostType = lostType1;
-		submitFlag = submitFlag1;
+	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 Map<string,object> init(){
+    public static String getPickList(String objectName, String fieldName) {
+		List<Map<String, String>> lstPickvals = new List<Map<String, String>>();
+        List<Schema.DescribeSobjectResult> results = Schema.describeSObjects(new List<String>{objectName});
+        
+        for(Schema.DescribeSobjectResult res : results) {
+            for (Schema.PicklistEntry entry : res.fields.getMap().get(fieldName).getDescribe().getPicklistValues()) {
+                if (entry.isActive()) {
+                    lstPickvals.add(new Map<String, String>{'label' => entry.getValue(), 'value' => entry.getValue()});
+                }
+            }
+        }
+		Map<string,List<Map<String, String>>> pickList =  new Map<string,List<Map<String, String>>>();
+		List<Map<String, String>> zhuji = new List<Map<String, String>>();
+		List<Map<String, String>> jingzi = new List<Map<String, String>>();
+		List<Map<String, String>> xiaojingzhong = new List<Map<String, String>>();
+		List<Map<String, String>> nengliang = new List<Map<String, String>>();
+		List<Map<String, String>> qita = new List<Map<String, String>>();
+		Map<String, String> empty = new Map<String, String>{'label' => '--鏃�--', 'value' => ''};
+		zhuji.add(empty);
+		jingzi.add(empty);
+		xiaojingzhong.add(empty);
+		nengliang.add(empty);
+		qita.add(empty);
+		for (Integer i = 0; i < lstPickvals.size(); i++) {
+			if ((i >= 0 && i <= 6) || i == 36) {
+				zhuji.add(lstPickvals[i]);
+			}
+			if ((i >= 7 && i <= 23) || i == 36) {
+				jingzi.add(lstPickvals[i]);
+			}
+			if ((i >= 24 && i <= 29) || i == 35) {
+				xiaojingzhong.add(lstPickvals[i]);
+			}
+			if ((i >= 30 && i <= 34) || i == 36) {
+				nengliang.add(lstPickvals[i]);
+			}
+			if (i == 36) {
+				qita.add(lstPickvals[i]);
+			}
+		}
+		pickList.put('涓绘満', zhuji);
+		pickList.put('闀滃瓙', jingzi);
+		pickList.put('灏忛暅绉�', xiaojingzhong);
+		pickList.put('鑳介噺', nengliang);
+		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 {
+			oppId = oppId1;
+			lostReportId = lostReportId1;
+			pageStatus = pageStatus1;
+			lostType = lostType1;
+			submitFlag = submitFlag1;
+			return init1();
+		} catch (Exception e) {
+			throw new AuraHandledException(e.getMessage());
+		}
+	}
+	// 鍒濆鍖�
+	public static Map<string,object> init1(){
 		Map<string,object> maps = new Map<string,object>();
 		if(string.isblank(pageStatus)) {
 			// 杩欓噷闇�瑕佹姤閿欐病鏈変紶鍙傛暟
@@ -95,6 +193,7 @@
 			 Lost_Reason_Sub__c,Lost_By_Company__c,
 			 LostTotalAmount__c,LostType__c,
 			 Report_Status__c,Sales_assistant__c,
+			 InclusionUltrasound__c, //20230506 lt DB202304618804  鍖呭惈瓒呭0
 			 Opportunity__c, Opportunity__r.Sales_assistant_ID__c,
 			 Opportunity__r.Sales_manager_departmentID__c,
 			 Manager_sales__c,recordtypeid,recordtype.DeveloperName
@@ -183,8 +282,13 @@
 			return maps;
 
 		}
-		return null;
+		// List<Map<String,String>> col = new List<Map<String,String>>();
+		// Map<String,String> ele = new Map<String,String>();
+		// LostReport.LostBrands[0].columns.add();
+		maps.put('LostReport', LostReport);
+		return maps;
 	}
+	//鍐欏埌js
 	// 缂栬緫 鍙湁绯荤粺绠$悊鍛樻垨鑰呰崏妗堜腑鍙互缂栬緫
 	@AuraEnabled
 	public static String edit2(){
@@ -192,7 +296,7 @@
 		    '鑽夋'.equals(LostReport.LostReport.Report_Status__c)
 		    ) {
 			pageStatus = 'Edit';
-			init();
+			init1();
 		}
 		else{
 			return '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘杩涜缂栬緫锛�';
@@ -248,20 +352,20 @@
 		}
 	}
 	// 淇濆瓨
-	@AuraEnabled
-	public static String save(){
-
-		if(!DataCheck()) {
-			return null;
-		}
-		if(!dataEntry()) {
-			return null;
-		}
-
-		brandCount = LostReport.LostBrands.size();
-		pageStatus = 'View';
-		return '淇濆瓨鎴愬姛锛�';
-	}
+	// @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>();
@@ -274,7 +378,8 @@
 	// }
 	// 鏁版嵁妫�鏌�
 	@AuraEnabled
-	public static boolean DataCheck(){
+	public static boolean DataCheck(LostReport report){
+		LostReport = report;
 		boolean dataCheck = true;
 		if(string.isBlank(LostReport.LostReport.LostType__c))
 		{
@@ -349,6 +454,7 @@
 			}
 			// 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
 		}
+		
 
 		return dataCheck;
 	}
@@ -375,10 +481,9 @@
 		String jsonStr = JSON.serialize(lstPickvals);
         return jsonStr;
 	}
-	@AuraEnabled
-	public static list<LostBrand> brandcopy(){
+	public static list<LostBrand> brandcopy(LostReport report){
 		list<LostBrand> tempbrands = new list<LostBrand>();
-		for(LostBrand tempbrand: LostReport.LostBrands) {
+		for(LostBrand tempbrand: report.LostBrands) {
 			LostBrand LostBrand =
 				new LostBrand(tempbrand.lineNo,tempbrand.LostProducts );
 			LostBrand.lostBrand = tempbrand.lostBrand.clone();
@@ -389,46 +494,47 @@
 	}
 	// 鏁版嵁褰曞叆
 	@AuraEnabled
-	public static boolean dataEntry(){
+	public static Map<String,String> dataEntry(String report1){
+		LostReport report = (LostReport)JSON.deserialize(report1, LostReport.class);
+		Map<String,String> messageMap = new Map <String,String>();
 		system.debug('save---start:');
 		Savepoint sp = Database.setSavepoint();
-		Lost_cancel_report__c templostReport = LostReport.lostReport.clone();
-		templostReport.id = LostReport.lostReport.id;
-		list<LostBrand> tempBrands = brandcopy();
 		try{
 			// 寰呭畬鎴愶紝杩欓噷闇�瑕佹妸绗竴涓搧鐗岀殑淇℃伅璧嬪�煎埌杩欎釜澶卞崟鎶ュ憡涓婂幓锛岃繕鏈夐渶瑕佹妸鍚勪釜鍝佺墝閲戦姹囨�诲姞璧锋潵锛�
 			//system.debug('LostReport.LostBrands:'+LostReport.LostBrands);
 			// 璁剧疆璁板綍绫诲瀷
-			LostReport.lostReport.recordTypeID  =  LostReport.lostReport.LostType__c== '澶卞崟'?Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_Lost_report').getRecordTypeId() : Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_PartLost_report').getRecordTypeId();
-			LostReport.lostReport.LostTotalAmount__c    = 0;
-			LostReport.lostReport.of_lost_system_processor__c   = 0;
-			LostReport.lostReport.Lost_reason_main__c = null;
-			LostReport.lostReport.Lost_Reason_Sub__c  = null;
-			LostReport.lostReport.Lost_By_Company__c = null;
-			for(LostBrand tempLostBrand : LostReport.LostBrands) {
+			report.lostReport.recordTypeID  =  report.lostReport.LostType__c== '澶卞崟'?Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_Lost_report').getRecordTypeId() : Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_PartLost_report').getRecordTypeId();
+			report.lostReport.LostTotalAmount__c    = 0;
+			report.lostReport.of_lost_system_processor__c   = 0;
+			report.lostReport.Lost_reason_main__c = null;
+			report.lostReport.Lost_Reason_Sub__c  = null;
+			report.lostReport.Lost_By_Company__c = null;
+			for(LostBrand tempLostBrand : report.LostBrands) {
 				if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
-					LostReport.lostReport.LostTotalAmount__c += tempLostBrand.lostBrand.LostPrice__c;
-					LostReport.lostReport.Lost_reason_main__c =
-						LostReport.lostReport.Lost_reason_main__c == null
+					report.lostReport.LostTotalAmount__c += tempLostBrand.lostBrand.LostPrice__c;
+					report.lostReport.Lost_reason_main__c =
+					report.lostReport.Lost_reason_main__c == null
 						? tempLostBrand.lostBrand.Lost_reason_main__c
-						: LostReport.lostReport.Lost_reason_main__c;
-					LostReport.lostReport.Lost_Reason_Sub__c  =
-						LostReport.lostReport.Lost_Reason_Sub__c == null
+						: report.lostReport.Lost_reason_main__c;
+						report.lostReport.Lost_Reason_Sub__c  =
+						report.lostReport.Lost_Reason_Sub__c == null
 						? tempLostBrand.lostBrand.Lost_Reason_Sub__c
-						: LostReport.lostReport.Lost_Reason_Sub__c;
-					LostReport.lostReport.Lost_By_Company__c =
-						LostReport.lostReport.Lost_By_Company__c == null
+						: report.lostReport.Lost_Reason_Sub__c;
+						report.lostReport.Lost_By_Company__c =
+						report.lostReport.Lost_By_Company__c == null
 						? tempLostBrand.lostBrand.Lost_By_Company__c
-						: LostReport.lostReport.Lost_By_Company__c;
+						: report.lostReport.Lost_By_Company__c;
 
 					for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
 						if(tempLostProduct.LostProductss.Quantity__c !=null && tempLostProduct.LostProductss.Quantity__c >0) {
-							LostReport.lostReport.of_lost_system_processor__c   += tempLostProduct.LostProductss.Quantity__c;
+							report.lostReport.of_lost_system_processor__c   += tempLostProduct.LostProductss.Quantity__c;
 						}
 					}
 				}
 			}
-			upsert LostReport.lostReport;
+			upsert report.lostReport;
+			String reportId = report.lostReport.Id;
+			messageMap.put('reportId', reportId);
 			// 闇�瑕佹彃鍏ユ洿鏂扮殑澶卞崟鍝佺墝
 			map<integer,PCLLostBrand__c> upsertLostBrandMap = new map<integer,PCLLostBrand__c>();
 			// 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
@@ -437,12 +543,12 @@
 			map<string,PCLLostProduct__c> upsertLostProductMap = new map<string,PCLLostProduct__c>();
 			// 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
 			list<PCLLostProduct__c> deleteLostProductList = new list<PCLLostProduct__c>();
-			for(LostBrand tempLostBrand : LostReport.LostBrands ) {
+			for(LostBrand tempLostBrand : report.LostBrands ) {
 				// 濡傛灉鏈夊け鍗曞搧鐗岋紝閭d箞灏辫鎻掑叆鏇存柊锛�
 				system.debug('tempLostBrand.lostBrand.Lost_By_Company__c:'+tempLostBrand.lostBrand.Lost_By_Company__c);
 				if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
 					upsertLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
-					tempLostBrand.lostBrand.Lost_cancel_report__c = LostReport.lostReport.id;
+					tempLostBrand.lostBrand.Lost_cancel_report__c = report.lostReport.id;
 					tempLostBrand.lostBrand.Name = tempLostBrand.lostBrand.Lost_By_Company__c;
 					integer tempNo = 0;
 					for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
@@ -492,11 +598,11 @@
 
 			}
 
-			for(integer brandNumber =0; brandNumber< LostReport.LostBrands.size(); brandNumber++) {
+			for(integer brandNumber =0; brandNumber< report.LostBrands.size(); brandNumber++) {
 
-				LostBrand tempLostBrand = LostReport.LostBrands.get(brandNumber);
+				LostBrand tempLostBrand = report.LostBrands.get(brandNumber);
 				if(tempLostBrand.lostBrand.Id == null) {
-					LostReport.LostBrands.remove(brandNumber);
+					report.LostBrands.remove(brandNumber);
 					brandNumber--;
 					continue;
 				}
@@ -509,38 +615,38 @@
 					}
 				}
 			}
-			lostReportId = LostReport.lostReport.id;
+			// lostReportId = report.lostReport.id;
 			system.debug('save---end:');
 		}catch (Exception ex) {
 			Database.rollback(sp);
-			LostReport.lostReport = templostReport;
-			LostReport.LostBrands = tempBrands;
 			// 杩欓噷闇�瑕佸啓涓�浜涙姤閿欎俊鎭�
-			ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,ex.getMessage()));
-			return false;
+			messageMap.put('error', ex.getMessage());
+			return messageMap;
 		}
-		return true;
+		return messageMap;
 	}
 
 	
 	// 鎻愪氦
 	@AuraEnabled
-	public static Map<string,Object> submit(){
+	public static Map<string,Object> submit(String report1,String reportId){
+		LostReport report = (LostReport)JSON.deserialize(report1, LostReport.class);
 		Map<string,string> messages = new Map<string,string>();
-		if(!'鑽夋'.equals(LostReport.LostReport.Report_Status__c) ) {
+		if(!'鑽夋'.equals(report.lostReport.Report_Status__c) ) {
 			messages.put('error', '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘鎻愪氦鐢宠锛�');
 			return messages;
 		}
 		Map<string,Object> objs = new Map<string,Object>();
 		Savepoint sp = Database.setSavepoint();
 		try{
-			LostReport.lostReport.Report_Status__c = '鎻愪氦';
-			update LostReport.lostReport;
+			report.lostReport.Id = reportId;
+			report.lostReport.Report_Status__c = '鎻愪氦';
+			update report.lostReport;
 			Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
-			psr.setObjectId(lostReportId);
+			psr.setObjectId(reportId);
 			Approval.ProcessResult submitResult = Approval.process(psr);
 			objs.put('uri', '/apex/PCLLostReportPage');
-			objs.put('Id', lostReportId);
+			objs.put('Id', reportId);
 			objs.put('pageStatus', 'View');
 			objs.put('submitFlag', '1');
 			return objs;
@@ -550,13 +656,19 @@
 			return messages;
 		}
 	}
-	// 娣诲姞鍝佺墝
+	// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 	@AuraEnabled
-	public static String addBrand(){
-		LostReport.LostBrands.add(new LostBrand(LostReport.LostBrands.size()));
-		brandCount = LostReport.LostBrands.size();
-		return null;
+	public static LostBrand getNewLostBrand(Integer lineNo){
+		LostBrand lostBrand = null;
+		try {
+			//report.LostBrands.add(new LostBrand(report.LostBrands.size()));
+			lostBrand = new LostBrand(lineNo);
+		} catch (Exception e) {
+			System.debug(e.getMessage());
+		}
+		return lostBrand;
 	}
+
 	// 鍒犻櫎鍝佺墝 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄垹闄ら偅涓搧鐗�
 	@AuraEnabled
 	public static String Remove(){
@@ -593,6 +705,15 @@
 		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 {
@@ -616,13 +737,13 @@
 
 	public class LostBrand {
 		@AuraEnabled
-		public PCLLostBrand__c lostBrand { get; set; }
+		public PCLLostBrand__c lostBrand;
 		@AuraEnabled
-		public Integer lineNo { get; set; }
+		public Integer lineNo;
 		@AuraEnabled
-		public list<PCLLostProducts> LostProducts { get; set; }
+		public list<PCLLostProducts> LostProducts;
 		@AuraEnabled
-		public Integer ProductSize {get; set;}
+		public Integer ProductSize;
 		public LostBrand( integer lineNo ){
 			lostBrand = new PCLLostBrand__c();
 			this.lineNo = lineNo;
@@ -646,12 +767,13 @@
 	// add tcm 20211119 start
 	public class PCLLostProducts {
 		@AuraEnabled
-		public Integer lineNo2 { get; set; }
+		public Integer lineNo2;
 		@AuraEnabled
-		public PCLLostProduct__c LostProductss { get; set; }
+		public PCLLostProduct__c LostProductss;
 		@AuraEnabled
-		public Boolean bool { get; set; }
-
+		public Boolean bool;
+		@AuraEnabled
+		public List<Map<String, String>> productOptions = new List<Map<String, String>>();
 		public PCLLostProducts() {
 			this.lineNo2 = 0;
 			this.LostProductss=new PCLLostProduct__c();
@@ -694,4 +816,19 @@
 		}
 	}
 	// add tcm 20211118 end
+
+	@AuraEnabled
+	public static List<Product2> searchProduct(){
+		try {
+			List<Product2> products = [
+				select
+				Id,name
+				from Product2 
+				where Brand_Name__c = 'STORZ' limit 10
+			];
+			return products;
+		} catch (Exception e) {
+			throw new AuraHandledException(e.getMessage());
+		}
+	}
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.html b/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.html
index 234e137..3fc892f 100644
--- a/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.html
+++ b/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.html
@@ -4,11 +4,12 @@
  * @Author: chen jing wu
  * @Date: 2023-04-13 15:55:45
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-13 15:56:58
+ * @LastEditTime: 2023-05-24 16:39:05
 -->
 <template>
     <div class="lexBeforeOPDPDFBtnSISHolder" if:true={IsLoading}>
         <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
         <lightning-button label="Show Toast" onclick={showSuccess}></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/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js b/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js
index db99c83..ca1d53d 100644
--- a/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js
+++ b/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-04-13 15:55:45
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-13 16:04:14
+ * @LastEditTime: 2023-05-24 16:37:05
  */
 import { api, wire,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -13,7 +13,7 @@
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import selectCommonSequence from '@salesforce/apex/ControllerUtil.selectCommonSequence';
 import addReportOPWithEvaluationPDF from '@salesforce/apex/Add_Report.addReportOPWithEvaluationPDF';
-
+import LightningConfirm from 'lightning/confirm';
 export default class LexBeforeOPDPDFBtnSIS extends LightningElement {
     @api recordId;
     accountId;
@@ -34,6 +34,55 @@
           }
         }
     }
+    async handleConfirmClick(msg) {
+        const result = await LightningConfirm.open({
+            message: msg,
+            variant: 'headerless',
+            label: 'this is the aria-label value',
+        });
+        console.log(result);
+        if(result){
+            try {
+                selectCommonSequence({
+                    valueField: 'EvaluationPDF_NextValue__c',
+                    formatField: 'EvaluationPDF_Format__c'
+                }).then(result=>{
+                    var pdfno = result;
+                    addReportOPWithEvaluationPDF({
+                        "repOwnerId": this.userId,
+                        "reportId": "",
+                        "dailyReportId": "",
+                        "eventId": "",
+                        "recordType": "SIS",
+                        "aId": this.accountId,
+                        "visitor1": "",
+                        "visitor2": "",
+                        "visitor3": "",
+                        "visitor4": "",
+                        "visitor5": "",
+                        "opp1": this.recordId,
+                        "opp2": "",
+                        "opp3": "",
+                        "opp4": "",
+                        "opp5": "",
+                        "reportDate": "",
+                        "evaluationPDFNumber": pdfno
+                    }).then(()=>{
+                        // 20220913 ljh WLIG-CHMATN update end
+                        this.IsLoading = false;
+                        window.open('/apex/BeforeOPDPDF?oid=' + this.recordId + '&pdfNo=' + pdfno, 'BeforeOPDPDF');
+                        this.dispatchEvent(new CloseActionScreenEvent());
+                    })
+                });
+                } catch(e) {
+                    this.showToast(e,"error");
+                    this.dispatchEvent(new CloseActionScreenEvent());
+                }
+        }else{
+            window.open('/apex/BeforeOPDPDF?oid=' + this.recordId, 'BeforeOPDPDF');
+            this.dispatchEvent(new CloseActionScreenEvent());
+        }
+    }
     connectedCallback(){
         init({
             recordId: this.recordId
@@ -44,47 +93,7 @@
         })
     }
     beforeOPDPDFBtn(){
-        if (window.confirm('鏄惁鏂板缓SIS鎶ュ憡涔︼紵')) {
-            try {
-            selectCommonSequence({
-                valueField: 'EvaluationPDF_NextValue__c',
-                formatField: 'EvaluationPDF_Format__c'
-            }).then(result=>{
-                var pdfno = result;
-                addReportOPWithEvaluationPDF({
-                    "repOwnerId": this.userId,
-                    "reportId": "",
-                    "dailyReportId": "",
-                    "eventId": "",
-                    "recordType": "SIS",
-                    "aId": this.accountId,
-                    "visitor1": "",
-                    "visitor2": "",
-                    "visitor3": "",
-                    "visitor4": "",
-                    "visitor5": "",
-                    "opp1": this.recordId,
-                    "opp2": "",
-                    "opp3": "",
-                    "opp4": "",
-                    "opp5": "",
-                    "reportDate": "",
-                    "evaluationPDFNumber": pdfno
-                }).then(()=>{
-                    // 20220913 ljh WLIG-CHMATN update end
-                    this.IsLoading = false;
-                    window.open('/apex/BeforeOPDPDF?oid=' + this.recordId + '&pdfNo=' + pdfno, 'BeforeOPDPDF');
-                    this.dispatchEvent(new CloseActionScreenEvent());
-                })
-            });
-            } catch(e) {
-                this.showToast(e,"error");
-                this.dispatchEvent(new CloseActionScreenEvent());
-            }
-        } else {
-            window.open('/apex/BeforeOPDPDF?oid=' + this.recordId, 'BeforeOPDPDF');
-            this.dispatchEvent(new CloseActionScreenEvent());
-        }
+        this.handleConfirmClick('鏄惁鏂板缓SIS鎶ュ憡涔︼紵');
     }
     showToast(msg,type) {
         const event = new ShowToastEvent({
diff --git a/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.html b/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.html
index e5250f7..008287e 100644
--- a/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.html
+++ b/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.html
@@ -2,5 +2,6 @@
     <div class="lexChangeContractTypeHolder" 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/lexChangeContractType/lexChangeContractType.js b/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js
index 07b19ca..6968bd3 100644
--- a/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js
+++ b/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js
@@ -4,7 +4,15 @@
  * @Author: chen jing wu
  * @Date: 2023-05-15 13:17:26
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 15:01:19
+ * @LastEditTime: 2023-05-24 16:44:21
+ */
+/*
+ * @Description: 
+ * @version: 
+ * @Author: chen jing wu
+ * @Date: 2023-05-15 13:17:26
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-05-24 16:34:40
  */
 import { api, wire,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -12,8 +20,8 @@
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import { updateRecord } from 'lightning/uiRecordApi';
 import init from '@salesforce/apex/OpportunityLightingButtonController.initForChangeContractTypeButton';
-import changeTrade from '@salesforce/apex/OpportunityWebService.changeTrade';
-
+import changeTrade from '@salesforce/apex/OpportunityLightingButtonController.changeTrade';
+import LightningConfirm from 'lightning/confirm';
 export default class LexChangeContractType extends LightningElement {
     @api recordId;
     stageName;
@@ -34,6 +42,37 @@
             console.log(str);
             this.recordId = str;
           }
+        }
+    }
+    async handleConfirmClick(msg) {
+        const result = await LightningConfirm.open({
+            message: msg,
+            variant: 'headerless',
+            label: 'this is the aria-label value',
+        });
+        console.log(result);
+        if(result){
+            try {
+                changeTrade({
+                    oppId: oppId
+                }).then(result=>{
+                    str = result;
+                    if(str != '1'){
+                        this.showToast(str,"error");
+                    }
+                    this.IsLoading = false;
+                    this.dispatchEvent(new CloseActionScreenEvent());
+                    window.location.href = 'https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Opportunity/' + this.recordId + '/view';
+                }).catch(error=>{
+                    console.log("error");
+                    console.log(error);
+                });
+                } catch(e) {
+                   console.log(e); 
+                }
+        }else{
+            this.dispatchEvent(new CloseActionScreenEvent());
+            return;
         }
     }
     connectedCallback(){
@@ -78,25 +117,7 @@
             this.dispatchEvent(new CloseActionScreenEvent());
             return;
         }
-        if(confirm('鍙樻洿鍚堝悓绫诲瀷浼氬垹闄ゅ叏閮ㄦ姤浠凤紝鏄惁缁х画锛�')){
-            changeTrade({
-                oppId: oppId
-            }).then(result=>{
-                str = result;
-                if(str != '1'){
-                    this.showToast(str,"error");
-                }
-                this.IsLoading = false;
-                this.dispatchEvent(new CloseActionScreenEvent());
-                window.location.href = 'https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Opportunity/' + this.recordId + '/view';
-            }).catch(error=>{
-                console.log("error");
-                console.log(error);
-            });
-        }else{
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-        }
+        this.handleConfirmClick('鍙樻洿鍚堝悓绫诲瀷浼氬垹闄ゅ叏閮ㄦ姤浠凤紝鏄惁缁х画锛�');
     }
 
     showToast(msg,type) {
diff --git a/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.html b/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.html
index f0b0696..ec4062b 100644
--- a/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.html
+++ b/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.html
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-04-27 11:23:11
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-08 11:29:27
+ * @LastEditTime: 2023-05-19 10:12:18
 -->
 <template>
     <lightning-card>
@@ -23,9 +23,9 @@
                         <tr class="inputRows" key={row.uuid}>
                             <template for:each={columns} for:item="column">
                                 <td key={column.apiName}>
-                                  <c-lex-input-pick-list-cell class="fields" field-type={column.fieldType} record={row} field={column.apiName} object-name={column.objectName} value={column.value} read-only={column.readOnly} required={column.required}></c-lex-input-pick-list-cell>
-                                  <c-lex-input-table-cell class="fields" field-type={column.fieldType} record={row} field={column.apiName} required={column.required}></c-lex-input-table-cell>
-                                  <c-lex-input-lookup-cell class="fields" field-type={column.fieldType} field-name={column.apiName} record={row} api-name={column.objectName} disable={column.disable} required={column.required}></c-lex-input-lookup-cell>
+                                  <c-lex-input-pick-list-cell class="fields" field-type={column.fieldType} record={row} field={column.apiName} object-name={column.objectName} value={column.value} read-only={column.readOnly} required={column.required} query={column.query}></c-lex-input-pick-list-cell>
+                                  <c-lex-input-table-cell class="fields" field-type={column.fieldType} record={row} field={column.apiName} required={column.required} query={column.query} value={column.value}></c-lex-input-table-cell>
+                                  <c-lex-input-lookup-cell class="fields" field-type={column.fieldType} field-name={column.apiName} record={row} api-name={column.objectName} disable={column.disable} required={column.required} query={column.query} value={column.value}></c-lex-input-lookup-cell>
                                 </td>
                             </template>
                             <td>
diff --git a/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.js b/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.js
index 009485e..a436978 100644
--- a/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.js
+++ b/force-app/main/default/lwc/lexDynamicTable/lexDynamicTable.js
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-04-27 11:23:11
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 15:37:57
+ * @LastEditTime: 2023-05-18 13:41:30
  */
 import { LightningElement, track, api,wire } from 'lwc';
 export default class LexDynamicTable extends LightningElement {
diff --git a/force-app/main/default/lwc/lexInputLookupCell/lexInputLookupCell.html b/force-app/main/default/lwc/lexInputLookupCell/lexInputLookupCell.html
index 138a232..e7e600a 100644
--- a/force-app/main/default/lwc/lexInputLookupCell/lexInputLookupCell.html
+++ b/force-app/main/default/lwc/lexInputLookupCell/lexInputLookupCell.html
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-04-27 11:38:36
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-08 10:13:58
+ * @LastEditTime: 2023-05-18 16:37:50
 -->
 <template>
     <template if:true={isLookup}>
@@ -12,12 +12,6 @@
             object-api-name={apiName}
             record-id=''
         >
-            <!-- <template if:true={isDisable}>
-                <lightning-input-field field-name={fieldName} onclick={handleinputChange} variant="label-hidden" disabled="true"> </lightning-input-field>
-            </template>
-            <template if:false={isDisable}>
-                <lightning-input-field field-name={fieldName} onclick={handleinputChange} variant="label-hidden"> </lightning-input-field>
-            </template> -->
             <template if:true={isRequired}>
                 <lightning-input-field field-name={fieldName} onclick={handleinputChange} variant="label-hidden" disabled={isDisable} required> </lightning-input-field>
             </template>
diff --git a/force-app/main/default/lwc/lexLoseBid/lexLoseBid.html b/force-app/main/default/lwc/lexLoseBid/lexLoseBid.html
index 6c30e33..a19a34b 100644
--- a/force-app/main/default/lwc/lexLoseBid/lexLoseBid.html
+++ b/force-app/main/default/lwc/lexLoseBid/lexLoseBid.html
@@ -2,5 +2,6 @@
     <div class="lexLoseBidHolder" 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/lexLoseBid/lexLoseBid.js b/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js
index a42f54f..ae2da8e 100644
--- a/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js
+++ b/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-05-08 14:36:33
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-11 14:48:31
+ * @LastEditTime: 2023-05-24 16:24:28
  */
 import { api, wire,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -14,6 +14,7 @@
 import init  from '@salesforce/apex/OpportunityLightingButtonController.initForLoseBidButton';
 import updateForLoseBidButton  from '@salesforce/apex/OpportunityLightingButtonController.updateForLoseBidButton';
 import queryForLexLoseBidButton  from '@salesforce/apex/OpportunityLightingButtonController.queryForLoseBidButton';
+import LightningConfirm from 'lightning/confirm';
 export default class LexLoseBid extends LightningElement {
     @api recordId;
     ifOpenBid;
@@ -31,6 +32,34 @@
             console.log(str);
             this.recordId = str;
           }
+        }
+    }
+    async handleConfirmClick(msg) {
+        const result = await LightningConfirm.open({
+            message: msg,
+            variant: 'headerless',
+            label: 'this is the aria-label value',
+        });
+        console.log(result);
+        if(result){
+            try {
+                updateForLoseBidButton({
+                    recordId: this.recordId
+                }).then(result=>{
+                    if (result) {
+                        this.showToast(result,"error");
+                    }else{
+                        this.IsLoading = false;
+                        this.updateRecordView(this.recordId);
+                        this.showToast("鎿嶄綔鎴愬姛锛�","success");
+                        this.dispatchEvent(new CloseActionScreenEvent());
+                    }
+                })
+                } catch(e) {
+                   console.log(e); 
+                }
+        }else{
+            this.dispatchEvent(new CloseActionScreenEvent());
         }
     }
     connectedCallback(){
@@ -66,19 +95,7 @@
             if(flag){
                 this.showToast("鏉′欢涓嶇鍚堬紝涓嶅彲鎿嶄綔","error");
             }else{
-                if (window.confirm('鏄惁纭绔炰簤瀵规墜涓爣锛�')) {
-                    updateForLoseBidButton({
-                        recordId: this.recordId
-                    }).then(result=>{
-                        if (result) {
-                            this.showToast(result,"error");
-                        }else{
-                            this.IsLoading = false;
-                            this.updateRecordView(this.recordId);
-                            this.showToast("鎿嶄綔鎴愬姛锛�","success");
-                        }
-                    })  
-                }
+                this.handleConfirmClick('鏄惁纭绔炰簤瀵规墜涓爣锛�');
             }
         });    
     }
diff --git a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.html b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.html
index 38c9114..571dc13 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.html
+++ b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.html
@@ -2,5 +2,6 @@
     <div class="reportHolder" 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/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
index c54490f..06733d2 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
+++ b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-03-28 15:59:44
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 09:15:58
+ * @LastEditTime: 2023-05-24 16:12:08
  */
 import { api, wire,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -13,7 +13,7 @@
 import updateForOCSMNoToReportButton  from '@salesforce/apex/ReportController.updateForOCSMNoToReportButton';
 import { updateRecord } from 'lightning/uiRecordApi';
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
-import insertAwareDate from '@salesforce/apex/ReportController.updateForOCSMNoToReportButton';
+import LightningConfirm from 'lightning/confirm';
 export default class LexOCSMNoToReportForReport extends LightningElement {
     @api recordId;
     IsLoading = true;
@@ -34,6 +34,48 @@
             console.log(str);
             this.recordId = str;
           }
+        }
+    }
+
+    async handleConfirmClick(msg) {
+        const result = await LightningConfirm.open({
+            message: msg,
+            variant: 'headerless',
+            label: 'this is the aria-label value',
+        });
+        console.log(result);
+        if(result){
+            try {
+                if(this.theOCSMAdministrativeReportNumber != undefined || this.theOCSMAdministrativeReportDate != undefined ){
+                    this.showToast("宸茬粡鎶ュ憡鐨凲IS锛屼笉鍙互鐐瑰嚮OCSM涓嶈鎶ュ憡銆�","error");
+                    this.dispatchEvent(new CloseActionScreenEvent());
+                    return;
+                }
+                this.awareDate = Date.now();
+                if(this.awareDate != undefined ){
+                   updateForOCSMNoToReportButton({
+                        recordId: this.recordId
+                   }).then(result=>{
+                    if(result){
+                        this.showToast(result,"error");
+                    }else{
+                        this.showToast("OCSM涓嶈鎶ュ憡鎴愬姛","success");
+                        this.updateRecordView(this.recordId);
+                        this.IsLoading = false;
+                    }
+                        this.dispatchEvent(new CloseActionScreenEvent());
+                   });
+                }else{
+                    this.showToast("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�","error");
+                    this.dispatchEvent(new CloseActionScreenEvent());
+                    return;
+                }
+                } catch(e) {
+                    console.log(e);
+                }
+        }else{
+            this.dispatchEvent(new CloseActionScreenEvent());
+            return;
         }
     }
 
@@ -70,33 +112,6 @@
     }
 
     noToReport(){
-        if (!confirm("涓嶈鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�")) {
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-        }
-        if(this.theOCSMAdministrativeReportNumber != undefined || this.theOCSMAdministrativeReportDate != undefined ){
-            this.showToast("宸茬粡鎶ュ憡鐨凲IS锛屼笉鍙互鐐瑰嚮OCSM涓嶈鎶ュ憡銆�","error");
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-        }
-        this.awareDate = Date.now();
-        if(this.awareDate != undefined ){
-           updateForOCSMNoToReportButton({
-                recordId: this.recordId
-           }).then(result=>{
-            if(result){
-                this.showToast(result,"error");
-            }else{
-                this.showToast("OCSM涓嶈鎶ュ憡鎴愬姛","success");
-                this.updateRecordView(this.recordId);
-                this.IsLoading = false;
-            }
-                this.dispatchEvent(new CloseActionScreenEvent());
-           });
-        }else{
-            this.showToast("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�","error");
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-        }
+        this.handleConfirmClick("涓嶈鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�");
     }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.html b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.html
index aaa4cbd..62dbf20 100644
--- a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.html
+++ b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.html
@@ -2,5 +2,6 @@
     <div class="toReportHolder" 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/lexOCSMToReport/lexOCSMToReport.js b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
index 61b2ce7..28bf34f 100644
--- a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
+++ b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
@@ -2,9 +2,17 @@
  * @Description: 
  * @version: 
  * @Author: chen jing wu
+ * @Date: 2023-05-08 14:36:33
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-05-24 16:21:07
+ */
+/*
+ * @Description: 
+ * @version: 
+ * @Author: chen jing wu
  * @Date: 2023-04-07 09:02:03
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 09:17:27
+ * @LastEditTime: 2023-05-24 16:16:57
  */
 import { api, wire,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -13,6 +21,7 @@
 import updateForOCSMToReportButton  from '@salesforce/apex/ReportController.updateForOCSMToReportButton';
 import { updateRecord } from 'lightning/uiRecordApi';
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
 export default class LexOCSMToReport extends LightningElement {
     @api recordId;
     IsLoading = true;
@@ -33,6 +42,41 @@
             console.log(str);
             this.recordId = str;
           }
+        }
+    }
+    async handleConfirmClick(msg) {
+        const result = await LightningConfirm.open({
+            message: msg,
+            variant: 'headerless',
+            label: 'this is the aria-label value',
+        });
+        console.log(result);
+        if(result){
+            try {
+                if(this.theOCSMAdministrativeReportStatus == undefined && this.awareDate != undefined ){
+                    updateForOCSMToReportButton({
+                        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.showToast("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�","error");
+                    this.dispatchEvent(new CloseActionScreenEvent());
+                    return;
+                }
+                } catch(e) {
+                   console.log(e); 
+                }
+        }else{
+            this.dispatchEvent(new CloseActionScreenEvent());
+            return;
         }
     }
 
@@ -70,28 +114,6 @@
     }
 
     toReport () {
-        if (!confirm("鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�")) {
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-            }
-
-        if(this.theOCSMAdministrativeReportStatus == undefined && this.awareDate != undefined ){
-            updateForOCSMToReportButton({
-                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.showToast("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�","error");
-            this.dispatchEvent(new CloseActionScreenEvent());
-            return;
-        }
+        this.handleConfirmClick("鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�");
     }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.html b/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.html
index cdbdc27..a2425c6 100644
--- a/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.html
+++ b/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.html
@@ -2,5 +2,6 @@
     <div class="lexOLYwinBidHolder" 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/lexOLYwinBid/lexOLYwinBid.js b/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js
index 3aa9239..1b17446 100644
--- a/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js
+++ b/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-04-13 13:15:52
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-13 13:37:19
+ * @LastEditTime: 2023-05-24 16:28:23
  */
 import { api, wire,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -14,6 +14,7 @@
 import init  from '@salesforce/apex/OpportunityLightingButtonController.initForOLYwinBidButton';
 import updateForOLYwinBidButton  from '@salesforce/apex/OpportunityLightingButtonController.updateForOLYwinBidButton';
 import queryForOLYwinBidButton  from '@salesforce/apex/OpportunityLightingButtonController.queryForOLYwinBidButton';
+import LightningConfirm from 'lightning/confirm';
 export default class LexOLYwinBid extends LightningElement {
     @api recordId;
     ifOpenBid;
@@ -31,6 +32,34 @@
             console.log(str);
             this.recordId = str;
           }
+        }
+    }
+    async handleConfirmClick(msg) {
+        const result = await LightningConfirm.open({
+            message: msg,
+            variant: 'headerless',
+            label: 'this is the aria-label value',
+        });
+        console.log(result);
+        if(result){
+            try {
+                updateForOLYwinBidButton({
+                    recordId: this.recordId
+                }).then(result=>{
+                    if (result) {
+                        this.showToast(result,"error");
+                    }else{
+                        this.IsLoading = false;
+                        this.updateRecordView(this.recordId);
+                        this.showToast("鎿嶄綔鎴愬姛锛�","success");
+                    }
+                    this.dispatchEvent(new CloseActionScreenEvent());
+                });  
+                } catch(e) {
+                   console.log(e); 
+                }
+        }else{
+            this.dispatchEvent(new CloseActionScreenEvent()); 
         }
     }
     connectedCallback(){
@@ -66,19 +95,7 @@
             if(flag){
                 this.showToast("鏉′欢涓嶇鍚堬紝涓嶅彲鎿嶄綔","error");
             }else{
-                if (window.confirm('鏄惁纭OLY涓爣锛�')) {
-                    updateForOLYwinBidButton({
-                        recordId: this.recordId
-                    }).then(result=>{
-                        if (result) {
-                            this.showToast(result,"error");
-                        }else{
-                            this.IsLoading = false;
-                            this.updateRecordView(this.recordId);
-                            this.showToast("鎿嶄綔鎴愬姛锛�","success");
-                        }
-                    })  
-                }
+                this.handleConfirmClick('鏄惁纭OLY涓爣锛�');
             }
         });    
     }
diff --git a/force-app/main/default/lwc/lexOPDReportConsumFlowLwc/lexOPDReportConsumFlowLwc.js b/force-app/main/default/lwc/lexOPDReportConsumFlowLwc/lexOPDReportConsumFlowLwc.js
index 07117fe..67c4d55 100644
--- a/force-app/main/default/lwc/lexOPDReportConsumFlowLwc/lexOPDReportConsumFlowLwc.js
+++ b/force-app/main/default/lwc/lexOPDReportConsumFlowLwc/lexOPDReportConsumFlowLwc.js
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-05-16 13:37:44
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-16 15:18:25
+ * @LastEditTime: 2023-05-18 10:29:30
  */
 import { LightningElement,api, track, wire } from 'lwc';
 import {CurrentPageReference} from 'lightning/navigation';
diff --git a/force-app/main/default/lwc/lexOPDReportFlowLwc/lexOPDReportFlowLwc.js b/force-app/main/default/lwc/lexOPDReportFlowLwc/lexOPDReportFlowLwc.js
index 4ff21f4..d1eee95 100644
--- a/force-app/main/default/lwc/lexOPDReportFlowLwc/lexOPDReportFlowLwc.js
+++ b/force-app/main/default/lwc/lexOPDReportFlowLwc/lexOPDReportFlowLwc.js
@@ -1,3 +1,11 @@
+/*
+ * @Description: 
+ * @version: 
+ * @Author: chen jing wu
+ * @Date: 2023-05-16 16:45:16
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-05-18 09:45:28
+ */
 import { LightningElement,api, track, wire } from 'lwc';
 import {CurrentPageReference} from 'lightning/navigation';
 import { CloseActionScreenEvent } from 'lightning/actions';
@@ -92,12 +100,6 @@
     }
     closeAction() {
         //杩斿洖褰撳墠鐨勫鍝佺敵璇�
-        this[NavigationMixin.Navigate]({
-            type: 'standard__recordPage',
-            attributes: {
-                recordId: this.recordId,
-                actionName: 'view'
-            }
-        });
+        window.open("/"+this.recordId,'_self');
     }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
index 2b13db8..1795c48 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
@@ -4,102 +4,260 @@
  * @Author: chen jing wu
  * @Date: 2023-04-20 17:16:48
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-16 11:41:50
+ * @LastEditTime: 2023-05-24 15:52:37
 -->
 <template>
-    <lightning-card id="my-element" class="card"  variant="Narrow" data-id="my-card">
-        <div style="padding: 0 20px">
-            <lightning-layout>
-                <lightning-layout-item>
-                    <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;">澶卞崟鎶ュ憡缂栬緫椤甸潰</div>
-                </lightning-layout-item>
-                <div style="margin-left: 550px;">
-                    <lightning-layout-item  size="12">
-                        <lightning-button label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
-                        <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
-                        <lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
-                    </lightning-layout-item>
-                </div>
-            </lightning-layout>
-            <div style="margin-top: 5px">
-                <lightning-layout>
-                    <lightning-layout-item size="2" 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} 
-                                onchange={handleLostTypeChange} class="searchField" required>
-                            </lightning-combobox>
-                        </div>   
-                    </lightning-layout-item>
-                    <lightning-layout-item size="3" 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">
-                        <div style="padding: 10px 3px;font: 16px;">鐘舵��:{LostReport.lostReport.Report_Status__c}</div>
-                    </lightning-layout-item>
-                </lightning-layout>
-                    <lightning-accordion allow-multiple-sections-open class="myAccordion">
-                            <template for:each={LostReport.LostBrands} for:item="brand" for:index="i">
-                                <li key={brand.index}>
-                                    <lightning-accordion-section class="text-container" data-id={i} name="澶卞崟鍝佺墝" label="澶卞崟鍝佺墝">
-                                        <lightning-button name={i} label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
-                                        <lightning-button name={i} label="鍒犻櫎" onclick={deleteBrandJs} disabled={isBrandCount2}></lightning-button>
-                                        <lightning-layout>
-                                            <lightning-layout-item size="4" padding="around-small">
-                                                <c-multi-select-combobox name={i} onselect={setBrandMannualName} data-id="Lost_By_Company" class="mycombobox" options={brandOptions} selected-value={reasonValue} label="澶卞崟鍝佺墝: " required></c-multi-select-combobox>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item flexibility="auto" padding="around-small">
-                                                <lightning-combobox name={i} label="澶卞崟鍘熷洜锛堜富锛�:" value="" options={columns2} 
-                                                onchange={handleLostReasonMainChange} class="searchField" required></lightning-combobox>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item flexibility="auto" padding="around-small">
-                                                <lightning-combobox name={i} label="澶卞崟鍘熷洜锛堟锛�:" value="" options={columns2} 
-                                                onchange={handleLostReasonSubChange} class="searchField"></lightning-combobox>
-                                            </lightning-layout-item>
-                                        </lightning-layout>
-                                        <lightning-layout> 
-                                            <lightning-layout-item size="4" padding="horizontal-small">
-                                                <lightning-input name={i} data-id="Lost_By_Company_Mannual" value="" type="text" label="澶卞崟鍝佺墝锛堟墜鍔級: " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item size="4" padding="horizontal-small">
-                                                <lightning-input data-id="TotalAmount" name={i} value="" type="number" label="澶卞崟閲戦锛堝厓锛�: " class="searchField" onchange={handleLostPriceOutChange} required></lightning-input>
-                                            </lightning-layout-item>
-                                            <lightning-layout-item size="4" padding="horizontal-small">
-                                                <lightning-record-edit-form
-                                                    object-api-name='PCLLostBrand__c'
-                                                    record-id=''
-                                                >
-                                                    <lightning-input-field name={i} field-name='Agency__c' onchange={handleAgencyOutChange} required> </lightning-input-field>
-                                                </lightning-record-edit-form>
-                                            </lightning-layout-item>
-                                        </lightning-layout>
-                                        <lightning-layout>
-                                            <lightning-layout-item size="4" padding="horizontal-small">
-                                                <lightning-input name={i} value="" type="text" label="涓爣缁忛攢鍟嗭紙鎵嬪姩锛�:" class="searchField" onchange={handleAgencyMannualOutChange}></lightning-input>
-                                            </lightning-layout-item>
-                                        </lightning-layout>
-                                        <lightning-layout>
-                                            <lightning-layout-item flexibility="auto" padding="around-small">
-                                                <template if:true={isInit}>
-                                                    <c-lex-dynamic-table name={i} column-list={brand.columns} onchange={setProductClass}>
-                                                    </c-lex-dynamic-table>
-                                                </template>
-                                            </lightning-layout-item>
-                                        </lightning-layout>
-                                    </lightning-accordion-section>
-                                </li>
-                            </template>
-                    </lightning-accordion>
-                    <lightning-layout style="margin-top: 20px;">
-                        <div class="slds-align_absolute-center">
-                            <lightning-layout-item size="12">
+    <lightning-card data-id="test">
+        <template if:true={isEdit}>
+            <lightning-card id="my-element1" class="card"  variant="Narrow" data-id="my-card">
+                <div style="padding: 0 20px">
+                    <lightning-layout>
+                        <lightning-layout-item>
+                            <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;">澶卞崟鎶ュ憡缂栬緫椤甸潰</div>
+                        </lightning-layout-item>
+                        <div style="margin-left: 550px;">
+                            <lightning-layout-item  size="12">
                                 <lightning-button label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
                                 <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
                                 <lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
                             </lightning-layout-item>
                         </div>
                     </lightning-layout>
-            </div>
-        </div>   
+                    <div style="margin-top: 5px">
+                        <lightning-layout>
+                            <lightning-layout-item size="2" 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} 
+                                        onchange={handleLostTypeChange} class="searchField" required>
+                                    </lightning-combobox>
+                                </div>   
+                            </lightning-layout-item>
+                            <lightning-layout-item size="3" 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">
+                                <div style="padding: 10px 3px;font: 16px;">鍖呭惈瓒呭0:{LostReport.lostReport.InclusionUltrasound__c}</div>
+                            </lightning-layout-item>
+                            <lightning-layout-item size="3" padding="around-small">
+                                <div style="padding: 10px 3px;font: 16px;">鐘舵��:{LostReport.lostReport.Report_Status__c}</div>
+                            </lightning-layout-item>
+                        </lightning-layout>
+                            <lightning-accordion allow-multiple-sections-open class="myAccordion">
+                                    <template for:each={LostReport.LostBrands} for:item="brand" for:index="i">
+                                        <li key={brand.index}>
+                                            <lightning-accordion-section class="" data-id={i} name="澶卞崟鍝佺墝" label="澶卞崟鍝佺墝">
+                                                <lightning-button name={i} label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+                                                <lightning-button name={i} label="鍒犻櫎" onclick={deleteBrandJs} disabled={isBrandCount2}></lightning-button>
+                                                <lightning-layout>
+                                                    <lightning-layout-item size="4" padding="around-small">
+                                                        <c-multi-select-combobox name={i} onselect={setBrandMannualName} data-id="Lost_By_Company" class="mycombobox" options={brandOptions} selected-value={reasonValue} label="澶卞崟鍝佺墝: " required></c-multi-select-combobox>
+                                                    </lightning-layout-item>
+                                                    <lightning-layout-item flexibility="auto" padding="around-small">
+                                                        <lightning-combobox name={i} label="澶卞崟鍘熷洜锛堜富锛�:" value={brand.lostBrand.Lost_reason_main__c} options={columns2} 
+                                                        onchange={handleLostReasonMainChange} class="searchField" required></lightning-combobox>
+                                                    </lightning-layout-item>
+                                                    <lightning-layout-item flexibility="auto" padding="around-small">
+                                                        <lightning-combobox name={i} label="澶卞崟鍘熷洜锛堟锛�:" value={brand.lostBrand.Lost_Reason_Sub__c} options={columns2} 
+                                                        onchange={handleLostReasonSubChange} class="searchField"></lightning-combobox>
+                                                    </lightning-layout-item>
+                                                </lightning-layout>
+                                                <lightning-layout> 
+                                                    <lightning-layout-item size="4" padding="horizontal-small">
+                                                        <lightning-input name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝锛堟墜鍔級: " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
+                                                    </lightning-layout-item>
+                                                    <lightning-layout-item size="4" padding="horizontal-small">
+                                                        <lightning-input data-id="TotalAmount" name={i} value={brand.lostBrand.LostPrice__c} type="number" label="澶卞崟閲戦锛堝厓锛�: " class="searchField" onchange={handleLostPriceOutChange} required></lightning-input>
+                                                    </lightning-layout-item>
+                                                    <lightning-layout-item size="4" padding="horizontal-small">
+                                                        <lightning-record-edit-form
+                                                            object-api-name='PCLLostBrand__c'
+                                                            record-id=''
+                                                        >
+                                                            <lightning-input-field value={brand.lostBrand.Agency__c} name={i} field-name='Agency__c' onchange={handleAgencyOutChange} required> </lightning-input-field>
+                                                        </lightning-record-edit-form>
+                                                    </lightning-layout-item>
+                                                </lightning-layout>
+                                                <lightning-layout>
+                                                    <lightning-layout-item size="4" padding="horizontal-small">
+                                                        <lightning-input name={i} value={brand.lostBrand.AgencyMannual__c} type="text" label="涓爣缁忛攢鍟嗭紙鎵嬪姩锛�:" class="searchField" onchange={handleAgencyMannualOutChange}></lightning-input>                                                         
+                                                    </lightning-layout-item>
+                                                </lightning-layout>
+                                                <lightning-layout>
+                                                    <lightning-layout-item flexibility="auto" padding="around-small">
+                                                        <template if:true={isInit}>
+                                                            <div class="slds-card__body slds-card__body_inner">
+                                                                <table class="slds-table slds-table_bordered slds-table_cell-buffer slds-var-m-bottom_large"> 
+                                                                    <thead>
+                                                                        <tr class="slds-text-title_caps">
+                                                                                <th><div class="slds-truncate">澶卞崟鍝佺墝</div></th>
+                                                                                <th><div class="slds-truncate">澶卞崟瀵规墜鍨嬪彿</div></th>
+                                                                                <th><div class="slds-truncate"><span style="color:red;font-size: 18px;">*</span>澶卞崟鏁伴噺</div></th>
+                                                                                <th><div class="slds-truncate">澶卞崟瀵规墜鍨嬪彿(鎵嬪姩)</div></th>
+                                                                                <th><div class="slds-truncate"><span style="color:red;font-size: 18px;">*</span>澶卞崟浜у搧绫诲埆</div></th>
+                                                                                <th><div class="slds-truncate"><span style="color:red;font-size: 18px;">*</span>澶卞崟浜у搧鍖哄垎</div></th>
+                                                                                <th></th>
+                                                                        </tr>
+                                                                    </thead>
+                                                                    <tbody>
+                                                                        <template for:each={brand.LostProducts} for:item="product" for:index="j">
+                                                                            <tr class="inputRows" key={product}>
+                                                                                <td>
+                                                                                   <lightning-combobox placeholder={product.LostProductss.LostBrandName__c} class="BrandName" name={j} title={i} options={brandOptions} value={product.LostProductss.LostBrandName__c} onchange={handleLostBrandNameChange} read-only="true"></lightning-combobox> 
+                                                                                </td>
+                                                                                <td>
+                                                                                    <lightning-record-edit-form
+                                                                                    object-api-name='PCLLostProduct__c'
+                                                                                    record-id=''
+                                                                                    >
+                                                                                        <lightning-input-field class="LostProduct" data-id={i} title={i} value={product.LostProductss.LostProduct__c} name={j} field-name='LostProduct__c' onchange={handleLostProductChange} variant="label-hidden"> </lightning-input-field>
+                                                                                    </lightning-record-edit-form> 
+                                                                                </td>
+                                                                                <td>
+                                                                                   <lightning-input class="Quantity" title={i} name={j} value={product.LostProductss.Quantity__c} onchange={handleQuantityChange}></lightning-input>
+                                                                                </td>
+                                                                                <td>
+                                                                                    <lightning-input class="LostProductMannual" title={i} name={j} value={product.LostProductss.LostProductMannual__c} onchange={handleLostProductMannualChange}></lightning-input>
+                                                                                </td>
+                                                                                <td>
+                                                                                    <lightning-combobox class="ProductClass" placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox> 
+                                                                                </td>
+                                                                                <td>
+                                                                                    <lightning-combobox class="ProductCategory" data-id={i} placeholder="--鏃�--" title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox> 
+                                                                                </td>
+                                
+                                                                                <td>
+                                                                                    <lightning-button-icon name={i} icon-name="utility:add" value={j} variant="bare" onclick={addRow}></lightning-button-icon>
+                                                                                </td>
+                                                                                <td>
+                                                                                    <lightning-button-icon class="deleteButton" data-id={i} name={i} icon-name="utility:delete" value={j} variant="bare" onclick={removeRow}></lightning-button-icon>
+                                                                                </td>
+                                                                            </tr>
+                                                                        </template>
+                                                                    </tbody>
+                                                                </table>
+                                                            </div>
+                                                        </template>
+                                                    </lightning-layout-item>
+                                                </lightning-layout>
+                                            </lightning-accordion-section>
+                                        </li>
+                                    </template>
+                            </lightning-accordion>
+                            <lightning-layout style="margin-top: 20px;">
+                                <div class="slds-align_absolute-center">
+                                    <lightning-layout-item size="12">
+                                        <lightning-button label="杩藉姞鍝佺墝" onclick={addBrandJs}></lightning-button>
+                                        <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+                                        <lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
+                                    </lightning-layout-item>
+                                </div>
+                            </lightning-layout>
+                    </div>
+                </div>   
+            </lightning-card>
+        </template>
+        <template if:true={isView}>
+            <lightning-card>
+                <lightning-card id="my-element2" class="card"  variant="Narrow" data-id="my-card">
+                    <div style="padding: 0 20px">
+                        <lightning-layout>
+                            <lightning-layout-item>
+                                <div class="mainTitle" style="padding: 10px 3px;font-weight: bold;">澶卞崟鎶ュ憡鏌ョ湅椤甸潰</div>
+                            </lightning-layout-item>
+                            <div style="margin-left: 550px;">
+                                <lightning-layout-item  size="12">
+                                    <lightning-button label="鎻愪氦" onclick={submitJs}></lightning-button>
+                                    <lightning-button name="缂栬緫" label="缂栬緫" onclick={editJs}></lightning-button>
+                                    <lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
+                                </lightning-layout-item>
+                            </div>
+                        </lightning-layout>
+                        <div style="margin-top: 5px">
+                            <lightning-layout>
+                                <lightning-layout-item size="2" padding="around-small">
+                                    <div class="slds-form_horizontal my-combobox">
+                                        <label>澶卞崟绫诲瀷:</label>
+                                        <lightning-formatted-text value={LostReport.lostReport.LostType__c}></lightning-formatted-text>
+                                    </div>   
+                                </lightning-layout-item>
+                                <lightning-layout-item size="3" padding="around-small">
+                                    <label>澶卞崟鎬婚噾棰濓紙鍏冿級:</label>   
+                                    <lightning-formatted-number value={LostReport.lostReport.LostTotalAmount__c}></lightning-formatted-number>
+                                </lightning-layout-item>
+                                <lightning-layout-item size="3" padding="around-small">
+                                    <label>鍖呭惈瓒呭0:</label>
+                                    <lightning-formatted-text value={LostReport.lostReport.InclusionUltrasound__c}></lightning-formatted-text>
+                                </lightning-layout-item>
+                                <lightning-layout-item size="3" padding="around-small">
+                                    <label>鐘舵��:</label>
+                                    <lightning-formatted-text value={LostReport.lostReport.Report_Status__c}></lightning-formatted-text>
+                                </lightning-layout-item>
+                            </lightning-layout>
+                                <lightning-accordion allow-multiple-sections-open class="myAccordion">
+                                        <template for:each={LostReport.LostBrands} for:item="brand" for:index="i">
+                                            <li key={brand.index}>
+                                                <lightning-accordion-section class="text-container" data-id={i} name="澶卞崟鍝佺墝" label="澶卞崟鍝佺墝">
+                                                    <lightning-layout>
+                                                        <lightning-layout-item size="4" padding="around-small">
+                                                            <label>澶卞崟鍝佺墝:</label>
+                                                            <lightning-formatted-text name={i} value={brand.lostBrand.Lost_By_Company__c}></lightning-formatted-text>
+                                                        </lightning-layout-item>
+                                                        <lightning-layout-item flexibility="auto" padding="around-small"> 
+                                                            <label>澶卞崟鍘熷洜锛堜富锛�:</label>
+                                                            <lightning-formatted-text name={i} value={brand.lostBrand.Lost_reason_main__c}></lightning-formatted-text>
+                                                        </lightning-layout-item>
+                                                        <lightning-layout-item flexibility="auto" padding="around-small">
+                                                            <label>澶卞崟鍘熷洜锛堟锛�:</label>
+                                                            <lightning-formatted-text name={i} value={brand.lostBrand.Lost_Reason_Sub__c}></lightning-formatted-text>
+                                                        </lightning-layout-item>
+                                                    </lightning-layout>
+                                                    <lightning-layout> 
+                                                        <lightning-layout-item size="4" padding="horizontal-small">
+                                                            <label>澶卞崟鍝佺墝锛堟墜鍔級:</label>
+                                                            <lightning-formatted-text name={i} value={brand.lostBrand.Lost_By_Company_Mannual__c}></lightning-formatted-text>
+                                                        </lightning-layout-item>
+                                                        <lightning-layout-item size="4" padding="horizontal-small">
+                                                            <label>澶卞崟閲戦锛堝厓锛�:</label>
+                                                            <lightning-formatted-text name={i} value={brand.lostBrand.LostPrice__c}></lightning-formatted-text>
+                                                        </lightning-layout-item>
+                                                        <lightning-layout-item size="4" padding="horizontal-small">
+                                                                <label>涓爣缁忛攢鍟�:</label>
+                                                                <lightning-formatted-text name={i} value={brand.lostBrand.Agency__c}></lightning-formatted-text>
+                                                        </lightning-layout-item>
+                                                    </lightning-layout>
+                                                    <lightning-layout>
+                                                        <lightning-layout-item size="4" padding="horizontal-small">
+                                                            <label>涓爣缁忛攢鍟嗭紙鎵嬪姩锛�:</label>
+                                                            <lightning-formatted-text name={i} value={brand.lostBrand.AgencyMannual__c}></lightning-formatted-text>
+                                                        </lightning-layout-item>
+                                                    </lightning-layout>
+                                                    <lightning-layout>
+                                                        <lightning-layout-item flexibility="auto" padding="around-small">
+                                                            <template if:true={isInit}>
+                                                                <lightning-datatable hide-checkbox-column="true" key-field="is" columns={columns3} data={getData}></lightning-datatable>
+                                                            </template>
+                                                        </lightning-layout-item>
+                                                    </lightning-layout>
+                                                </lightning-accordion-section>
+                                            </li>
+                                        </template>
+                                </lightning-accordion>
+                                <lightning-layout style="margin-top: 20px;">
+                                    <div class="slds-align_absolute-center">
+                                        <lightning-layout-item size="12">
+                                            <lightning-button label="鎻愪氦" onclick={submitJs}></lightning-button>
+                                            <lightning-button name="缂栬緫" label="缂栬緫" onclick={editJs}></lightning-button>
+                                            <lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
+                                        </lightning-layout-item>
+                                    </div>
+                                </lightning-layout>
+                                
+                        </div>
+                    </div>   
+                </lightning-card>
+            </lightning-card>
+        </template>
     </lightning-card>
+    
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
index 900eb15..969f72e 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-05-16 11:43:27
+ * @LastEditTime: 2023-05-24 15:48:07
  */
 const columns2=[
     { label: '--鏃�--', value: '' },
@@ -18,6 +18,30 @@
     { label: '鏌愮浜у搧缂哄け', value: '鏌愮浜у搧缂哄け' },
     { label: '閲囪喘骞宠 ', value: '閲囪喘骞宠 ' }
 ];
+const productClassOptions = [
+    { label: '--鏃�--', value: '' },
+    { label: '涓绘満', value: '涓绘満' },
+    { label: '闀滃瓙', value: '闀滃瓙' },
+    { label: '灏忛暅绉�', value: '灏忛暅绉�' },
+    { label: '鑳介噺', value: '鑳介噺' },
+    { label: '鍏朵粬', value: '鍏朵粬' }
+];
+const productCategoryOptions = [
+    { label: '--鏃�--', value: '' }
+];
+const columns3 = [
+    {label : "澶卞崟鍝佺墝",fieldName : "LostBrandName__c"},
+    {label : "澶卞崟瀵规墜鍨嬪彿",fieldName : "LostProduct__c"},
+    {label : "澶卞崟鏁伴噺",fieldName : "Quantity__c",type : "number"},
+    {label : "澶卞崟瀵规墜鍨嬪彿(鎵嬪姩)",fieldName : "LostProductMannual__c"},
+    {label : "澶卞崟浜у搧绫诲埆",fieldName : "ProductClass__c"},
+    {label : "澶卞崟浜у搧鍖哄垎",fieldName : "ProductCategory__c"}
+];
+const RecordTypeOptions = [
+    { label: '--鏃�--', value: '' },
+    { label: '澶卞崟', value: '澶卞崟' },
+    { label: '閮ㄥ垎澶卞崟', value: '閮ㄥ垎澶卞崟' }
+];
 
 import { api, wire,track,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -29,44 +53,41 @@
 import lexMultiSelectCombobox from 'c/lexmultiSelectCombobox';
 import searchBrands from '@salesforce/apex/lexPCLLostReportLwcController.searchBrands';
 import getNewLostBrand from '@salesforce/apex/lexPCLLostReportLwcController.getNewLostBrand';
+import getPickList from '@salesforce/apex/lexPCLLostReportLwcController.getPickList';
 import { NavigationMixin } from 'lightning/navigation';
-import {CloseActionScreenEvent} from 'lightning/actions';
+import submit from '@salesforce/apex/lexPCLLostReportLwcController.submit';
+import {CloseActionScreenEvent} from 'lightning/actions'; 
 export default class LexPCLLostReportPage extends NavigationMixin(LightningElement) {
 
-
-    @track records;
-    @api recordJson;
-    @track columns2=columns2;
-    @api reasonValue;
     @api oppId;
-    lostReportId = '';
-    pageStatus = 'Create';
-    lostType = '澶卞崟';
-    submitFlag = '';
-    flag;
+    @track columns2=columns2;
+    @track pageStatus = 'Create';
     @track LostReport = {
         LostBrands: [
         ],
         lostReport: {}
-    };
+    }
     @track brandOptions = [];
-    columns=[
-        { "label" : "澶卞崟鍝佺墝", "apiName" : "LostBrandName__c" ,"fieldType":"picklist","objectName":"PCLLostProduct__c", "readOnly":true,"value":"--鏃�--","required":false}, 
-        { "label" : "澶卞崟瀵规墜鍨嬪彿", "apiName" : "LostProduct__c" ,"fieldType":"lookup","objectName":"PCLLostProduct__c","disable":"false","searchfield":"'鏃�'","required":false},
-        { "label" : "澶卞崟鏁伴噺", "apiName" : "Quantity__c","fieldType":"number","objectName":"PCLLostProduct__c" ,"required":true},
-        { "label" : "澶卞崟瀵规墜鍨嬪彿(鎵嬪姩)", "apiName" : "LostProductMannual__c","fieldType":"text","objectName":"PCLLostProduct__c" ,"required":false},
-        { "label" : "澶卞崟浜у搧绫诲埆", "apiName" : "ProductClass__c","fieldType":"picklist","objectName":"PCLLostProduct__c" ,"required":true},
-        { "label" : "澶卞崟浜у搧鍖哄垎", "apiName" : "ProductCategory__c","fieldType":"picklist","objectName":"PCLLostProduct__c","required":true}
-    ];
+    lostType = '澶卞崟';
+    submitFlag = '';
+    flag;
+    tableflag = 0;
+    reportId = '';
+    newProduct;
+    productOptionsList;
+    productClassOptions = productClassOptions;
+    productCategoryOptions = productCategoryOptions;
+    columns3 = columns3;
+    //澶卞崟绫诲瀷
+    RecordTypeOptions = RecordTypeOptions;
     connectedCallback(){
         init({
             oppId1: this.oppId,
-            lostReportId1: this.lostReportId,
+            lostReportId1: this.reportId,
             pageStatus1: this.pageStatus,
             lostType1: this.lostType,
             submitFlag1: this.submitFlag
         }).then(result=>{
-            console.log(result);
             if(result.message != null){
                 if(result.message == '鎻愪氦鎴愬姛锛�'){
                     this.showToast(result.message,"success");
@@ -75,9 +96,11 @@
                     this.showToast(result.message,"error");
                 }  
             }else{
-                this.LostReport = result.LostReport;
+                var report = result.LostReport;
+                this.LostReport = report;
                 this.LostReport.lostReport.LostTotalAmount__c = 0.0;
-                this.LostReport.LostBrands[0].columns = JSON.parse(JSON.stringify(this.columns));
+                this.LostReport.lostReport.InclusionUltrasound__c = '0';
+                this.newProduct = JSON.parse(JSON.stringify(this.LostReport.LostBrands[0].LostProducts[0]));
             }
             }).catch(error=>{
                 console.log("error");
@@ -93,20 +116,15 @@
             console.log("error");
             console.log(error);
         });
+        getPickList({
+            objectName: 'PCLLostProduct__c',
+            fieldName: 'ProductCategory__c'
+        }).then(result=>{
+            this.productOptionsList = JSON.parse(result);
+        });
+
     }
 
-    get isInit(){
-        if(this.LostReport.LostBrands[0].columns == undefined){
-            return false;
-        }else{
-            return true;
-        }
-    }
-
-    //澶卞崟绫诲瀷
-    RecordTypeOptions = [{ label: '--鏃�--', value: '' },
-                    { label: '澶卞崟', value: '澶卞崟' },
-                    { label: '閮ㄥ垎澶卞崟', value: '閮ㄥ垎澶卞崟' }];
     @wire(CurrentPageReference)
     getStateParameters(currentPageReference) {
             console.log(111);
@@ -122,41 +140,32 @@
             }
         }
     }
-    getBrandLabel(index){
-        return "澶卞崟鍝佺墝" + (this.LostReport.LostBrands[index].lineno + 1);
-    }
-    getParamValue(paramName) {
-        // Use the URLSearchParams API to get the value of a query parameter
-        const params = new URLSearchParams(window.location.search);
-        return params.get(paramName);
-    }
-    addBrandJs() {
-        getNewLostBrand({
-            lineNo: this.LostReport.LostBrands.length
-        }).then(result=>{
-            this.LostReport.LostBrands.push(result);
-            this.LostReport.LostBrands[this.LostReport.LostBrands.length - 1].columns = JSON.parse(JSON.stringify(this.columns));
+
+    showToast(msg,type) {
+        const event = new ShowToastEvent({
+            title: '',
+            message: msg,
+            variant: type
         });
+        this.dispatchEvent(event);
     }
-    submitJS() {
-        submit().then(result=>{
-            if(result.get('error')){
-                this.showToast(result.get('error'),"error");
-            }else{
-                this[NavigationMixin.Navigate]({
-                    type: 'standard__recordPage',
-                    attributes: {
-                        uri: result.get('uri'),
-                        Id: result.get('Id'),
-                        pageStatus: result.get('pageStatus'),
-                        submitFlag: result.get('submitFlag')
-                    }
-                }); 
-            }
+
+    get isInit(){
+        if(this.LostReport.LostBrands[0].LostProducts[0].productOptions == undefined){
+            return false;
+        }else{
+            return true;
+        }
+    }
+   
+    get getData(){
+        var products = this.LostReport.LostBrands[this.tableflag].LostProducts;
+        var productList = [];
+        products.forEach(product=>{
+            productList.push(product.LostProductss);
         });
-    }
-    get pageStatusIsCreateOrEdit() {
-        return this.pageStatus === 'Create' || this.pageStatus === 'Edit';
+        this.tableflag++;
+        return productList;
     }
 
     get isBrandCount2(){
@@ -166,6 +175,69 @@
         }
         return flag;
     }
+
+    get isView(){
+        if(this.pageStatus == 'View'){
+            return true;
+        }
+        return false;
+    }
+
+    get isEdit(){
+        if(this.pageStatus == 'Create' || this.pageStatus == 'Edit'){
+            return true;
+        }
+        return false;
+    }
+    
+    addBrandJs() {
+        getNewLostBrand({
+            lineNo: this.LostReport.LostBrands.length
+        }).then(result=>{
+            this.LostReport.LostBrands.push(result);
+        });
+    }
+    submitJs() {
+        console.log('1');
+        submit({
+            report1: JSON.stringify(this.LostReport),
+            reportId: this.reportId
+        }).then(result=>{
+            console.log(result);
+            if(result.error){
+                this.showToast(result.error,"error");
+            }else{
+                this.submitFlag = result.submitFlag;
+                init({
+                    oppId1: this.oppId,
+                    lostReportId1: this.reportId,
+                    pageStatus1: result.pageStatus,
+                    lostType1: this.lostType,
+                    submitFlag1: this.submitFlag
+                }).then(result=>{
+                    var report = result.LostReport;
+                    if(result.message != null){
+                        if(result.message == '鎻愪氦鎴愬姛锛�'){
+                            this.LostReport = report;
+                            this.pageStatus = 'View';
+                            this.showToast(result.message,"success");
+                        }else{
+                            this.showToast(result.message,"error");
+                        }  
+                    }else{
+                        this.LostReport = report;
+                    }
+                }).catch(error=>{
+                    console.log("error");
+                    console.log(error);
+                });
+            }
+        }).catch(error=>{
+            console.log("error");
+            console.log(error);
+        });
+    }
+    
 
     deleteBrandJs(event){
         var str = event.target.name;
@@ -177,18 +249,13 @@
         var elements = this.template.querySelectorAll('[data-id="TotalAmount"]');
         var tempLostAmount = 0.0;
         elements.forEach(element => {
-            console.log(element.value);
             if(element.value != 0){
                 tempLostAmount = tempLostAmount + parseFloat(element.value);
             }
         });
         this.LostReport.lostReport.LostTotalAmount__c = tempLostAmount;
     }
-    setBrandName(brandNumber) {
-        setbrand().then(()=>{
-            this.clearBrandMannualName();
-        });
-    }
+    
     setBrandMannualName(event) {
         var index = event.target.name;
         const payload = event.detail.payload;
@@ -200,7 +267,9 @@
         }
     }
     setDefaultBrand(value,index){
-        this.LostReport.LostBrands[index].columns[0].value = value;
+        this.LostReport.LostBrands[index].LostProducts.forEach(product => {
+            product.LostProductss.LostBrandName__c = value;
+        });
     }
 
    
@@ -209,12 +278,21 @@
         if (value == '鍏朵粬') {
             var elements = this.template.querySelectorAll('[data-id="Lost_By_Company_Mannual"]');
             elements[index].disabled = false;
-            this.LostReport.LostBrands[index].columns[1].disable = true;
+            elements[index].required = true;
+            var elements1 = this.template.querySelectorAll('.LostProduct[data-id="' + index + '"]');
+                    elements1.forEach(element=>{
+                        element.value = '';
+                        element.disabled = true;
+                    });
         } else {
             var elements = this.template.querySelectorAll('[data-id="Lost_By_Company_Mannual"]');
+            this.brandFlag = false;
             elements[index].value = '';
             elements[index].disabled = true;
-            this.LostReport.LostBrands[index].columns[1].disable = false;
+            elements[index].required = false;
+            elements1.forEach(element=>{
+                element.disabled = false;
+            });
         }
     }
     cancel() {
@@ -226,134 +304,33 @@
                     actionName: 'view'
                 }
             });
-    
     }
-    showToast(msg,type) {
-        const event = new ShowToastEvent({
-            title: '',
-            message: msg,
-            variant: type
-        });
-        this.dispatchEvent(event);
-        this.dispatchEvent(new CloseActionScreenEvent());
-    }
+   
     saveBrandJs(event) {
-        var index = event.target.name;
-        var tables = this.template.querySelectorAll("c-lex-dynamic-table");
-            if(tables.length > 1){
-                if(index == "save"){
-                    for(let i=0;i < table.length;i++){
-                        var products = this.LostReport.LostBrands[i].LostProducts;
-                        var table = tables[i];
-                        if(table!=undefined){
-                            var records = table.retrieveRecords();
-                            for(let j=0;j<records.length - 1;j++){
-                                products.push(JSON.parse(JSON.stringify(products[0])));
-                            }
-                            for(let j=0;j<records.length;j++){
-                                products[j].LostProductss.LostBrandName__c = records[j].LostBrandName__c;
-                                products[j].LostProductss.Quantity__c = records[j].Quantity__c;
-                                products[j].LostProductss.LostProductMannual__c = records[j].LostProductMannual__c;
-                                products[j].LostProductss.ProductClass__c = records[j].ProductClass__c;
-                                products[j].LostProductss.ProductCategory__c = records[j].ProductCategory__c;
-                                products[j].LostProductss.LostProduct__c = records[j].LostProduct__c;
-                            }
-                        }
-                    }
-                }else{
-                    var products = this.LostReport.LostBrands[index].LostProducts;
-                    var table = tables[index];
-                    if(table!=undefined){
-                        var records = table.retrieveRecords();
-                        for(let i=0;i<records.length - 1;i++){
-                            products.push(JSON.parse(JSON.stringify(products[0])));
-                        }
-                        for(let i=0;i<records.length;i++){
-                            products[i].LostProductss.LostBrandName__c = records[i].LostBrandName__c;
-                            products[i].LostProductss.Quantity__c = records[i].Quantity__c;
-                            products[i].LostProductss.LostProductMannual__c = records[i].LostProductMannual__c;
-                            products[i].LostProductss.ProductClass__c = records[i].ProductClass__c;
-                            products[i].LostProductss.ProductCategory__c = records[i].ProductCategory__c;
-                            products[i].LostProductss.LostProduct__c = records[i].LostProduct__c;
-                        }
-                    }
-                }
-            }else{
-                var products = this.LostReport.LostBrands[0].LostProducts;
-                var table = tables[0];
-                if(table!=undefined){
-                    var records = table.retrieveRecords();
-                    console.log(JSON.stringify(records));
-                    if(records.length > 1){
-                        for(let i=0;i<records.length - 1;i++){
-                            products.push(JSON.parse(JSON.stringify(products[0])));
-                        }
-                    }
-                    for(let i=0;i<records.length;i++){
-                        products[i].LostProductss.LostBrandName__c = records[i].LostBrandName__c;
-                        products[i].LostProductss.Quantity__c = records[i].Quantity__c;
-                        products[i].LostProductss.LostProductMannual__c = records[i].LostProductMannual__c;
-                        products[i].LostProductss.ProductClass__c = records[i].ProductClass__c;
-                        products[i].LostProductss.ProductCategory__c = records[i].ProductCategory__c;
-                        products[i].LostProductss.LostProduct__c = records[i].LostProduct__c;
-                    }
-                }
-            }
         this.dataCheck();
         if(!this.flag){
             return;
         }
         dataEntry({
-            report1 : JSON.stringify(this.LostReport)
-        }).then(result=>{
-            if(result){
-                this.showToast(result,"error")
-            }
-        }).catch(error=>{
-            console.log("error");
-            console.log(error);
-        });
-         
+                report1 : JSON.stringify(this.LostReport)
+            }).then(result=>{
+                if(result.error){
+                    this.showToast(result.error,"error");
+                }else{
+                    this.reportId = result.reportId;
+                    console.log(this.LostReport);
+                    this.pageStatus = 'View';
+                }
+            }).catch(error=>{
+                console.log("error");
+                console.log(error);
+            });
     }
-    handleLostTypeChange(event){
-        var value = event.target.value;
-        this.LostReport.lostReport.LostType__c = value;
+
+    editJs(){
+        this.pageStatus = 'Edit';
     }
     
-    handleLostReasonMainChange(event){
-        var index = event.target.name;
-        var value = event.target.value;
-        this.LostReport.LostBrands[index].lostBrand.Lost_reason_main__c = value;
-    }
-
-    handleLostReasonSubChange(event){
-        var index = event.target.name;
-        var value = event.target.value;
-        this.LostReport.LostBrands[index].lostBrand.Lost_Reason_Sub__c = value;
-    }
-
-    handleLostByCompanyMannualChange(event){
-        var index = event.target.name;
-        var value = event.target.value;
-        this.LostReport.LostBrands[index].lostBrand.Lost_By_Company_Mannual__c = value;
-    }
-
-    handleLostPriceOutChange(event){
-        var index = event.target.name;
-        var value = event.target.value;
-        this.LostReport.LostBrands[index].lostBrand.LostPrice__c = value;
-        this.setLostTotalAmount();
-    }
-    handleAgencyOutChange(event){
-        var index = event.target.name;
-        var value = event.target.value;
-        this.LostReport.LostBrands[index].lostBrand.Agency__c = value;
-    }
-    handleAgencyMannualOutChange(event){
-        var index = event.target.name;
-        var value = event.target.value;
-        this.LostReport.LostBrands[index].lostBrand.AgencyMannual__c = value;
-    }
     dataCheck(){
         this.flag = true;
         if(this.LostReport.lostReport.LostType__c == undefined || this.isBlank(this.LostReport.lostReport.LostType__c))
@@ -439,4 +416,129 @@
     isBlank(str) {
         return /^\s*$/.test(str);
       }
+    addRow(event){
+        var index = event.target.name;
+        var product = JSON.parse(JSON.stringify(this.newProduct));
+        if(this.LostReport.LostBrands[index].LostProducts[0].LostProductss.LostBrandName__c != undefined){
+            product.LostProductss.LostBrandName__c =  JSON.parse(JSON.stringify(this.LostReport.LostBrands[index].LostProducts[0].LostProductss.LostBrandName__c));
+        }
+        this.LostReport.LostBrands[index].LostProducts.push(product);
+    }
+    removeRow(event){
+        var index1 = event.target.name;
+        var index2 = event.target.value;
+        var deleteButtons = this.template.querySelectorAll('.deleteButton[data-id="' + index1 + '"]');
+        if(deleteButtons.length == 1){
+            return;
+        }
+        this.LostReport.LostBrands[index1].LostProducts.splice(index2,1);
+    }
+
+    handleLostTypeChange(event){
+        var value = event.target.value;
+        this.LostReport.lostReport.LostType__c = value;
+    }
+    
+    handleLostReasonMainChange(event){
+        var index = event.target.name;
+        var value = event.target.value;
+        this.LostReport.LostBrands[index].lostBrand.Lost_reason_main__c = value;
+    }
+
+    handleLostReasonSubChange(event){
+        var index = event.target.name;
+        var value = event.target.value;
+        this.LostReport.LostBrands[index].lostBrand.Lost_Reason_Sub__c = value;
+    }
+
+    handleLostByCompanyMannualChange(event){
+        var index = event.target.name;
+        var value = event.target.value;
+        this.LostReport.LostBrands[index].lostBrand.Lost_By_Company_Mannual__c = value;
+        this.setDefaultBrand(value,index);
+        var elements = this.template.querySelectorAll('.LostProduct[data-id="' + index + '"]');
+            if(value == '' || value == null){
+                elements.forEach(element=>{
+                    element.value = '';
+                    element.disabled = true;
+                });
+            }else{
+                elements.forEach(element=>{
+                    element.disabled = false;
+                });
+            }
+    }
+
+    handleLostPriceOutChange(event){
+        var index = event.target.name;
+        var value = event.target.value;
+        this.LostReport.LostBrands[index].lostBrand.LostPrice__c = value;
+        this.setLostTotalAmount();
+    }
+    handleAgencyOutChange(event){
+        var index = event.target.name;
+        var value = event.target.value;
+        this.LostReport.LostBrands[index].lostBrand.Agency__c = value;
+    }
+    handleAgencyMannualOutChange(event){
+        var index = event.target.name;
+        var value = event.target.value;
+        this.LostReport.LostBrands[index].lostBrand.AgencyMannual__c = value;
+    }
+    handleLostBrandNameChange(event){
+        var index1 = event.target.title;
+        var index2 = event.target.name;
+        this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.LostBrandName__c = event.target.value;
+    }
+    handleLostProductChange(event){
+        var index1 = event.target.title;
+        var index2 = event.target.name;
+        this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.LostProduct__c = event.target.value;
+    }
+    handleQuantityChange(event){
+        var index1 = event.target.title;
+        var index2 = event.target.name;
+        this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.Quantity__c = event.target.value;
+    }
+    handleLostProductMannualChange(event){
+        var index1 = event.target.title;
+        var index2 = event.target.name;
+        this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.LostProductMannual__c = event.target.value;
+    }
+    handleProductClassChange(event){
+        var index1 = event.target.title;
+        var index2 = event.target.name;
+        this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.ProductClass__c = event.target.value;
+        var val = event.target.value;
+        if(val == ''){
+            var temps1 =this.template.querySelectorAll('.ProductCategory[data-id="'+ index1 +'"]');
+            temps1[index2].readOnly = true;
+            temps1[index2].value = '';
+        }else{
+            var temps1 =this.template.querySelectorAll('.ProductCategory[data-id="'+ index1 +'"]');
+            temps1[index2].readOnly = false;
+            this.LostReport.LostBrands[index1].LostProducts[index2].productOptions = this.productOptionsList[val];
+        }
+       
+    }
+
+    handleProductCategoryChange(event){
+        var index1 = event.target.title;
+        var index2 = event.target.name;
+        var val = event.target.value;
+        var categorys = this.template.querySelectorAll('.ProductCategory');
+        var flag = false;
+        categorys.forEach(category=>{
+            if(category.value == '瓒呭0涓绘満'){
+                flag = true;
+            }
+        });
+        if(flag){
+            this.LostReport.lostReport.InclusionUltrasound__c = '1';
+        }else{
+            this.LostReport.lostReport.InclusionUltrasound__c = '0';
+        }
+        this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.ProductCategory__c = val;
+    }
+    
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexStockApply/lexStockApply.html b/force-app/main/default/lwc/lexStockApply/lexStockApply.html
index 5674b24..4fac2c9 100644
--- a/force-app/main/default/lwc/lexStockApply/lexStockApply.html
+++ b/force-app/main/default/lwc/lexStockApply/lexStockApply.html
@@ -2,5 +2,6 @@
     <div class="lexStockApplyHolder" 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/lexStockApply/lexStockApply.js b/force-app/main/default/lwc/lexStockApply/lexStockApply.js
index d2f94b3..03e63f8 100644
--- a/force-app/main/default/lwc/lexStockApply/lexStockApply.js
+++ b/force-app/main/default/lwc/lexStockApply/lexStockApply.js
@@ -4,7 +4,7 @@
  * @Author: chen jing wu
  * @Date: 2023-04-14 13:04:53
  * @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-23 14:49:52
+ * @LastEditTime: 2023-05-24 16:45:55
  */
 import { api, wire,LightningElement } from 'lwc';
 import { CurrentPageReference } from "lightning/navigation";
@@ -16,6 +16,7 @@
 import { loadScript } from "lightning/platformResourceLoader";
 import connection from '@salesforce/resourceUrl/connection20';
 import submitProcess  from '@salesforce/apex/OpportunityLightingButtonController.submitProcess';
+import LightningConfirm from 'lightning/confirm';
 export default class LexStockApply extends LightningElement {
     @api recordId;
     stockApplyStatus;
@@ -34,6 +35,69 @@
             console.log(str);
             this.recordId = str;
           }
+        }
+    }
+    async handleConfirmClick(msg) {
+        const result = await LightningConfirm.open({
+            message: msg,
+            variant: 'headerless',
+            label: 'this is the aria-label value',
+        });
+        console.log(result);
+        if(result){
+            try {
+                updateForStockApplyButton({
+                    recordId: this.recordId,
+                    flag: true
+                }).then(result=>{
+                    if(result){
+                        this.showToast(result,"error");
+                        this.dispatchEvent(new CloseActionScreenEvent);
+                        return;
+                    }
+                    // var request = new window.sforce.ProcessSubmitRequest();
+                    // request.objectId = this.recordId;
+                    // console.log("s");
+                    // console.log(request);
+                    // console.log("e");
+                    // var processResults = window.sforce.Connection.prototype.process([request]);
+                    // console.log(processResults);
+                    submitProcess({
+                        opportunityId: this.recordId
+                    }).then(result=>{
+                        if(result){
+                            this.showToast(result,"error");
+                            updateForStockApplyButton({
+                                recordId: this.recordId,
+                                flag: false
+                            }).then(result=>{
+                                if(result){
+                                    this.showToast(result,"error");
+                                    this.dispatchEvent(new CloseActionScreenEvent);
+                                    return;
+                                }
+                                this.IsLoading = false;
+                                this.updateRecordView(this.recordId);
+                                this.dispatchEvent(new CloseActionScreenEvent);
+                            })
+                            
+                        }else{
+                            this.showToast("鎴愬姛","success");
+                            this.updateRecordView(this.recordId);
+                            this.dispatchEvent(new CloseActionScreenEvent);
+                        }
+                        
+                    })
+                    
+                }).catch(error=>{
+                    console.log(error);
+                })
+                } catch(e) {
+                   console.log(e); 
+                }
+        }else{
+            this.dispatchEvent(new CloseActionScreenEvent);
+            return;
         }
     }
     connectedCallback(){
@@ -59,58 +123,7 @@
             this.dispatchEvent(new CloseActionScreenEvent);
             return;
         }
-
-        if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
-            this.dispatchEvent(new CloseActionScreenEvent);
-            return;
-        }
-        
-        updateForStockApplyButton({
-            recordId: this.recordId,
-            flag: true
-        }).then(result=>{
-            if(result){
-                this.showToast(result,"error");
-                this.dispatchEvent(new CloseActionScreenEvent);
-                return;
-            }
-            // var request = new window.sforce.ProcessSubmitRequest();
-            // request.objectId = this.recordId;
-            // console.log("s");
-            // console.log(request);
-            // console.log("e");
-            // var processResults = window.sforce.Connection.prototype.process([request]);
-            // console.log(processResults);
-            submitProcess({
-                opportunityId: this.recordId
-            }).then(result=>{
-                if(result){
-                    this.showToast(result,"error");
-                    updateForStockApplyButton({
-                        recordId: this.recordId,
-                        flag: false
-                    }).then(result=>{
-                        if(result){
-                            this.showToast(result,"error");
-                            this.dispatchEvent(new CloseActionScreenEvent);
-                            return;
-                        }
-                        this.IsLoading = false;
-                        this.updateRecordView(this.recordId);
-                        this.dispatchEvent(new CloseActionScreenEvent);
-                    })
-                    
-                }else{
-                    this.showToast("鎴愬姛","success");
-                    this.updateRecordView(this.recordId);
-                    this.dispatchEvent(new CloseActionScreenEvent);
-                }
-                
-            })
-            
-        }).catch(error=>{
-            console.log(error);
-        })
+        this.handleConfirmClick("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵");
     }
     showToast(msg,type) {
         const event = new ShowToastEvent({
diff --git a/force-app/main/default/pages/AdvanceOpportunity.page b/force-app/main/default/pages/AdvanceOpportunity.page
index 14c7a8f..644ec3c 100644
--- a/force-app/main/default/pages/AdvanceOpportunity.page
+++ b/force-app/main/default/pages/AdvanceOpportunity.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Opportunity" extensions="AdvanceOpportunityController" showChat="false" showHeader="false" sidebar="false" action="{!init}" id="allPage">
+<apex:page standardController="Opportunity" extensions="AdvanceOpportunityController" showChat="false" showHeader="false" sidebar="false" action="{!init}" id="allPage" lightningStylesheets="true">
 <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
 <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
 <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index c845fc2..a5735b5 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1283,7 +1283,7 @@
                 </apex:pageblocksection>
                 <!-- !(RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓') -->
                 <apex:pageBlock title="鏈�夋嫨鐨勪骇鍝�" id="mpdDetailsSection" rendered="{!IF(editAble&&!(RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓'),true,false)}">
-                   <div style="position:relative;height: 0px;">
+                   <div style="position:absolute;height: 0px;">
                        <input type="hidden" id="allPage:allForm:allBlock:mpdDetailsSection:mpdDetailsRecordsViewCount" value="{!mpdDetailsRecordsViewCount}" />
                         <apex:commandButton onclick="saveJs();" value="纭杩藉姞" style="position:relative;top: -45px;left: 120px; width:100px;" rerender="mpdDetailsSection,edmpdDetails" rendered="{!IF(editAble,true,false)}" />
                    </div>
diff --git a/force-app/main/default/pages/Opportunity12Rating.page b/force-app/main/default/pages/Opportunity12Rating.page
index f6e80a0..d993268 100644
--- a/force-app/main/default/pages/Opportunity12Rating.page
+++ b/force-app/main/default/pages/Opportunity12Rating.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Opportunity" showHeader="false" sidebar="false">
+<apex:page standardController="Opportunity" showHeader="false" sidebar="false" lightningStylesheets="true">
 <head>
 <style>
     th {

--
Gitblit v1.9.1