From 5ce27d69c427ca16f37ff16d53758d0e877a88f9 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 31 五月 2023 17:48:34 +0800
Subject: [PATCH] 修改页面以及更改跳转方式
---
force-app/main/default/lwc/lexASACEditor/lexASACEditor.js | 14
force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js-meta.xml | 5
force-app/main/default/lwc/lexCancelReport/lexCancelReport.js | 40 +
force-app/main/default/lwc/lexSubmit/lexSubmit.js | 2
force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js | 1
force-app/main/default/pages/MergeAgencyActivity.page | 2
force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js | 17
force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html | 60 +++
force-app/main/default/classes/OpportunityLightingButtonController.cls | 7
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js | 177 +++++++++-
force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js-meta.xml | 1
force-app/main/default/pages/Xin_SearchVisitorPlace.page | 2
force-app/main/default/lwc/lexLookupLwc/__tests__/lexLookupLwc.test.js | 25 +
force-app/main/default/classes/lexLightingButtonConstant.cls | 4
force-app/main/default/classes/lexLookupController.cls | 8
force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js | 87 +++++
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html | 471 ++++++++++++++++------------
force-app/main/default/classes/lexLookupController.cls-meta.xml | 5
force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html | 4
force-app/main/default/classes/lexPCLLostReportLwcController.cls | 20
20 files changed, 682 insertions(+), 270 deletions(-)
diff --git a/force-app/main/default/classes/OpportunityLightingButtonController.cls b/force-app/main/default/classes/OpportunityLightingButtonController.cls
index e88cb1e..fbdcf8a 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-24 16:34:15
+ * @LastEditTime: 2023-05-31 17:32:51
*/
public with sharing class OpportunityLightingButtonController {
@AuraEnabled
@@ -223,6 +223,7 @@
res.salesManagerDepartmentID = opportunity.Sales_manager_departmentID__c;
res.salesOwnerBuchang = opportunity.Sales_owner_buchang__c;
res.salesOwnerBuchangID = opportunity.Sales_owner_buchangID__c;
+ res.recordTypeId = Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByName().get(lexLightingButtonConstant.RECORD_TYPE_NAME_BY_OPPO_CANCEL_REPORT).getRecordTypeId();
} catch (Exception e) {
throw new AuraHandledException(e.getMessage());
}
@@ -568,7 +569,7 @@
select id,
Tender_information__r.subInfoType__c
from Tender_Opportunity_Link__c
- where (Tender_information__r.subInfoType__c =:lexLightingButtonConstant.SUB_INFO_TYPE_SCRAPPED_LABEL OR Tender_information__r.subInfoType__c =:lexLightingButtonConstant.SUB_INFO_TYPE_FLOW_LABEL) and Opportunity__c =: recordId
+ where (Tender_information__r.subInfoType__c =:lexLightingButtonConstant.SUB_INFO_TYPE_SCRAPPED_LABEL OR Tender_information__r.subInfoType__c =:lexLightingButtonConstant.SUB_INFO_TYPE_FLOW_LABEL OR Tender_information__r.TerminateApprovalStatus__c= :lexLightingButtonConstant.SUB_INFO_TYPE_APPROVE) and Opportunity__c =: recordId
];
} catch (Exception e) {
System.debug('e:****' + e);
@@ -833,5 +834,7 @@
public String s1ProfileId;
@AuraEnabled
public String accountName;
+ @AuraEnabled
+ public String recordTypeId;
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexLightingButtonConstant.cls b/force-app/main/default/classes/lexLightingButtonConstant.cls
index f3e6ee8..21b2694 100644
--- a/force-app/main/default/classes/lexLightingButtonConstant.cls
+++ b/force-app/main/default/classes/lexLightingButtonConstant.cls
@@ -59,6 +59,8 @@
public static final String SUB_INFO_TYPE_SCRAPPED_LABEL = '3-1锛氬簾鏍囧叕鍛�';
//鎷涙爣椤圭洰鐨勯樁娈佃ˉ鍏呰鏄庘��3-2锛氭祦鏍囧叕鍛娾��
public static final String SUB_INFO_TYPE_FLOW_LABEL = '3-2锛氭祦鏍囧叕鍛�';
+ //鎷涙爣椤圭洰鐨勯樁娈佃ˉ鍏呰鏄庘�樻壒鍑嗏��
+ public static final String SUB_INFO_TYPE_APPROVE = '鎵瑰噯';
//鍛ㄦ姤鏈堟姤鐨勮褰曠被鍨嬪悕鈥樺懆鎶モ��
public static final String RECORD_TYPE_NAME_BY_MONTHLY_REPORT = '鍛ㄦ姤';
//鎶ュ憡涔︾殑璁板綍绫诲瀷鈥樻彁浜も��
@@ -75,6 +77,8 @@
public static final String RECORD_TYPE_NAME_BY_FINAL= '9.Final 瀹屾瘯';
//QIS鐨勮褰曠被鍨嬧��5.鐜板満缁撴鈥�
public static final String RECORD_TYPE_NAME_BY_COMP= '5.鐜板満缁撴';
+ //澶卞崟鍙栨秷鎶ュ憡鐨勮褰曠被鍨嬧�樿浠峰彇娑堟姤鍛娾��
+ public static final String RECORD_TYPE_NAME_BY_OPPO_CANCEL_REPORT = '璇环鍙栨秷鎶ュ憡';
//璁板綍绫诲瀷鐨刣eveloperName鈥楢SRCDecision鈥�
public static final String DEVELOPER_NAME_ASRC_DECISION = 'ASRCDecision';
//璁板綍绫诲瀷鐨刣eveloperName鈥楢SACDecision鈥�
diff --git a/force-app/main/default/classes/lexLookupController.cls b/force-app/main/default/classes/lexLookupController.cls
new file mode 100644
index 0000000..5a90cfc
--- /dev/null
+++ b/force-app/main/default/classes/lexLookupController.cls
@@ -0,0 +1,8 @@
+public with sharing class lexLookupController {
+ @AuraEnabled
+ public static List<Object> getRecordsByName(String objectName, String searchFor,String queryBrand) {
+ String queryString = 'SELECT Id, Name FROM ';
+ queryString += String.escapeSingleQuotes(objectName) + ' WHERE Name Like \'%' + String.escapeSingleQuotes(searchFor) + '%\' and Category5__c = \'绔炰簤瀵规墜\' and Brand_Name__c != \'濂ユ灄宸存柉\' and RecordTypeId = \'01210000000aMAEAA2\' and Brand_Name__c = \'' + queryBrand + '\' limit 10';
+ return Database.query(queryString);
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexLookupController.cls-meta.xml b/force-app/main/default/classes/lexLookupController.cls-meta.xml
new file mode 100644
index 0000000..9bbf7b4
--- /dev/null
+++ b/force-app/main/default/classes/lexLookupController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>56.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexPCLLostReportLwcController.cls b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
index 1c42b9f..6adf98b 100644
--- a/force-app/main/default/classes/lexPCLLostReportLwcController.cls
+++ b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
@@ -617,6 +617,7 @@
}
// lostReportId = report.lostReport.id;
system.debug('save---end:');
+ messageMap.put('LostReport',JSON.serialize(report));
}catch (Exception ex) {
Database.rollback(sp);
// 杩欓噷闇�瑕佸啓涓�浜涙姤閿欎俊鎭�
@@ -773,6 +774,8 @@
@AuraEnabled
public Boolean bool;
@AuraEnabled
+ public String productName;
+ @AuraEnabled
public List<Map<String, String>> productOptions = new List<Map<String, String>>();
public PCLLostProducts() {
this.lineNo2 = 0;
@@ -815,20 +818,17 @@
}
}
}
- // add tcm 20211118 end
-
@AuraEnabled
- public static List<Product2> searchProduct(){
+ public static string searchProduct(String lostProduct){
+ Product2 prd = null;
try {
- List<Product2> products = [
- select
- Id,name
- from Product2
- where Brand_Name__c = 'STORZ' limit 10
- ];
- return products;
+ prd = [select Id,ProductClass__c, ProductCategory__c from Product2 where Id =:lostProduct];
} catch (Exception e) {
throw new AuraHandledException(e.getMessage());
}
+ return JSON.serialize(prd);
}
+
+ // add tcm 20211118 end
+
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexASACEditor/lexASACEditor.js b/force-app/main/default/lwc/lexASACEditor/lexASACEditor.js
index b343456..9346ff3 100644
--- a/force-app/main/default/lwc/lexASACEditor/lexASACEditor.js
+++ b/force-app/main/default/lwc/lexASACEditor/lexASACEditor.js
@@ -4,13 +4,14 @@
* @Author: chen jing wu
* @Date: 2023-05-08 14:36:32
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 09:20:08
+ * @LastEditTime: 2023-05-26 15:57:45
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import init from '@salesforce/apex/ReportController.initForASACEditorButton';
-export default class LexASACEditor extends LightningElement {
+import { NavigationMixin } from 'lightning/navigation';
+export default class LexASACEditor extends NavigationMixin(LightningElement) {
@api recordId;
lastModifiedDate
id
@@ -50,7 +51,6 @@
this.developerName = result.developerName;
this.editor();
this.dispatchEvent(new CloseActionScreenEvent());
- //window.location.replace("https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Report__c/" + this.recordId + "/view");
}else{
console.log("else");
this.IsLoading = false;
@@ -69,12 +69,10 @@
editor(){
if (this.id != undefined){
- this.url = "/apex/RepPAEDecisionRecord?Id="+this.id+"&ReportId="+this.recordId+"&RecordTypeIds="+"ASACDecision";
- console.log(this.url);
- } else {
+ this.url = "/apex/RepPAEDecisionRecord?Id="+this.id+"&ReportId="+this.recordId+"&RecordTypeIds="+"ASACDecision";
+ } else {
this.url = "/apex/RepPAEDecisionRecord?ReportId="+this.recordId+"&RecordTypeIds="+"ASACDecision";
- console.log(this.url);
- }
+ }
window.open(this.url,"_self");
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js b/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js
index f58a718..ba20f69 100644
--- a/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js
+++ b/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js
@@ -4,14 +4,14 @@
* @Author: chen jing wu
* @Date: 2023-05-08 14:36:32
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 09:22:15
+ * @LastEditTime: 2023-05-26 15:57:13
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import init from '@salesforce/apex/ReportController.initForASRCEditorButton';
-
-export default class LexASRCEditor extends LightningElement {
+import { NavigationMixin } from 'lightning/navigation';
+export default class LexASRCEditor extends NavigationMixin(LightningElement) {
@api recordId;
lastModifiedDate
id
@@ -35,7 +35,6 @@
}
}
}
-
connectedCallback () {
console.log(this.recordId);
init({
@@ -51,7 +50,6 @@
this.developerName = result.developerName;
this.editor();
this.dispatchEvent(new CloseActionScreenEvent());
- //window.location.replace("https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Report__c/" + this.recordId + "/view");
}else{
console.log("else");
this.IsLoading = false;
@@ -63,19 +61,16 @@
console.log(error);
}).finally(() => {
- });
- //this.updateRecordView(this.recordId);
+ });
}
editor(){
if (this.id != undefined){
this.url = "/apex/RepPAEDecisionRecord?Id="+this.id+"&ReportId="+this.recordId+"&RecordTypeIds="+"ASRCDecision";
- console.log(this.url);
- } else {
+ } else {
this.url = "/apex/RepPAEDecisionRecord?ReportId="+this.recordId+"&RecordTypeIds="+"ASRCDecision";
- console.log(this.url);
- }
+ }
window.open(this.url,"_self");
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js-meta.xml b/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js-meta.xml
index 6562db5..952a036 100644
--- a/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js-meta.xml
+++ b/force-app/main/default/lwc/lexASRCEditor/lexASRCEditor.js-meta.xml
@@ -1,4 +1,3 @@
-
<?xml version="1.0" encoding="UTF-8"?>
<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>54.0</apiVersion>
diff --git a/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js b/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
index d75559e..2236a21 100644
--- a/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
+++ b/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
@@ -5,8 +5,10 @@
import queryForCancelReportButton from '@salesforce/apex/OpportunityLightingButtonController.queryForCancelReportButton';
import { updateRecord } from 'lightning/uiRecordApi';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { NavigationMixin } from 'lightning/navigation';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
import ConSent from '@salesforce/apex/BidAnnouncementController.ConSent';
-export default class LexCancelReport extends LightningElement {
+export default class LexCancelReport extends NavigationMixin(LightningElement) {
@api recordId;
stageName;
sapSendOK;
@@ -21,6 +23,7 @@
salesManagerDepartmentID;
salesOwnerBuchang;
salesOwnerBuchangID;
+ recordTypeId;
IsLoading = true;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -55,8 +58,12 @@
this.salesManagerDepartmentID = result.salesManagerDepartmentID == undefined ? '' : result.salesManagerDepartmentID;
this.salesOwnerBuchang = result.salesOwnerBuchang == undefined ? '' : result.salesOwnerBuchang;
this.salesOwnerBuchangID = result.salesOwnerBuchangID == undefined ? '' : result.salesOwnerBuchangID;
+ this.recordTypeId = result.recordTypeId;
this.cancelReport();
- })
+ }).catch(error=>{
+ console.log("error");
+ console.log(error);
+ });
}
showToast(msg,type) {
const event = new ShowToastEvent({
@@ -100,17 +107,24 @@
}
//XLIU-CG98L5 銆愬鎵樸�戙�愯瘎浼般�戞柊闇�姹�-鎷涙爣椤圭洰/璇环瀵瑰簲娴佹爣銆佸簾鏍囨敼鍠� end
else {
- location.href = '/a1U/e?retURL=%2F'+ this.recordId +
- '&RecordType=01210000000R4hH' +
- '&CF00N10000004lbGT=' + this.name +
- '&CF00N10000004lbGT_lkid=' + this.recordId +
- '&CF00N10000006QShg=' + this.salesAssistantName +
- '&CF00N10000006QShg_lkid=' + this.salesAssistantID +
- '&CF00N10000006QShq='+ this.managerName +
- '&CF00N10000006QShq_lkid=' + this.salesManagerDepartmentID +
- '&CF00N10000006QShb=' + this.salesOwnerBuchang +
- '&CF00N10000006QShb_lkid=' + this.salesOwnerBuchangID +
- '';
+ const defaultValues = encodeDefaultFieldValues({
+ Opportunity__c: this.recordId, // 鍏宠仈涓昏褰� ID
+ Sales_assistant__c: this.salesAssistantID,
+ Manager_sales__c: this.salesManagerDepartmentID,
+ Buchang_sales__c: this.salesOwnerBuchangID
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Lost_cancel_report__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: defaultValues,
+ recordTypeId: this.recordTypeId,
+ }
+ });
}
this.dispatchEvent(new CloseActionScreenEvent());
});
diff --git a/force-app/main/default/lwc/lexLookupLwc/__tests__/lexLookupLwc.test.js b/force-app/main/default/lwc/lexLookupLwc/__tests__/lexLookupLwc.test.js
new file mode 100644
index 0000000..ab29bfd
--- /dev/null
+++ b/force-app/main/default/lwc/lexLookupLwc/__tests__/lexLookupLwc.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexLookupLwc from 'c/lexLookupLwc';
+
+describe('c-lex-lookup-lwc', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-lookup-lwc', {
+ is: LexLookupLwc
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html
new file mode 100644
index 0000000..dd18724
--- /dev/null
+++ b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html
@@ -0,0 +1,60 @@
+<!--
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-05-25 13:59:44
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-05-30 10:21:50
+-->
+<template>
+ <div>
+ <div class="slds-form-element">
+ <div class="slds-form-element__control">
+ <div class="slds-combobox_container">
+ <div class="slds-combobox" aria-expanded="false" aria-haspopup="listbox" role="combobox">
+ <div class="slds-combobox__form-element slds-input-has-icon slds-input-has-icon_right" role="none">
+ <template if:false={recordselected}>
+ <input class="slds-input slds-combobox__input" id="combobox-id-1" aria-autocomplete="list" aria-controls="listbox-id-1"
+ role="textbox" type="text" placeholder="Search..." onkeyup={onKeyChange} value={selectedValue}/ disabled={disabled}>
+ </template>
+ <template if:true={recordselected}>
+ <span class="slds-pill slds-pill_link fullWidth slds-input slds-combobox__input">
+ <a href="javascript:void(0);"
+ class="slds-pill__action slds-p-left_x-small" title={selectedValue}>
+ <lightning-icon icon-name={iconname} size="x-small"></lightning-icon>
+ <span class="slds-pill__label slds-p-left_x-small">{selectedValue}</span>
+ </a>
+ <button onclick={clearSelection}
+ class="slds-button slds-button_icon slds-button_icon slds-pill__remove"
+ title="Remove">
+ <lightning-icon icon-name="utility:close" size="small"
+ alternative-text="Press delete or backspace to remove"></lightning-icon>
+ <span class="slds-assistive-text" >Remove</span>
+ </button>
+ </span>
+ </template>
+ </div>
+ <template if:true={recordsList}>
+ <div class="slds-combobox_container">
+ <div id="listbox-id-1" class="slds-dropdown slds-dropdown_fluid" role="listbox">
+ <ul class="slds-listbox slds-listbox_vertical" role="presentation">
+ <template for:each={recordsList} for:item="item">
+ <li key={item.Id} role="presentation" class="slds-listbox__item">
+ <div class="slds-media slds-listbox__option slds-listbox__option_plain slds-media_small" role="option"
+ data-itemid = {item.Id} data-itemname={item.Name} onclick={setSelectedValue}>
+ <span role="menuitem" tabindex="-1" data-itemid = {item.Id} data-itemname={item.Name}>
+ <lightning-icon icon-name={iconname} size="x-small" data-itemid = {item.Id} data-itemname={item.Name}></lightning-icon> {item.Name}
+ </span>
+ </div>
+ </li>
+ </template>
+ </ul>
+ </div>
+ </div>
+ </template>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js
new file mode 100644
index 0000000..802c7e8
--- /dev/null
+++ b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js
@@ -0,0 +1,87 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-05-25 13:59:44
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-05-30 14:54:30
+ */
+import { LightningElement, track, api } from 'lwc';
+import getRecordsByName from '@salesforce/apex/lexLookupController.getRecordsByName'
+
+export default class LexLookupLwc extends LightningElement {
+ @api
+ objectname;
+ @api
+ queryBrand;
+ @track
+ recordsList;
+ @track
+ selectedValue = "";
+ error;
+ recordselected = false;
+ @api
+ iconname;
+ @api
+ initValue;
+ disabled = false;
+ //Method to query data after typing search term
+ onKeyChange(event) {
+ this.selectedValue = event.target.value;
+ if(this.queryBrand == undefined){
+ this.queryBrand = '';
+ }
+ getRecordsByName({objectName : this.objectname, searchFor : this.selectedValue, queryBrand : this.queryBrand})
+ .then(result => {
+ this.recordsList = result;
+ })
+ .catch(error => {
+ //exception handling
+ this.error = error;
+ })
+
+ }
+ renderedCallback(){
+ if(this.initValue != '' && this.initValue != undefined && this.initValue != null){
+ this.recordselected = true;
+ this.selectedValue = this.initValue;
+ }
+ }
+ @api
+ letDisabledTrue(){
+ this.recordselected = false;
+ this.disabled = true;
+ this.selectedValue = "";
+ this.recordsList = undefined;
+ }
+ @api
+ letDisabledFalse(){
+ this.recordselected = false;
+ this.disabled = false;
+ this.selectedValue = "";
+ this.recordsList = undefined;
+ }
+ //Method to clear search list and show selected value.
+ @api
+ clearSelection() {
+ this.recordselected = false;
+ this.selectedValue = "";
+ this.recordsList = undefined;
+ }
+
+ //Method to pass selected record to parent component.
+ setSelectedValue(event) {
+ this.selectedValue = event.target.dataset.itemname;
+ this.recordselected = true;
+ this.recordsList = undefined;
+ event.preventDefault();
+ const selectedEvent = new CustomEvent('selected', {
+ detail: {
+ Name : this.selectedValue,
+ Id : event.target.dataset.itemid,
+ ObjectName : this.objectname
+ }
+ });
+ this.dispatchEvent(selectedEvent);
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js-meta.xml b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js-meta.xml
new file mode 100644
index 0000000..f8c5cb4
--- /dev/null
+++ b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>56.0</apiVersion>
+ <isExposed>false</isExposed>
+</LightningComponentBundle>
\ 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 1795c48..f15649e 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
@@ -4,139 +4,308 @@
* @Author: chen jing wu
* @Date: 2023-04-20 17:16:48
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-24 15:52:37
+ * @LastEditTime: 2023-05-31 11:44:24
-->
<template>
- <lightning-card data-id="test">
- <template if:true={isEdit}>
- <lightning-card id="my-element1" class="card" variant="Narrow" data-id="my-card">
+
+ <template if:true={isCreateOrEdit}>
+ <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>
+ <template if:true={isEdit}>
+ <lightning-button name="save" label="淇濆瓨1" onclick={saveBrandToEditJs}></lightning-button>
+ </template>
+ <template if:false={isEdit}>
+ <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+ </template>
+ <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.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="澶卞崟鍝佺墝">
+ <template if:true={isEdit}>
+ <lightning-button name="save" label="淇濆瓨1" onclick={saveBrandToEditJs}></lightning-button>
+ </template>
+ <template if:false={isEdit}>
+ <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+ </template>
+ <lightning-button name={i} label="鍒犻櫎" onclick={deleteBrandJs} disabled={isBrandCount2}></lightning-button>
+ <lightning-layout>
+ <lightning-layout-item size="4" padding="around-small">
+ <template if:true={isEdit}>
+ <c-multi-select-combobox name={i} onselect={setBrandMannualName} data-id="Lost_By_Company" class="mycombobox" options={brandOptions} selected-value={reasonValue} label="澶卞崟鍝佺墝: " placeholder={brand.lostBrand.Lost_By_Company__c} required></c-multi-select-combobox>
+ </template>
+ <template if:false={isEdit}>
+ <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>
+ </template>
+ </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'
+ >
+ <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> -->
+ <template if:true={isEdit}>
+ <c-lex-lookup-lwc class="Product" data-id={i} title={i} name={j} iconname="standard:product_item" query-brand={product.LostProductss.LostBrandName__c} objectname="Product2" onselected={handleSelected} init-value={product.productName}></c-lex-lookup-lwc>
+ </template>
+ <template if:false={isEdit}>
+ <c-lex-lookup-lwc class="Product" data-id={i} title={i} name={j} iconname="standard:product_item" query-brand={product.LostProductss.LostBrandName__c} objectname="Product2" onselected={handleSelected}></c-lex-lookup-lwc>
+ </template>
+ </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" data-id={i} 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>
+ <template if:true={isEdit}>
+ <lightning-button name="save" label="淇濆瓨1" onclick={saveBrandToEditJs}></lightning-button>
+ </template>
+ <template if:false={isEdit}>
+ <lightning-button name="save" label="淇濆瓨" onclick={saveBrandJs}></lightning-button>
+ </template>
+ <lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
+ </lightning-layout-item>
+ </div>
+ </lightning-layout>
+ </div>
+ </div>
+ </lightning-card>
+ </template>
+ <template if:true={isView}>
+ <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>
+ <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={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 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 size="1">
+ <label>澶卞崟绫诲瀷:</label>
</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 size="1">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-output-field field-name="LostType__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
</lightning-layout-item>
- <lightning-layout-item size="3" padding="around-small">
- <div style="padding: 10px 3px;font: 16px;">鍖呭惈瓒呭０:{LostReport.lostReport.InclusionUltrasound__c}</div>
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="2">
+ <label>澶卞崟鎬婚噾棰濓紙鍏冿級:</label>
</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 size="1">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-output-field field-name="LostTotalAmount__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
</lightning-layout-item>
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="1">
+ <label>鍖呭惈瓒呭０:</label>
+ </lightning-layout-item>
+ <lightning-layout-item size="1">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-output-field field-name="InclusionUltrasound__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
+ </lightning-layout-item>
+ <lightning-layout-item size="1"></lightning-layout-item>
+ <lightning-layout-item size="1">
+ <label>鐘舵��:</label>
+ </lightning-layout-item>
+ <lightning-layout-item size="1">
+ <lightning-record-view-form object-api-name="Lost_cancel_report__c" record-id={reportId} density="comfy">
+ <lightning-output-field field-name="Report_Status__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
+ </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-accordion-section class="text-container" data-id={i} name="澶卞崟鍝佺墝" label="澶卞崟鍝佺墝">
<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 size="2" style="border-style:solid;border-width: 1px;">
+ <label>澶卞崟鍝佺墝:</label>
</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 size="2" style="border-style:solid;border-width: 1px;">
+ <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
+ <lightning-output-field field-name="Lost_By_Company__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
</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 size="2" style="border-style:solid;border-width: 1px;">
+ <label>澶卞崟鍘熷洜锛堜富锛�:</label>
+ </lightning-layout-item>
+ <lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
+ <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
+ <lightning-output-field field-name="Lost_reason_main__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
+ </lightning-layout-item>
+ <lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
+ <label>澶卞崟鍘熷洜锛堟锛�:</label>
+ </lightning-layout-item>
+ <lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
+ <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
+ <lightning-output-field field-name="Lost_Reason_Sub__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
</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 size="2" style="border-style:solid;border-width: 1px;">
+ <label>澶卞崟鍝佺墝锛堟墜鍔級:</label>
</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 size="2" style="border-style:solid;border-width: 1px;">
+ <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
+ <lightning-output-field field-name="Lost_By_Company_Mannual__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
</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 size="2" style="border-style:solid;border-width: 1px;">
+ <label>澶卞崟閲戦锛堝厓锛�:</label>
+ </lightning-layout-item>
+ <lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
+ <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
+ <lightning-output-field field-name="LostPrice__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
+ </lightning-layout-item>
+ <lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
+ <label>涓爣缁忛攢鍟�:</label>
+ </lightning-layout-item>
+ <lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
+ <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
+ <lightning-output-field field-name="Agency__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-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 size="2" style="border-style:solid;border-width: 1px;">
+ <label>涓爣缁忛攢鍟嗭紙鎵嬪姩锛�:</label>
+ </lightning-layout-item>
+ <lightning-layout-item size="2" style="border-style:solid;border-width: 1px;">
+ <lightning-record-view-form object-api-name="PCLLostBrand__c" record-id={brand.lostBrand.Id} density="comfy">
+ <lightning-output-field field-name="AgencyMannual__c" variant="label-hidden"></lightning-output-field>
+ </lightning-record-view-form>
</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>
+ <lightning-datatable hide-checkbox-column="true" key-field="is" columns={columns3} data={getData}></lightning-datatable>
</template>
</lightning-layout-item>
</lightning-layout>
@@ -147,117 +316,17 @@
<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={submitJs}></lightning-button>
+ <lightning-button name="缂栬緫" label="缂栬緫" onclick={editJs}></lightning-button>
<lightning-button label="杩斿洖璇环" onclick={cancel}></lightning-button>
</lightning-layout-item>
</div>
</lightning-layout>
+ <template if:true={isSubmit}>
+ <div>...test...</div>
+ </template>
</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>鍖呭惈瓒呭０:</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>
</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 969f72e..47f681b 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-24 15:48:07
+ * @LastEditTime: 2023-05-31 11:42:30
*/
const columns2=[
{ label: '--鏃�--', value: '' },
@@ -57,11 +57,14 @@
import { NavigationMixin } from 'lightning/navigation';
import submit from '@salesforce/apex/lexPCLLostReportLwcController.submit';
import {CloseActionScreenEvent} from 'lightning/actions';
+import lexLookupLwc from 'c/lexLookupLwc';
+import searchProduct from '@salesforce/apex/lexPCLLostReportLwcController.searchProduct';
+import { updateRecord } from 'lightning/uiRecordApi';
export default class LexPCLLostReportPage extends NavigationMixin(LightningElement) {
@api oppId;
@track columns2=columns2;
- @track pageStatus = 'Create';
+ @api pageStatus = 'Create';
@track LostReport = {
LostBrands: [
],
@@ -80,6 +83,7 @@
columns3 = columns3;
//澶卞崟绫诲瀷
RecordTypeOptions = RecordTypeOptions;
+ isSubmit = false;
connectedCallback(){
init({
oppId1: this.oppId,
@@ -149,6 +153,9 @@
});
this.dispatchEvent(event);
}
+ updateRecordView(recordId) {
+ updateRecord({fields: { Id: recordId }});
+ }
get isInit(){
if(this.LostReport.LostBrands[0].LostProducts[0].productOptions == undefined){
@@ -183,8 +190,15 @@
return false;
}
- get isEdit(){
+ get isCreateOrEdit(){
if(this.pageStatus == 'Create' || this.pageStatus == 'Edit'){
+ return true;
+ }
+ return false;
+ }
+
+ get isEdit(){
+ if(this.pageStatus == 'Edit'){
return true;
}
return false;
@@ -203,7 +217,6 @@
report1: JSON.stringify(this.LostReport),
reportId: this.reportId
}).then(result=>{
- console.log(result);
if(result.error){
this.showToast(result.error,"error");
}else{
@@ -219,8 +232,12 @@
if(result.message != null){
if(result.message == '鎻愪氦鎴愬姛锛�'){
this.LostReport = report;
+ this.isSubmit = true;
this.pageStatus = 'View';
+ console.log(this.LostReport);
this.showToast(result.message,"success");
+ this.updateRecordView(this.reportId);
+
}else{
this.showToast(result.message,"error");
}
@@ -262,14 +279,39 @@
const payloadType = event.detail.payloadType;
this.LostReport.LostBrands[index].lostBrand.Lost_By_Company__c = payload.value;
if(payloadType === 'multi-select'){
+ this.clearProducts(payload.value,index);
this.setDefaultBrand(payload.value,index);
this.clearBrandMannualName(payload.value,index);
}
}
setDefaultBrand(value,index){
- this.LostReport.LostBrands[index].LostProducts.forEach(product => {
- product.LostProductss.LostBrandName__c = value;
+ console.log('22222');
+ // this.LostReport.LostBrands[index].LostProducts.forEach(product => {
+ // product.LostProductss.LostBrandName__c = value;
+ // });
+ var newProducts = [];
+ this.LostReport.LostBrands[index].LostProducts.forEach(product=>{
+ this.newProduct.LostProductss.LostBrandName__c = value;
+ newProducts.push(JSON.parse(JSON.stringify(this.newProduct)));
});
+ this.LostReport.LostBrands[index].LostProducts = newProducts;
+ }
+ clearProducts(value,index){
+ console.log('111111');
+ var newProducts = [];
+ this.LostReport.LostBrands[index].LostProducts.forEach(product=>{
+ this.newProduct.LostProductss.LostBrandName__c = value;
+ newProducts.push(JSON.parse(JSON.stringify(this.newProduct)));
+ });
+ var elements1 = this.template.querySelectorAll('.ProductClass[data-id="' + index + '"]');
+ elements1.forEach(element=>{
+ element.readOnly = false;
+ });
+ var elements2 = this.template.querySelectorAll('.Product[data-id="' + index + '"]');
+ elements2.forEach(element=>{
+ element.clearSelection();
+ });
+ this.LostReport.LostBrands[index].LostProducts = newProducts;
}
@@ -279,10 +321,9 @@
var elements = this.template.querySelectorAll('[data-id="Lost_By_Company_Mannual"]');
elements[index].disabled = false;
elements[index].required = true;
- var elements1 = this.template.querySelectorAll('.LostProduct[data-id="' + index + '"]');
+ var elements1 = this.template.querySelectorAll('.Product[data-id="' + index + '"]');
elements1.forEach(element=>{
- element.value = '';
- element.disabled = true;
+ element.letDisabledTrue();
});
} else {
var elements = this.template.querySelectorAll('[data-id="Lost_By_Company_Mannual"]');
@@ -290,8 +331,9 @@
elements[index].value = '';
elements[index].disabled = true;
elements[index].required = false;
+ var elements1 = this.template.querySelectorAll('.Product[data-id="' + index + '"]');
elements1.forEach(element=>{
- element.disabled = false;
+ element.letDisabledFalse();
});
}
}
@@ -311,26 +353,63 @@
if(!this.flag){
return;
}
- dataEntry({
+ console.log(this.pageStatus);
+ if(this.pageStatus == 'Edit'){
+ this.pageStatus = 'View';
+ }else{
+ dataEntry({
report1 : JSON.stringify(this.LostReport)
}).then(result=>{
+ console.log(result);
if(result.error){
this.showToast(result.error,"error");
}else{
+ this.LostReport = JSON.parse(result.LostReport);
this.reportId = result.reportId;
console.log(this.LostReport);
- this.pageStatus = 'View';
+ Promise.resolve().then(() => {
+ this.pageStatus = 'View';
+ this.template.querySelectorAll('lightning-card').forEach(elem => {
+ elem.classList.toggle('View');
+ });
+ });
}
}).catch(error=>{
console.log("error");
console.log(error);
});
+ }
+
}
-
- editJs(){
- this.pageStatus = 'Edit';
+ saveBrandToEditJs(event) {
+ Promise.resolve().then(() => {
+ this.pageStatus = 'View';
+ this.template.querySelectorAll('lightning-card').forEach(elem => {
+ elem.classList.toggle('View');
+ });
+ });
}
+ editJs(){
+ Promise.resolve().then(() => {
+ this.pageStatus = 'Edit';
+ this.template.querySelectorAll('lightning-card').forEach(elem => {
+ elem.classList.toggle('Edit');
+ });
+ });
+ // var elements = this.template.querySelectorAll('.Product');
+ // console.log(elements.length);
+ // elements.forEach(element=>{
+ // var name = null;
+ // this.productNameList.forEach(product=>{
+ // if(product.index1 == element.title && product.index2 == element.name){
+ // name = product.name;
+ // }
+ // });
+ // element.editLookup(name);
+ // });
+ }
+
dataCheck(){
this.flag = true;
if(this.LostReport.lostReport.LostType__c == undefined || this.isBlank(this.LostReport.lostReport.LostType__c))
@@ -433,6 +512,66 @@
}
this.LostReport.LostBrands[index1].LostProducts.splice(index2,1);
}
+ search(topNum,secondNum){
+ console.log("sb");
+ var elements1 = this.template.querySelectorAll('.ProductClass[data-id="' + topNum + '"]');
+ var elements2 = this.template.querySelectorAll('.ProductCategory[data-id="' + topNum + '"]');
+ if (this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.LostProduct__c==null) {
+ elements1[secondNum].readOnly = false;
+ elements2[secondNum].readOnly = false;
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=null;
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].bool=false;
+ elements1[secondNum].readOnly = true;
+ elements2[secondNum].readOnly = true;
+
+ }else {
+ console.log("a");
+ searchProduct({
+ lostProduct : this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.LostProduct__c
+ }).then(result=>{
+ console.log(result);
+ var prd = JSON.parse(result);
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].productOptions = this.productOptionsList[prd.ProductClass__c];
+ if (prd.ProductCategory__c!=null) {
+ console.log("c");
+ elements1[secondNum].readOnly = false;
+ elements2[secondNum].readOnly = false;
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=prd.ProductClass__c;
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=prd.ProductCategory__c;
+ elements1[secondNum].readOnly = true;
+ elements2[secondNum].readOnly = true;
+ console.log("e");
+ // this.LostReport.LostBrands[topNum].LostProducts[secondNum].bool=true;
+ }else {
+ console.log("d");
+ elements1[secondNum].readOnly = false;
+ elements2[secondNum].readOnly = false;
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
+ this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=null;
+ elements1[secondNum].readOnly = true;
+ elements2[secondNum].readOnly = true;
+ // this.LostReport.LostBrands[topNum].LostProducts[secondNum].bool=false;
+ }
+ }).catch(error=>{
+ console.log("error");
+ console.log(error);
+ });
+
+ }
+ }
+ handleSelected(event) {
+ console.log('......');
+ var index1 = event.target.title;
+ var index2 = event.target.name;
+ // var objectname = event.detail.ObjectName;
+ this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.LostProduct__c = event.detail.Id;
+ this.LostReport.LostBrands[index1].LostProducts[index2].productName = event.detail.Name;
+ this.search(index1,index2);
+ console.log(this.LostReport);
+ // this.account = {Name : event.detail.Name, Id: event.detail.Id}
+
+ }
handleLostTypeChange(event){
var value = event.target.value;
@@ -456,15 +595,14 @@
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 + '"]');
+ var elements = this.template.querySelectorAll('.Product[data-id="' + index + '"]');
if(value == '' || value == null){
elements.forEach(element=>{
- element.value = '';
- element.disabled = true;
+ element.letDisabledTrue();
});
}else{
elements.forEach(element=>{
- element.disabled = false;
+ element.letDisabledFalse();
});
}
}
@@ -506,6 +644,7 @@
this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.LostProductMannual__c = event.target.value;
}
handleProductClassChange(event){
+ console.log("qwer");
var index1 = event.target.title;
var index2 = event.target.name;
this.LostReport.LostBrands[index1].LostProducts[index2].LostProductss.ProductClass__c = event.target.value;
diff --git a/force-app/main/default/lwc/lexSubmit/lexSubmit.js b/force-app/main/default/lwc/lexSubmit/lexSubmit.js
index f282667..cf5c027 100644
--- a/force-app/main/default/lwc/lexSubmit/lexSubmit.js
+++ b/force-app/main/default/lwc/lexSubmit/lexSubmit.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-11 16:46:48
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-11 16:48:05
+ * @LastEditTime: 2023-05-31 17:48:01
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
diff --git a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html
index cd541e0..4156541 100644
--- a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html
+++ b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-25 17:41:26
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-04 13:56:11
+ * @LastEditTime: 2023-05-30 15:07:43
-->
<!-- Code by CafeForce || www.cafeforce.com || support@cafeforce.com || Mandatory Header -->
@@ -18,7 +18,7 @@
<div class="slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click slds-is-open" aria-expanded="true" aria-haspopup="listbox" role="combobox">
<!-- Search Input -->
<div class="slds-combobox__form-element slds-input-has-icon slds-input-has-icon_right" role="none">
- <lightning-input data-id="myinput" disabled={disabled} class="inputBox" placeholder="--鏃�--" onblur={blurEvent} onclick={showOptions} onkeyup={filterOptions} value={searchString} auto-complete="off" variant="label-hidden" id="combobox-id-1" required={isRequired}></lightning-input>
+ <lightning-input data-id="myinput" disabled={disabled} class="inputBox" placeholder={placeholder} onblur={blurEvent} onclick={showOptions} onkeyup={filterOptions} value={searchString} auto-complete="off" variant="label-hidden" id="combobox-id-1" required={isRequired}></lightning-input>
<lightning-icon class="slds-input__icon" icon-name="utility:down" size="x-small" alternative-text="search"></lightning-icon>
</div>
<!-- Dropdown List -->
diff --git a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js
index 2ee7314..e795b39 100644
--- a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js
+++ b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js
@@ -18,6 +18,7 @@
@track searchString;
@track message;
@track showDropdown = false;
+ @api placeholder = '--鏃�--';
connectedCallback() {
this.showDropdown = false;
var optionData = this.options ? (JSON.parse(JSON.stringify(this.options))) : null;
diff --git a/force-app/main/default/pages/MergeAgencyActivity.page b/force-app/main/default/pages/MergeAgencyActivity.page
index 8859974..bfcc279 100644
--- a/force-app/main/default/pages/MergeAgencyActivity.page
+++ b/force-app/main/default/pages/MergeAgencyActivity.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="true" sidebar="true" id="allPage" title="MergeAgencyActivity" controller="MergeAgencyActivityController">
+<apex:page showHeader="true" sidebar="true" id="allPage" title="MergeAgencyActivity" controller="MergeAgencyActivityController" lightningStylesheets="true">
<head>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
diff --git a/force-app/main/default/pages/Xin_SearchVisitorPlace.page b/force-app/main/default/pages/Xin_SearchVisitorPlace.page
index 96d1edc..3296159 100644
--- a/force-app/main/default/pages/Xin_SearchVisitorPlace.page
+++ b/force-app/main/default/pages/Xin_SearchVisitorPlace.page
@@ -1,4 +1,4 @@
-<apex:page controller="Xin_SearchVisitorPlace" action="{!search}" contentType="plain/text">
+<apex:page controller="Xin_SearchVisitorPlace" action="{!search}" contentType="plain/text" lightningStylesheets="true">
<apex:outputPanel layout="none" rendered="{!IsOverLimit}">
<span class="result_name" style="color:red;">妫�绱㈢粨鏋滆秴杩囦簡50浠�</span><span class="result_id" style="display:none"></span><br/>
</apex:outputPanel>
--
Gitblit v1.9.1