From d77b6353ca9b59a6398df3eae9912f9fd766946d Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期六, 05 八月 2023 17:04:22 +0800
Subject: [PATCH] fix: lightning 页面确认
---
force-app/main/default/classes/TransferApplyWebService.cls | 5
force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls-meta.xml | 5
force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js | 36 ++
force-app/main/default/pages/CommunitiesSelfRegConfirm.page | 2
force-app/main/default/pages/MicrobatchSelfReg.page | 2
force-app/main/default/lwc/lexAssetMaintainPage/lexAssetMaintainPage.js | 2
force-app/main/default/pages/StdExceptionTemplate.page | 2
force-app/main/default/pages/AssessmentReport.page | 8
force-app/main/default/pages/SiteTemplate.page | 2
force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls | 20 +
force-app/main/default/pages/SetPersonalProductTarget.page | 4
force-app/main/default/pages/maintenanceContractPage.page | 2
force-app/main/default/pages/AL_MobileApp_Menus.page | 2
force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls-meta.xml | 5
force-app/main/default/lwc/lexAssetMaintainDetail/lexAssetMaintainDetail.js | 2
force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js-meta.xml | 11
force-app/main/default/pages/contact_phone.page | 2
force-app/main/default/pages/PersonalCalendar.page | 118 ++++++-
force-app/main/default/pages/SetProvinceTarget.page | 4
force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.css | 12
force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls | 98 ++++++
force-app/main/default/lwc/lexLostReturnDeliverySlip/lexLostReturnDeliverySlip.js | 2
force-app/main/default/classes/LexVMcontractUsageRateNewController.cls-meta.xml | 5
force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js | 34 ++
force-app/main/default/pages/SetProductTarget.page | 12
force-app/main/default/pages/RepPAEDecisionRecord.page | 2
force-app/main/default/pages/StraightBackAddress.page | 51 ++-
force-app/main/default/lwc/lexDetailBulkUpdate/lexDetailBulkUpdate.js | 2
force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.css | 12
force-app/main/default/pages/ListShip.page | 4
force-app/main/default/pages/DiscountProductChoosEditPage.page | 2
force-app/main/default/classes/Consumable_order_AlertController.cls | 8
force-app/main/default/classes/LexVMcontractUsageRateNewController.cls | 13
force-app/main/default/lwc/lexSubmitApprovalProcess/lexSubmitApprovalProcess.js | 71 +++-
force-app/main/default/pages/OFSInsReportLayout.page | 304 +++++++++++++------
force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js-meta.xml | 11
force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.html | 3
force-app/main/default/lwc/lexRentalApplyESetRefreshStatus/lexRentalApplyESetRefreshStatus.js | 2
force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.html | 3
force-app/main/default/pages/SetupCheck_PicklistValuesGet.page | 2
40 files changed, 702 insertions(+), 185 deletions(-)
diff --git a/force-app/main/default/classes/Consumable_order_AlertController.cls b/force-app/main/default/classes/Consumable_order_AlertController.cls
index 4af7986..c2c6c2c 100644
--- a/force-app/main/default/classes/Consumable_order_AlertController.cls
+++ b/force-app/main/default/classes/Consumable_order_AlertController.cls
@@ -2,6 +2,8 @@
public String idl {get; set;}
public boolean IS_Alert_Price_Apply {get; set;}
public ID userid {get; set;}
+
+
public Consumable_order_AlertController() {
idl = ApexPages.currentPage().getParameters().get('id');
@@ -11,6 +13,7 @@
}
public void init() {
+ String orderRecordTypeId = [select Id,DeveloperName from RecordType where SobjectType = 'Consumable_order__c' and DeveloperName = 'Order'].Id;
list<Consumable_order__c> COList =
[select id, SalesManager__c,RecordTypeId, Order_type__c, Order_status__c
from Consumable_order__c where id =:idl];
@@ -19,7 +22,8 @@
userid = UserInfo.getUserId();
if( COList[0].SalesManager__c != null
&& COList[0].SalesManager__c == userid
- && COList[0].RecordTypeId.equals('01210000000c9dt')
+ // && COList[0].RecordTypeId.equals('01210000000c9dt')
+ && COList[0].RecordTypeId.equals(orderRecordTypeId)
&& COList[0].Order_type__c.equals('璁㈠崟')
&& COList[0].Order_status__c.equals('宸叉彁浜�')){
IS_Alert_Price_Apply = true;
@@ -27,6 +31,6 @@
}
//IS_Alert_Price_Apply = true;
}
-
+
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls b/force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls
new file mode 100644
index 0000000..13a5259
--- /dev/null
+++ b/force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls
@@ -0,0 +1,20 @@
+public with sharing class LexPast2YearsRepairPriceReportController {
+ @AuraEnabled
+ public static ReturnData init(String recordId){
+ ReturnData returnData = new ReturnData();
+ String reportId = [select Id from Report where DeveloperName ='Last2YearsRepairPrice3'].Id;
+ returnData.reportId = reportId;
+
+ String mCEName = [select Name from Maintenance_Contract_Estimate__c where Id = :recordId].Name;
+ returnData.mCEName = mCEName;
+
+ return returnData;
+
+ }
+ private class ReturnData{
+ @AuraEnabled
+ public String reportId;
+ @AuraEnabled
+ public String mCEName;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls-meta.xml b/force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls-meta.xml
new file mode 100644
index 0000000..d75b058
--- /dev/null
+++ b/force-app/main/default/classes/LexPast2YearsRepairPriceReportController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>51.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls b/force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls
new file mode 100644
index 0000000..acbff85
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls
@@ -0,0 +1,98 @@
+public with sharing class LexRentalApplyESetRefreshStaController {
+
+ @AuraEnabled
+ public static String eSetRefreshStatus(String raeSetId) {
+ return eSetRefreshStatusBatch(new List<String> {raeSetId});
+ }
+
+ public static String eSetRefreshStatusBatch(List<String> raeSetIds) {
+ List<Rental_Apply_Equipment_Set__c> updateList1 = new List<Rental_Apply_Equipment_Set__c>();
+
+ if (!raeSetIds.isEmpty()) {
+ for (Rental_Apply_Equipment_Set__c raes: [
+ SELECT Id,Repair_Status1__c,Repair_Status_Text__c,Final_reply_day__c,Final_reply_day_text__c,
+ Received_Confirm_NG_Not_Return__c,Received_Confirm_NG_Not_Return_Text__c,
+ Received_Confirm_Status_Text__c, Received_Confirm_Status_F__c
+ , NG_Final_reply_day_Text__c
+ , NG_Final_reply_day_F__c
+ , Yizhouweixiu_Final_reply_day_Text__c
+ , Yizhouweixiu_Final_reply_day_F__c
+ , Extend_Final_reply_day_Text__c
+ , Extend_Final_reply_day_F__c
+ , QIS_Final_reply_day_Text__c
+ , QIS_Final_reply_day_F__c
+ , Repair_cancel_Final_reply_day_Text__c
+ , Repair_cancel_Final_reply_day_F__c
+ , Return_to_office_Final_reply_day_Text__c
+ , Return_to_office_Final_reply_day_F__c
+ , Repair_delete_Final_reply_day_Text__c
+ , Repair_delete_Final_reply_day_F__c
+ , Yigoudaihuo_Final_reply_day_Text__c
+ , Yigoudaihuo_Final_reply_day_F__c
+ , Guzhangpaicha_Final_reply_day_Text__c
+ , Guzhangpaicha_Final_reply_day_F__c
+ , Repair_Agreed_Quotation_Text__c
+ , Repair_Agreed_Quotation_F__c
+ , Return_to_office_Final_reply_day_U_RC__c
+ , Return_to_office_Final_reply_day_U_RC_F__c
+ , Extend_Date__c
+ , Extend_Date_F__c
+ , Received_NG_ReAssign_Text__c
+ , Received_NG_ReAssign__c
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 start xxf
+ , Final_reply_day_Holiday_backup__c
+ , NG_Final_reply_day_F_Holiday_backup__c
+ , NG_Final_reply_day_Text_Holiday_backup__c
+ , Yizhouweixiu_Final_reply_day_F_Holiday__c
+ , Yizhouweixiu_Final_reply_day_TextHoliday__c
+ , Extend_Final_reply_day_F_Holiday_backup__c
+ , Extend_Final_reply_day_Text_Holiday_back__c
+ , QIS_Final_reply_day_F_Holiday_backup__c
+ , QIS_Final_reply_day_Text_Holiday_backup__c
+ , Repair_cancel_Final_reply_day_F_Holiday__c
+ , Repair_cancel_Final_reply_day_Text_Holid__c
+ , Return_to_office_Final_reply_day_F_Ho__c
+ , Return_to_office_Final_reply_day_Text_Ho__c
+ , Repair_delete_Final_reply_day_F_Holiday__c
+ , Repair_delete_Final_reply_day_Text_Ho__c
+ , Yigoudaihuo_Final_reply_day_F_Holiday__c
+ , Yigoudaihuo_Final_reply_day_Text_Holiday__c
+ , FGuzhangpaicha_Final_reply_day_F_Holiday__c
+ , Guzhangpaicha_Final_reply_day_Text_Holid__c
+ , Return_to_office_Final_reply_day_U_RC_Ho__c
+ , Return_to_office_Final_reply_day_U_RC_FH__c
+ //銆怓Y23澶у強宸ㄥぇ璇鹃銆戦暱鍋囧鍝佸�熺敤寤舵湡寮�鍙� 2022/12/27 end xxf
+ FROM Rental_Apply_Equipment_Set__c
+ WHERE Id IN :raeSetIds
+ ]) {
+ Rental_Apply_Equipment_Set__c upd = UpdateRentalApplyEquipmentSetBatch.setRAES(raes);
+ if (upd != null) {
+ updateList1.add(upd);
+ }
+ }
+ }
+//bp2
+// List<Equipment_Set_Detail__c> esdList = [
+// select Id,Asset_condition__c,Asset_condition_Text__c,
+// Serial_Lot__c,Serial_Lot_text__c,
+// Asset__r.Loaner_accsessary__c, Loaner_accsessary_text__c,
+// Active_judgement__c,Active_judgement_select__c,Active_judgement_text__c,
+// Last_Reserve_RAES_Detail_RAES_F__c,Last_Reserve_RAES_Detail_RAES_Id__c,
+// Equipment_Set_Last_Reserve_RAES_F__c,Equipment_Set_Last_Reserve_RAES_Id__c
+// from Equipment_Set_Detail__c
+// where Equipment_Set__c IN :eSetIds];
+// List<Equipment_Set_Detail__c> updateList2 = UpdateRentalApplyEquipmentSetBatch.setESD(esdList);
+
+ Savepoint sp = Database.setSavepoint();
+ try {
+ if (!updateList1.isEmpty()) update updateList1;
+//bp2 if (updateList2.size() > 0) update updateList2;
+ return '1';
+ } catch (System.Exception e) {
+ Database.rollback(sp);
+ return e.getMessage();
+ }
+ // return '1';
+ }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls-meta.xml b/force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls-meta.xml
new file mode 100644
index 0000000..9662499
--- /dev/null
+++ b/force-app/main/default/classes/LexRentalApplyESetRefreshStaController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>50.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexVMcontractUsageRateNewController.cls b/force-app/main/default/classes/LexVMcontractUsageRateNewController.cls
new file mode 100644
index 0000000..3911a2e
--- /dev/null
+++ b/force-app/main/default/classes/LexVMcontractUsageRateNewController.cls
@@ -0,0 +1,13 @@
+public with sharing class LexVMcontractUsageRateNewController {
+ @AuraEnabled
+ public static String init(String recordId){
+ try {
+ String reportId = [select Id from Report where DeveloperName ='VM_contract_bottun'].Id;
+ return reportId;
+ }
+ catch (Exception e) {
+ return e.getMessage();
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexVMcontractUsageRateNewController.cls-meta.xml b/force-app/main/default/classes/LexVMcontractUsageRateNewController.cls-meta.xml
new file mode 100644
index 0000000..d75b058
--- /dev/null
+++ b/force-app/main/default/classes/LexVMcontractUsageRateNewController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>51.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/TransferApplyWebService.cls b/force-app/main/default/classes/TransferApplyWebService.cls
index 371adb6..c1a0ada 100644
--- a/force-app/main/default/classes/TransferApplyWebService.cls
+++ b/force-app/main/default/classes/TransferApplyWebService.cls
@@ -12,10 +12,12 @@
, RecordType.DeveloperName //20201202 ljh add
, BeiPinWindow__c //20201202 ljh add
, Add_Reason__c // 20210429 1831 you
+ ,RecordtypeId
FROM TransferApply__c
WHERE Id = :taId
FOR UPDATE
];
+
if (taList.isEmpty()) {
return '璋冩嫧鍗曚笉瀛樺湪銆�';
}
@@ -27,8 +29,8 @@
if(!errorList.isEmpty()) {
return String.join(errorList, '\n');
}
+ system.debug('zzm :'+ta.Status__c +',RecordtypeId:' +ta.RecordtypeId);
if(ta.Status__c == '鑽夋涓�') {
-
ta.Status__c = '濉啓瀹屾瘯';
}
else {
@@ -172,6 +174,7 @@
WHERE Id = :taId
FOR UPDATE
];
+
if (taList.isEmpty()) {
return '璋冩嫧鍗曚笉瀛樺湪銆�';
}
diff --git a/force-app/main/default/lwc/lexAssetMaintainDetail/lexAssetMaintainDetail.js b/force-app/main/default/lwc/lexAssetMaintainDetail/lexAssetMaintainDetail.js
index 3b0f923..5b870d2 100644
--- a/force-app/main/default/lwc/lexAssetMaintainDetail/lexAssetMaintainDetail.js
+++ b/force-app/main/default/lwc/lexAssetMaintainDetail/lexAssetMaintainDetail.js
@@ -30,7 +30,7 @@
}
async cancelSubmit(){
- window.open('/apex/AssetMaintainDetail?id='+this.recordId,'AssetMaintainDetail', 'width=600,height=200');
+ window.open('/apex/AssetMaintainDetail?id='+this.recordId,'_blank');
}
}
diff --git a/force-app/main/default/lwc/lexAssetMaintainPage/lexAssetMaintainPage.js b/force-app/main/default/lwc/lexAssetMaintainPage/lexAssetMaintainPage.js
index 75d71ca..59b020d 100644
--- a/force-app/main/default/lwc/lexAssetMaintainPage/lexAssetMaintainPage.js
+++ b/force-app/main/default/lwc/lexAssetMaintainPage/lexAssetMaintainPage.js
@@ -30,6 +30,6 @@
}
async cancelSubmit(){
- window.open('/apex/AssetMaintain?id='+this.recordId,'lexAssetMaintainPage', 'width=600,height=200');
+ window.open('/apex/AssetMaintain?id='+this.recordId,'_blank');
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexDetailBulkUpdate/lexDetailBulkUpdate.js b/force-app/main/default/lwc/lexDetailBulkUpdate/lexDetailBulkUpdate.js
index fedf726..9259ff1 100644
--- a/force-app/main/default/lwc/lexDetailBulkUpdate/lexDetailBulkUpdate.js
+++ b/force-app/main/default/lwc/lexDetailBulkUpdate/lexDetailBulkUpdate.js
@@ -30,7 +30,7 @@
}
async cancelSubmit(){
- window.open('/apex/TransferApplySelectDetailSub?id='+this.recordId,'DetailBulkUpdateLWC', 'width=600,height=200');
+ window.open('/apex/TransferApplySelectDetailSub?id='+this.recordId,'_blank');
}
//old js
diff --git a/force-app/main/default/lwc/lexLostReturnDeliverySlip/lexLostReturnDeliverySlip.js b/force-app/main/default/lwc/lexLostReturnDeliverySlip/lexLostReturnDeliverySlip.js
index 5d79272..4403b8d 100644
--- a/force-app/main/default/lwc/lexLostReturnDeliverySlip/lexLostReturnDeliverySlip.js
+++ b/force-app/main/default/lwc/lexLostReturnDeliverySlip/lexLostReturnDeliverySlip.js
@@ -30,7 +30,7 @@
}
async cancelSubmit(){
- window.open('/apex/Lost_Return_DeliverySlip?id='+this.recordId,'LostReturnDeliverySlip', 'width=600,height=200');
+ window.open('/apex/Lost_Return_DeliverySlip?id='+this.recordId,'_blank');
}
//old js
diff --git a/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.css b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.css
new file mode 100644
index 0000000..426333e
--- /dev/null
+++ b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.css
@@ -0,0 +1,12 @@
+.exampleHolder{
+ position: relative;
+ top: 0;
+ width: 0;
+ left: 0;
+ right: 0;
+ margin: 0 auto;
+}
+
+.uiContainerManager {
+ display:none;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.html b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.html
new file mode 100644
index 0000000..af9fa97
--- /dev/null
+++ b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js
new file mode 100644
index 0000000..a5e0165
--- /dev/null
+++ b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js
@@ -0,0 +1,34 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+
+import init from '@salesforce/apex/LexPast2YearsRepairPriceReportController.init';
+export default class lexPast2YearsRepairPriceReport extends LightningElement {
+ @api recordId;
+
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(returnData => {
+ console.log(returnData);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ // /lightning/r/Report/00O100000058Bzh/view?fv0={!Maintenance_Contract_Estimate__c.Name}
+ window.location="/lightning/r/Report/" + returnData.reportId+'/view?fv0='+returnData.mCEName;
+ this.IsLoading = false;
+ })
+ }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js-meta.xml b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js-meta.xml
new file mode 100644
index 0000000..379f040
--- /dev/null
+++ b/force-app/main/default/lwc/lexPast2YearsRepairPriceReport/lexPast2YearsRepairPriceReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexPast2YearsRepairPriceReport">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRentalApplyESetRefreshStatus/lexRentalApplyESetRefreshStatus.js b/force-app/main/default/lwc/lexRentalApplyESetRefreshStatus/lexRentalApplyESetRefreshStatus.js
index 8fa57d9..fa94641 100644
--- a/force-app/main/default/lwc/lexRentalApplyESetRefreshStatus/lexRentalApplyESetRefreshStatus.js
+++ b/force-app/main/default/lwc/lexRentalApplyESetRefreshStatus/lexRentalApplyESetRefreshStatus.js
@@ -4,7 +4,7 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
-import eSetRefreshStatus from '@salesforce/apex/RentalApplyESetRefreshStatusController.eSetRefreshStatus';
+import eSetRefreshStatus from '@salesforce/apex/LexRentalApplyESetRefreshStaController.eSetRefreshStatus';
export default class lexRentalApplyESetRefreshStatus extends LightningElement {
@api raeSetId;
IsLoading=true;
diff --git a/force-app/main/default/lwc/lexSubmitApprovalProcess/lexSubmitApprovalProcess.js b/force-app/main/default/lwc/lexSubmitApprovalProcess/lexSubmitApprovalProcess.js
index 4a51737..49ebe4e 100644
--- a/force-app/main/default/lwc/lexSubmitApprovalProcess/lexSubmitApprovalProcess.js
+++ b/force-app/main/default/lwc/lexSubmitApprovalProcess/lexSubmitApprovalProcess.js
@@ -13,6 +13,7 @@
@api recordId;
transferApplyPermission;
IsLoading=true;
+ cancelResult;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -34,17 +35,8 @@
console.log('this.transferApplyId:' + this.recordId);
applyPermission().then(result => {
console.log(result);
- this.transferApplyPermission = result;
- this.cancelSubmit();
-
- }).catch( error =>{
- console.log(error);
- });
- }
-
- cancelSubmit(){
-
- if (this.transferApplyPermission == false) {
+ this.transferApplyPermission = result;
+ if (this.transferApplyPermission == false) {
this.showToast('','娌℃湁鎻愪氦鐢宠鐨勬潈闄�','warning');
this.IsLoading=false;
this.dispatchEvent(new CloseActionScreenEvent());
@@ -56,26 +48,59 @@
}).then(cancel=>{
if(cancel) {
submitApply({taId:this.recordId}).then(submitRes=>{
- if(submitRes == '1'){
- this.showToast('','鎻愪氦鎴愬姛','success');
- setTimeout(function(){
- window.location.href = window.location;
- }, 1500 );
- }else{
- this.showToast("",submitRes,"warning");
- }
+ console.log(submitRes);
+ this.cancelResult = submitRes;
+ this.cancelSubmit().then(res=>{
+ this.IsLoading=false;
+ this.dispatchEvent(new CloseActionScreenEvent());
+ });
- });
- this.IsLoading=false;
- this.dispatchEvent(new CloseActionScreenEvent());
+ }).catch( error =>{
+ this.showToast("",submitRes,"error");
+ });
+ // this.IsLoading=false;
+ // this.dispatchEvent(new CloseActionScreenEvent());
} else{
this.IsLoading=false;
this.dispatchEvent(new CloseActionScreenEvent());
}
+
});
- }
+ }
+
+
+ }).catch( error =>{
+ console.log(error);
+ });
+ }
+
+
+ async cancelSubmit(){
+ console.log(this.cancelResult);
+ if(this.cancelResult == '1') {
+ console.log(this.cancelResult);
+ this.dispatchEvent(
+ new ShowToastEvent({
+ message:'鎻愪氦鎴愬姛',
+ variant: "success"
+ })
+ );
+ setTimeout(function(){
+ window.location.href = window.location;
+ }, 1500 )
+ } else {
+ this.dispatchEvent(
+ new ShowToastEvent({
+ message:this.cancelResult,
+ variant: "warning"
+ })
+ );
+ console.log("result:",this.cancelResult);
+ // await this.showToast("",this.cancelResult,"warning");
+ }
+
}
showToast(_title,_message,_variant) {
diff --git a/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.css b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.css
new file mode 100644
index 0000000..426333e
--- /dev/null
+++ b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.css
@@ -0,0 +1,12 @@
+.exampleHolder{
+ position: relative;
+ top: 0;
+ width: 0;
+ left: 0;
+ right: 0;
+ margin: 0 auto;
+}
+
+.uiContainerManager {
+ display:none;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.html b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.html
new file mode 100644
index 0000000..af9fa97
--- /dev/null
+++ b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js
new file mode 100644
index 0000000..bf98555
--- /dev/null
+++ b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js
@@ -0,0 +1,36 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+
+import init from '@salesforce/apex/LexVMcontractUsageRateNewController.init';
+
+export default class lexVMcontractUsageRateNew extends LightningElement {
+ @api recordId;
+
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ console.log(result);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ // /lightning/r/Report/00O10000006S0oF/view?fv0={!Maintenance_Contract__c.Id}
+
+ // /00O10000006S0oF?pv0={!Maintenance_Contract__c.Id}
+ window.location="/lightning/r/Report/" + result+'/view?fv0='+this.recordId;
+ this.IsLoading = false;
+ })
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js-meta.xml b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js-meta.xml
new file mode 100644
index 0000000..5e656c7
--- /dev/null
+++ b/force-app/main/default/lwc/lexVMcontractUsageRateNew/lexVMcontractUsageRateNew.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexVMcontractUsageRateNew">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/pages/AL_MobileApp_Menus.page b/force-app/main/default/pages/AL_MobileApp_Menus.page
index 28835ed..aa599a7 100644
--- a/force-app/main/default/pages/AL_MobileApp_Menus.page
+++ b/force-app/main/default/pages/AL_MobileApp_Menus.page
@@ -1,4 +1,4 @@
-<apex:page docType="html-5.0" applyHtmlTag="false" showHeader="false" sidebar="false" standardStylesheets="false">
+<apex:page docType="html-5.0" applyHtmlTag="false" showHeader="false" sidebar="false" standardStylesheets="false" lightningStylesheets='true'>
<!-- 銉兗銉囥偅銉炽偘涓� -->
<div ng-show="working" style="padding-top:40px; text-align:center">
diff --git a/force-app/main/default/pages/AssessmentReport.page b/force-app/main/default/pages/AssessmentReport.page
index dfa52c0..cdce73c 100644
--- a/force-app/main/default/pages/AssessmentReport.page
+++ b/force-app/main/default/pages/AssessmentReport.page
@@ -1,12 +1,13 @@
-<apex:page sidebar="false" showHeader="true" action="{!init}" standardcontroller="AssessmentReport__c" extensions="AssessmentReportController" id="allPage" lightningStylesheets='true'>
+<apex:page sidebar="false" showHeader="true" action="{!init}" standardcontroller="AssessmentReport__c" extensions="AssessmentReportController" id="allPage" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<apex:includeScript value="{!URLFOR($Resource.AWSService, 'AWSService.js') }" />
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<style>
- /*鐐瑰嚮鎺堣鍐呭涔嬪悗锛岄〉闈㈡牱寮忛敊涔�*/
+ /*鐐瑰嚮鎺堣鍐呭涔嬪悗锛岄〉闈�*/
body .detailList .dataCol input[type="text"],body .detailList .dataCol select {
min-width: 8rem;
}
@@ -42,6 +43,9 @@
}
for(var i=0;i<contacts.length;i++){
contact[contacts[i].dataId] = contacts[i].lastName.replace(/"/g,"");
+ //2023 07 04 寮犺但闃� PIPL鏀归�� Start
+ document.getElementById(contacts[i].dataId).innerHTML = contact[contacts[i].dataId];
+ //2023 07 04 寮犺但闃� PIPL鏀归�� End
}
console.log(JSON.stringify(contact));
};
diff --git a/force-app/main/default/pages/CommunitiesSelfRegConfirm.page b/force-app/main/default/pages/CommunitiesSelfRegConfirm.page
index 33f9830..411e8c0 100644
--- a/force-app/main/default/pages/CommunitiesSelfRegConfirm.page
+++ b/force-app/main/default/pages/CommunitiesSelfRegConfirm.page
@@ -1,4 +1,4 @@
-<apex:page id="communitiesSelfRegConfirmPage" controller="CommunitiesSelfRegConfirmController" showHeader="true" cache="false" title="{!$Label.site.registration_confirmation}" >
+<apex:page id="communitiesSelfRegConfirmPage" controller="CommunitiesSelfRegConfirmController" showHeader="true" cache="false" title="{!$Label.site.registration_confirmation}" lightningStylesheets="true" >
<apex:define name="body">
<center>
<apex:panelGrid bgcolor="white" columns="1" style="align: center;">
diff --git a/force-app/main/default/pages/DiscountProductChoosEditPage.page b/force-app/main/default/pages/DiscountProductChoosEditPage.page
index 35aeb68..f9c5db1 100644
--- a/force-app/main/default/pages/DiscountProductChoosEditPage.page
+++ b/force-app/main/default/pages/DiscountProductChoosEditPage.page
@@ -1,4 +1,4 @@
-<apex:page standardcontroller="DiscountProductApplication__c" sidebar="false">
+<apex:page standardcontroller="DiscountProductApplication__c" sidebar="false" lightningStylesheets='true'>
<!-- <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/> -->
<script type="text/javascript">
diff --git a/force-app/main/default/pages/ListShip.page b/force-app/main/default/pages/ListShip.page
index a84c571..e3a1d6e 100644
--- a/force-app/main/default/pages/ListShip.page
+++ b/force-app/main/default/pages/ListShip.page
@@ -42,9 +42,9 @@
<th style="text-align:right; width:60px;">鍖婚櫌</th>
<td style="text-align:left; width:75px;"><apex:inputText value="{!enduser}" style="width:95%;"/></td>
<th style="text-align:right; width:60px;">{!$ObjectType.Ship__c.fields.Shipping_date__c.Label}</th>
- <td style="text-align:left; width:75px;"><apex:inputField value="{!dateFrom.Birth_Date__c}" style="width:95%;"/></td>
+ <td style="text-align:left; width:75px;"><apex:inputField value="{!dateFrom.Birth_Date__c}" /></td>
<td style="text-align:left; width:10px;">锝�</td>
- <td style="text-align:left; width:75px;"><apex:inputField value="{!dateTo.Birth_Date__c}" style="width:95%;"/></td>
+ <td style="text-align:left; width:75px;"><apex:inputField value="{!dateTo.Birth_Date__c}" /></td>
</tr>
</table>
<table style="width:100%; border: 0; border-collapse: collapse; margin: 10px 0 10px 0; " id="searchTbl2">
diff --git a/force-app/main/default/pages/MicrobatchSelfReg.page b/force-app/main/default/pages/MicrobatchSelfReg.page
index 96b3069..776abe2 100644
--- a/force-app/main/default/pages/MicrobatchSelfReg.page
+++ b/force-app/main/default/pages/MicrobatchSelfReg.page
@@ -1,4 +1,4 @@
-<apex:page id="microbatchSelfRegPage" showHeader="true" controller="MicrobatchSelfRegController" title="{!$Label.site.user_registration}">
+<apex:page id="microbatchSelfRegPage" showHeader="true" controller="MicrobatchSelfRegController" title="{!$Label.site.user_registration}" lightningStylesheets="true">
<apex:define name="body">
<center>
<apex:form id="theForm" forceSSL="true">
diff --git a/force-app/main/default/pages/OFSInsReportLayout.page b/force-app/main/default/pages/OFSInsReportLayout.page
index 5d2d335..0c79451 100644
--- a/force-app/main/default/pages/OFSInsReportLayout.page
+++ b/force-app/main/default/pages/OFSInsReportLayout.page
@@ -9,6 +9,7 @@
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<style type="text/css">
table#AssetTable select {
width: 98%;
@@ -30,7 +31,59 @@
.dateFormat {
display: none;
}
-
+ body label, .slds-vf-scope label {
+ font-size: .875rem;
+ }
+ table.detailList th, table.detailList td{
+
+ vertical-align: middle;
+ }
+ body .bPageBlock .detailList .labelCol label, .slds-vf-scope .bPageBlock .detailList .labelCol label {
+ margin-top: -0.125rem;
+ }
+
+ body .bPageBlock .detailList .dataCol {
+ width: auto;
+ }
+
+ table.detailList td.dataCol.last input {
+ width: 150px;
+ }
+ div[field-api="Reporter__c"] .lookupInput {
+ margin-left: 10px;
+ }
+ body .detailList .dataCol input[type="text"] {
+ min-width: 71px;
+ margin-top: -4px;
+ }
+ table.detailList td.dataCol.last input[field-api="Responsible_Person__c"] {
+ margin-left: -5px;
+ }
+ table.detailList td.dataCol input[field-api="Manual_Department__c"] {
+ min-width: 368px;
+ }
+ table.detailList td.dataCol input[field-api="Hospital__c"] {
+ min-width: 362px;
+ }
+
+ /*20230719 ljh start*/
+ .mytable .pbSubsection .detailList tr td,.mytable .pbSubsection .detailList th td{
+ height: 40px;
+ line-height: 40px;
+ }
+ .mytable tr td label{
+ margin-right: 0;
+ margin-left: 5px;
+ }
+ body .bPageBlock .mytable .detailList .labelCol{
+ width:10%;
+ height: 40px;
+ line-height: 40px;
+ }
+ .mytable .dataCol select{
+ margin-bottom: 0;
+ }
+ /*20230719 ljh end*/
</style>
<script type="text/javascript">
var tmpaid = "";
@@ -143,9 +196,6 @@
blockme();
//callback();return;
//<input type="hidden" value="{!ir.Id}" id="IrId"/>
-
- //<input type="hidden" value="{!ir.Responsible_Person_Encrypted__c}" id="Responsible_Person_Encrypted__c"/>
- //<input type="hidden" value="{!ir.phone_Encrypted__c}" id="phone_Encrypted__c"/>
let e_id = document.getElementById("IrId");
let url = staticResource.newUrl;
@@ -172,9 +222,7 @@
document.getElementById("Page:Form:Block:AWS_Data_Id__c").value = aws_data1.dataId;
j$("[field-api='phone__c']").val(aws_data1.phone);
- //document.getElementById("Page:Form:Block:phone_Encrypted__c").value = aws_data1.phoneEncrypt; //zhj 鏂版柟妗堟敼閫� 2022-12-05
j$("[field-api='Responsible_Person__c']").val(aws_data1.responsiblePerson);
- //document.getElementById("Page:Form:Block:Responsible_Person_Encrypted__c").value = aws_data1.responsiblePersonEncrypt; //zhj 鏂版柟妗堟敼閫� 2022-12-05
if (callback) {
callback();
@@ -185,6 +233,7 @@
function saveBtnJs(){
Encrypt(saveBtn);
}
+
function submitJs(){
Encrypt(submit);
}
@@ -279,7 +328,7 @@
</head>
<body>
<!-- HWAG-B4Q3G5 20180918Start -->
- <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}">>
+ <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}">
<!-- HWAG-B4Q3G5 20180918End -->
<script type="text/javascript">
// 淇濆瓨寰屻�佹柊瑕忋伄鍫卞憡鏇窱D銈掑彇寰�
@@ -315,19 +364,19 @@
<table>
<tr>
<td><apex:outputLabel value="{!$ObjectType.Inspection_Report__c.Label}:" style="font-size:18px;font-weight:bold;padding-right: 5px;"/></td>
- <td>锛�<apex:inputCheckBox value="{!ir.Name_Manual__c}" id="Name_Manual" onchange="toggleIrNameDisabled(this);return false;"/>
+ <td>锛� <apex:inputCheckBox value="{!ir.Name_Manual__c}" id="Name_Manual" onchange="toggleIrNameDisabled(this);return false;"/>
<apex:outputLabel value="{!$ObjectType.Inspection_Report__c.fields.Name_Manual__c.Label}" for="Name_Manual"/>锛�
- <apex:inputField value="{!ir.Name}" id="Ir_Name" html-disabled="disabled" style="border-width:0px;font-size:18px;font-weight:bold;padding-right:20px;-webkit-text-fill-color:black;"/>
+ <apex:inputField value="{!ir.Name}" id="Ir_Name" html-disabled="disabled" style="border-width:1px;font-size:18px;font-weight:bold;padding-right:20px;margin-right: 10px;-webkit-text-fill-color:black;"/>
</td>
<td style="text-align: center;padding-right: 100px;"><input class="btn" type="Button" style="width:80px;" value="淇濆瓨" action="" onclick="saveBtnJs();" rerender="Form" onComplete="unblockUI();"/></td>
<td style="text-align: center;padding-right: 100px;"><input class="btn" type="Button" value="鎻愪氦" action="" onclick="submitJs();" style="width:80px" rerender="Form" id="submitButton" onComplete="unblockUI();"/></td>
- <td style="text-align: center;padding-right: 100px;"><apex:commandButton style="width:80px;" value="鍏抽棴绐楀彛" onclick="location.href='/apex/OFSWindowClose';return false;" id="closeButton"/></td>
+ <td style="text-align: center;padding-right: 100px;"><apex:commandButton style="width:90px;" value="鍏抽棴绐楀彛" onclick="location.href='/apex/OFSWindowClose';return false;" id="closeButton"/></td>
<td style="text-align: center;"><input class="btn" type="Button" style="width:80px;" value="PDF" action="" onclick="showPDFJs();" rerender="Form" onComplete="unblockUI();"/></td>
</tr>
</table>
<apex:pageBlockSection title="{!sectionList[0].title}" columns="{!sectionList[0].column}" showHeader="{!sectionList[0].showHeader}" rendered="{!sectionList.size>0}">
<apex:repeat value="{!sectionList[0].sectionItemList}" var="sectionItem" id="SectionItemList">
- <apex:outputField value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&NOT(sectionItem.isInput)}"/>
+ <apex:outputField value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&NOT(sectionItem.isInput)}" />
<apex:inputField style="width:{!sectionItem.width};height:{!sectionItem.height};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&§ionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}"/>
<apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&Not(isNull(sectionItem.customizeLable))}">
<apex:outputLabel value="{!sectionItem.customizeLable}"/>
@@ -338,8 +387,8 @@
<apex:outputField value="{!ir[api]}"/>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(api == 'Hospital__c' && ir.Id != '')}">
- <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}"/>
- <apex:inputField value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}"/>
+ <apex:outputLabel style="font-weight: bold; padding-right: 5px; " value="{!sectionItem.apiLabelMap[api]}"/>
+ <apex:inputField value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />
<apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">
<apex:outputField value="{!ir[api]}"/>
</apex:outputPanel>
@@ -369,49 +418,64 @@
<apex:inputHidden value="{!ir.phone_Encrypted__c}" id="phone_Encrypted__c"/> -->
<!-- zhj 鏂版柟妗堟敼閫� 2022-12-05 end-->
<apex:inputHidden value="{!ir.AWS_Data_Id__c}" id="AWS_Data_Id__c"/>
-
-
-
<apex:repeat value="{!sectionList}" var="section" id="SectionList">
- <apex:pageBlockSection title="{!section.title}" columns="{!section.column}" showHeader="{!section.showHeader}" rendered="{!!section.isTop}">
- <apex:repeat value="{!section.sectionItemList}" var="sectionItem" id="SectionItemList">
- <apex:outputField value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&NOT(sectionItem.isInput)}"/>
- <apex:inputField html-field-api="{!sectionItem.api}" style="width:{!sectionItem.width};height:{!sectionItem.height};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&§ionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}"/>
- <apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&Not(isNull(sectionItem.customizeLable))}">
- <apex:outputLabel value="{!sectionItem.customizeLable}"/>
- <apex:outputPanel layout="none">
- <apex:repeat value="{!sectionItem.apiList}" var="api">
- <!-- 淇濆瓨寰屻�佺梾闄€伅寮峰埗outputField -->
- <apex:outputPanel layout="none" rendered="{!api == 'Hospital__c' && ir.Id != ''}">
- <apex:outputField value="{!ir[api]}"/>
-</apex:outputPanel>
-<apex:outputPanel layout="none" rendered="{!NOT(api == 'Hospital__c' && ir.Id != '')}">
-<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}"/>
-<apex:inputField html-field-api="{!api}" value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}"/>
-<apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">
-<apex:outputField value="{!ir[api]}"/>
-</apex:outputPanel>
-</apex:outputPanel>
+ <apex:pageBlockSection title="{!section.title}" columns="{!section.column}" showHeader="{!section.showHeader}" rendered="{!!section.isTop}" html-class="mytable">
+ <apex:repeat value="{!section.sectionItemList}" var="sectionItem" id="SectionItemList">
+ <apex:outputField value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&NOT(sectionItem.isInput)}"/>
+ <!-- 20230719 ljh -->
+ <!-- <apex:inputField html-field-api="{!sectionItem.api}" style="width:{!sectionItem.width};height:{!sectionItem.height};margin-left:17px;" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&§ionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}"/> -->
+ <apex:inputField html-field-api="{!sectionItem.api}" style="width:{!sectionItem.width};height:{!sectionItem.height};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&§ionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}"/>
+ <apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&Not(isNull(sectionItem.customizeLable))}">
+ <apex:outputLabel value="{!sectionItem.customizeLable}" />
+ <apex:outputPanel layout="none">
+ <apex:repeat value="{!sectionItem.apiList}" var="api">
+ <!-- 淇濆瓨寰屻�佺梾闄€伅寮峰埗outputField -->
+ <apex:outputPanel layout="none" rendered="{!api == 'Hospital__c' && ir.Id != ''}">
+ <apex:outputField value="{!ir[api]}"/>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!NOT(api == 'Hospital__c' && ir.Id != '')}">
+ <!-- 20230719 ljh -->
+ <!-- <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}"/> -->
+ <apex:outputLabel style="font-weight: bold;" value="{!sectionItem.apiLabelMap[api]}"/>
+ <apex:inputField html-field-api="{!api}" value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}"/>
+ <apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">
+ <!-- <apex:outputField value="{!ir[api]}"/> -->
+ {!ir[api]}
+ </apex:outputPanel>
+ </apex:outputPanel>
+ </apex:repeat>
+ </apex:outputPanel>
+ </apex:pageblockSectionItem>
+ <apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&(isNull(sectionItem.customizeLable))}">
+ <apex:outputPanel layout="none">
+ <apex:repeat value="{!sectionItem.apiList}" var="api">
+ <!-- 20230719 ljh -->
+ <!-- <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}"/> -->
+ <apex:outputLabel style="font-weight: bold;" value="{!sectionItem.apiLabelMap[api]}"/>
+ <apex:inputField html-field-api="api" value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}"/>
+ <apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">
+ <apex:outputField value="{!ir[api]}"/>
+ </apex:outputPanel>
+ </apex:repeat>
+ </apex:outputPanel>
+ </apex:pageblockSectionItem>
+ <apex:pageBlockSectionItem rendered="{!sectionItem.isDummy}"/>
+ </apex:repeat>
+ </apex:pageBlockSection>
</apex:repeat>
+<!-- zzm add 230726 start -->
+<apex:outputPanel >
+ <table class="edittable" border="0" style="border-collapse: collapse; table-layout:fixed;margin-bottom:20px;margin-top: -10px;">
+ <tr>
+ <td style='width: 120px;text-align: right;'>{!$ObjectType.Inspection_Report__c.fields.Agency__c.Label}</td>
+ <td style='min-width: 360px;padding-left: 20px;'><apex:inputField value="{!ir.Agency__c}" style="min-width: 368px;"/></td>
+ <td style='width: 178px;text-align: right;'>{!$ObjectType.Inspection_Report__c.fields.Agency_Contact_Id__c.Label}</td>
+ <td style='min-width: 360px;padding-left: 20px;'><apex:inputField value="{!ir.Agency_Contact_Id__c}" style="width:161px;"/></td>
+ </tr>
+</table>
</apex:outputPanel>
-</apex:pageblockSectionItem>
-<apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&(isNull(sectionItem.customizeLable))}">
-<apex:outputPanel layout="none">
-<apex:repeat value="{!sectionItem.apiList}" var="api">
-<apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}"/>
-<apex:inputField html-field-api="api" value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}"/>
-<apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">
-<apex:outputField value="{!ir[api]}"/>
-</apex:outputPanel>
-</apex:repeat>
-</apex:outputPanel>
-</apex:pageblockSectionItem>
-<apex:pageBlockSectionItem rendered="{!sectionItem.isDummy}"/>
-</apex:repeat>
-</apex:pageBlockSection>
-</apex:repeat>
-
+<!-- zzm add 230726 end -->
<script type="text/javascript">
// 鐥呴櫌銇乏鍋淬�屽埛鏂般�嶃儨銈裤兂杩藉姞
var labels = document.getElementsByTagName("label");
@@ -425,15 +489,58 @@
}
}
</script>
-<apex:pageBlockSection title="宸查�変繚鏈夎澶囧瓧娈靛巻鍙�" columns="1" id="CheckSection">
+<!-- zzm add 230726 start -->
+<apex:pageBlockSection title="鍖婚櫌绉戝鎯呭喌璋冩煡" columns="1" id="UnCheckSection1" >
+ <apex:outputPanel >
+ <table class="edittable" border="0" style="border-collapse: collapse; table-layout:fixed;">
+ <tr>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Department_Leakage_Frequency__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Department_Leakage_Frequency__c}" style="width: 90%" required="true"/></td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Original_Leakage_Device__c.Label}:</td>
+ <td>
+ <apex:inputField value="{!ir.Original_Leakage_Device__c}" style="width: 90%" required="true"/>
+ </td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Leakage_Status__c.Label}:</td>
+ <td>
+ <apex:inputField value="{!ir.Leakage_Status__c}" id="Leakage_Status" required="true" style="width: 90%"/>
+ </td>
+
+ </tr>
+
+ <tr>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Disinfectant_type__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Disinfectant_type__c}" required="true" style="width: 90%"/></td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Cleaning_Solution_Brand__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Cleaning_Solution_Brand__c}" style="width: 90%" required="true"/></td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Disinfection_Method__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Disinfection_Method__c}" style="width: 90%" required="true"/></td>
+
+ </tr>
+ <tr>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Escrow__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Escrow__c}" style="width: 90%" required="true"/></td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Third_Party_Maintenance__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Third_Party_Maintenance__c}" style="width: 90%" required="true"/></td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.CustomerSuggestion__c.Label}:</td>
+ <td>
+ <apex:inputField value="{!ir.CustomerSuggestion__c}" style="width: 90%"/>
+ </td>
+
+ </tr>
+
+</table>
+<!-- zzm add 230726 end -->
+ </apex:outputPanel>
+</apex:pageBlockSection>
+<apex:pageBlockSection title="璁惧鐐规缁撴灉" columns="1" id="CheckSection">
<input type="hidden" id="ProductCnt" value="{!productCount}" />
-<apex:outputPanel >
+<apex:outputPanel style="padding-top:0px;">
<table width="100%">
<tr>
<td> </td>
- <td width="100px">
- <span>鍏�</span>
+ <td width="120px">
+ <span style='display: inline-block;line-height: 30px; vertical-align: middle; margin-top: -18px;'>鍏�</span>
<select style="vertical-align:text-bottom" id="allCheckResult" size="1" onchange="changeAllCheckResult(this.value);">
<option value=" ">--鏃�--</option>
<!-- 榛樿鍏∣K -->
@@ -445,19 +552,19 @@
<!-- add by rentx 20210630 end -->
</select>
</td>
- <td width="500px"> </td>
+ <td width="485px"> </td>
</tr>
</table>
<!-- TODO minus scroll with -->
<table id="AssetTableHeader" class="list" style="border-bottom-width: 0px; font-size:13px;" border="0" cellspacing="0" cellpadding="0">
<tr style="border-bottom: 1px groove rgba(254, 254, 254, 0.48);background: #f2f3f3;">
<!-- add by rentx 20210809 -->
- <th class="headerCell" style="width:14px"> <apex:inputCheckbox id="checkAll1" onclick="checkAll(this)" /> </th>
+ <th class="headerCell" style="width:14px"> <apex:inputCheckbox id="checkAll1" onclick="checkAll(this)" style="margin-left: 5px;"/> </th>
<!-- <th class="headerCell" style="width:14px" /> -->
<!-- add by rentx 202120809 -->
- <th class="headerCell" style="width:24px"/>
+ <th class="headerCell" style="width:24px">No.</th>
<th class="headerCell" style="width:60px">{!$ObjectType.Asset.fields.Asset_situation__c.label}</th>
- <th class="headerCell">{!$ObjectType.Asset.fields.Name.label}</th>
+ <th class="headerCell" style="width:302px">{!$ObjectType.Asset.fields.Name.label}</th>
<th class="headerCell" style="width:100px">{!$ObjectType.Inspection_Item__c.Fields.SerialNumber__c.Label}</th>
<!-- TODO 闋呯洰銇綔鎴� -->
<th class="headerCell" style="width:80px">涓婃鐐规鏃�</th>
@@ -471,18 +578,19 @@
<th class="headerCell" style="width:100px">{!$ObjectType.Inspection_Item__c.Fields.Diagnosis__c.Label}</th>
<!-- add by rentx 20210630 -->
<th class="headerCell" style="width:85px">{!$ObjectType.Inspection_Item__c.Fields.Abandonment_Reasons__c.Label}</th>
+ <th class="headerCell" style="width:16px"></th>
<!-- add by rentx 20210630 -->
- <th class="headerCell" style="width:35px">{!$ObjectType.Asset.Fields.Create_repair__c.Label}</th>
+ <!-- <th class="headerCell" style="width:35px">{!$ObjectType.Asset.Fields.Create_repair__c.Label}</th> -->
<!-- <td class="headerScroll"></td> -->
</tr>
</table>
-<div style="height:320px; width:100%; overflow:auto;">
+<div style="height:340px; width:100%; overflow:auto;">
<table style="border-collapse:collapse; width:100%;" id="AssetTable">
<apex:variable value="{!1}" var="cnt" />
<apex:repeat value="{!checkedInfoList}" var="cInfo" id="CheckedInfoList" >
<tr style="border-bottom: 1px groove rgba(254, 254, 254, 0.48);">
- <td style="width:14px">
+ <td style="width:33px">
<apex:inputCheckbox value="{!cInfo.rec_checkBox_c}" id="AssetRowCheckbox1" rendered="{!Not(cInfo.IsManual)}"/>
<apex:outputText value="{!cInfo.IsManual}" id="IsManual" style="display:none;" />
<input type="hidden" value="{!cInfo.rec.Id}" id="CheckAssetId"/>
@@ -494,7 +602,7 @@
<td class="dataCell">
<!-- HWAG-BDCA9J 娣诲姞浜� onclick blurProduct 鍐呭 start-->
<apex:outputField value="{!cInfo.rec.Name}" rendered="{!Not(cInfo.IsManual)}"/>
- <apex:inputField value="{!cInfo.ah.Product_Manual__c}" id="Assert" style="width:90%;" rendered="{!cInfo.IsManual}"
+ <apex:inputField value="{!cInfo.ah.Product_Manual__c}" id="Assert" style="width:100%;" rendered="{!cInfo.IsManual}"
onclick="if(!blurProduct(this))return false;"/>
<!-- HWAG-BDCA9J 娣诲姞浜� onclick blurProduct 鍐呭 end-->
</td>
@@ -521,18 +629,18 @@
<apex:inputField value="{!cInfo.ah.Fault_Classification3__c}" id="cat3" />
</td>
<td class="dataCell" style="width:100px">
- <apex:inputField value="{!cInfo.ah.Diagnosis__c}" style="width:93%"/>
+ <apex:inputField value="{!cInfo.ah.Diagnosis__c}" style="width:98%"/>
</td>
<!-- add by rentx 20210630 -->
<td class="dataCell" style="width:85px">
<apex:inputField value="{!cInfo.ah.Abandonment_Reasons__c}" style="width:93%" />
</td>
<!-- add by rentx 20210630 -->
- <td class="dataCell" style="width:35px">
+ <!-- <td class="dataCell" style="width:35px">
<apex:outputPanel layout="none" rendered="{!Not(cInfo.IsManual)}">
<a href="#" onclick="saveByRepairJs('{!cInfo.rec.Id}', '{!JSENCODE(cInfo.rec.Name)}', '{!cInfo.rec.Hospital__r.Id}', '{!JSENCODE(cInfo.rec.Hospital__r.Name)}', '{!cInfo.rec.Department_Class__r.Id}', '{!JSENCODE(cInfo.rec.Department_Class__r.Name)}', '{!cInfo.rec.Account.Id}', '{!JSENCODE(cInfo.rec.Account.Name)}', '鍙慨鐞�');">鈻�</a>
</apex:outputPanel>
- </td>
+ </td> -->
</tr>
<apex:variable value="{!cnt + 1}" var="cnt" />
</apex:repeat>
@@ -543,7 +651,7 @@
</apex:pageBlockSection>
<apex:outputPanel id="ButtonPanel">
-<table style="width:100%;">
+<table style="width:100%;margin:10px 0 10px 0;">
<tr>
<td>
<apex:commandButton value="琛岃拷鍔�" action="{!addNewRows}" disabled="{!Not($ObjectType.Inspection_Item__c.createable)}"
@@ -566,12 +674,12 @@
<!-- HWAG-B4Q3G5 20180918End -->
<input type="hidden" id="ProductCnt2" value="{!productCount2}" />
<apex:outputPanel >
-<div align="center">
+<!-- <div align="center">
<apex:outputPanel id="countorder">绗瑊!countorder}椤�</apex:outputPanel>
<apex:commandButton value="涓婁竴椤�" action="{!UpPage}" onclick="blockme();" disabled="{!IF(countorder=1,true,false)}" oncomplete="unblockUI();" reRender="Form"/>
<apex:commandButton value="涓嬩竴椤�" action="{!DownPage}" onclick="blockme();" disabled="{!IF(countorder >=nowAssetcount ,true,false)}" oncomplete="unblockUI();" rerender="Form"/>
<apex:outputPanel id="NowOrdercount">鍏眥!nowAssetcount}椤�</apex:outputPanel>
-</div>
+</div> -->
<table>
<tr>
@@ -579,13 +687,19 @@
<td style="width:85px" align="right"><apex:selectList value="{!text1}" id="text1" size="1" style="width:80px"><apex:selectOptions value="{!textOpts}"/></apex:selectList></td>
<td style="width:85px" align="center"><apex:selectList value="{!cond1}" id="cond1" size="1" style="width:80px"><apex:selectOptions value="{!equalOpts}"/></apex:selectList></td>
<td style="width:95px" align="left"><apex:inputText value="{!val1}" id="val1" style="width:100px"/></td>
- <td align="left">
+ <td align="left" style="width:450px">
<apex:commandButton value="妫�绱�" onclick="searchJs();return false;" style="width:130px" rerender="dummy"/>
<apex:commandButton value="娓呴櫎鏉′欢" onclick="clearAndSearch();" style="width:130px" rerender="dummy"/>
<span style="vertical-align: text-bottom;">浣跨敤涓�<apex:inputCheckBox value="{!activeOn}" /></span>
+ </td>
+ <td>
+ <apex:outputPanel id="countorder">绗瑊!countorder}椤� </apex:outputPanel>
+ <apex:commandButton value="涓婁竴椤�" action="{!UpPage}" onclick="blockme();" disabled="{!IF(countorder=1,true,false)}" oncomplete="unblockUI();" reRender="Form"/>
+ <apex:commandButton value="涓嬩竴椤�" action="{!DownPage}" onclick="blockme();" disabled="{!IF(countorder >=nowAssetcount ,true,false)}" oncomplete="unblockUI();" rerender="Form"/>
+ <apex:outputPanel id="NowOrdercount"> 鍏眥!nowAssetcount}椤�</apex:outputPanel>
</td>
</tr>
</table>
@@ -683,32 +797,32 @@
</apex:outputPanel>
</apex:pageBlockSection>
<!-- fxk 2021/8/4 鏂板姞 Start-->
-<apex:pageBlockSection title="鎵撳嵃鏃舵礂娑堜俊鎭�" columns="1" id="UnCheckSection1" >
-<apex:outputPanel >
-<table class="edittable" border="0" style="border-collapse: collapse; width:600px; table-layout:fixed;">
- <tr>
- <td>{!$ObjectType.Inspection_Report__c.fields.CleaningFluid__c.Label}:</td>
- <td><apex:inputField value="{!ir.CleaningFluid__c}" style="width: 90%"/></td>
+<!-- <apex:pageBlockSection title="鎵撳嵃鏃舵礂娑堜俊鎭�" columns="1" id="UnCheckSection1" > -->
+<!-- <apex:outputPanel > -->
+<!-- <table class="edittable" border="0" style="border-collapse: collapse; width:600px; table-layout:fixed;"> -->
+ <!-- <tr> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.CleaningFluid__c.Label}:</td> -->
+ <!-- <td><apex:inputField value="{!ir.CleaningFluid__c}" style="width: 90%"/></td> -->
<!-- 鏂瑰紡 add by rentx 20210927 start-->
- <td>{!$ObjectType.Inspection_Report__c.fields.Mode__c.Label}:</td>
- <td><apex:inputField value="{!ir.Mode__c}" style="width: 90%"/></td>
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.Mode__c.Label}:</td> -->
+ <!-- <td><apex:inputField value="{!ir.Mode__c}" style="width: 90%"/></td> -->
<!-- 鏂瑰紡 add by rentx 20210927 end -->
- <td>{!$ObjectType.Inspection_Report__c.fields.SterilizationMethod__c.Label}:</td>
- <td><apex:inputField value="{!ir.SterilizationMethod__c}" style="width: 90%"/></td>
- <td>{!$ObjectType.Inspection_Report__c.fields.Remarks__c.Label}:</td>
- <td><apex:inputText value="{!ir.Remarks__c}" style="width: 90%"/></td>
- </tr>
- <tr>
- <td>{!$ObjectType.Inspection_Report__c.fields.Disinfectant__c.Label}:</td>
- <td><apex:inputField value="{!ir.Disinfectant__c}" style="width: 90%"/></td>
- <td>{!$ObjectType.Inspection_Report__c.fields.UsedMachine__c.Label}:</td>
- <td><apex:inputField value="{!ir.UsedMachine__c}" style="width: 90%"/></td>
- <td>{!$ObjectType.Inspection_Report__c.fields.Used_ET__c.Label}:</td>
- <td><apex:inputText value="{!ir.Used_ET__c}" style="width: 90%"/></td>
- </tr>
-</table>
-</apex:outputPanel>
-</apex:pageBlockSection>
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.SterilizationMethod__c.Label}:</td> -->
+ <!-- <td><apex:inputField value="{!ir.SterilizationMethod__c}" style="width: 90%"/></td> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.Remarks__c.Label}:</td> -->
+ <!-- <td><apex:inputText value="{!ir.Remarks__c}" style="width: 90%"/></td> -->
+ <!-- </tr> -->
+ <!-- <tr> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.Disinfectant__c.Label}:</td> -->
+ <!-- <td><apex:inputField value="{!ir.Disinfectant__c}" style="width: 90%"/></td> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.UsedMachine__c.Label}:</td> -->
+ <!-- <td><apex:inputField value="{!ir.UsedMachine__c}" style="width: 90%"/></td> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.Used_ET__c.Label}:</td> -->
+ <!-- <td><apex:inputText value="{!ir.Used_ET__c}" style="width: 90%"/></td> -->
+ <!-- </tr> -->
+<!-- </table> -->
+<!-- </apex:outputPanel> -->
+<!-- </apex:pageBlockSection> -->
<!-- fxk 2021/8/4 鏂板姞 End-->
</div>
</apex:pageBlock></div>
diff --git a/force-app/main/default/pages/PersonalCalendar.page b/force-app/main/default/pages/PersonalCalendar.page
index 8936dab..35f4a22 100644
--- a/force-app/main/default/pages/PersonalCalendar.page
+++ b/force-app/main/default/pages/PersonalCalendar.page
@@ -9,7 +9,74 @@
<apex:stylesheet value="{!URLFOR($Resource.fullcalendarCss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.PersonalCalendarCssTwo)}"/>
+<style>
+
+ div.calendarHeader div.line2 input.dayViewIconOn, div.calendarHeader div.line2 input.weekViewIconOn {
+ background-color: rgb(243, 243, 243);
+ }
+ div.calendarHeader div.line2 input.dayViewIcon,div.calendarHeader div.line2 input.weekViewIcon {
+ background-color: transparent;
+ }
+ div.calendarHeader div.line2 {
+ display: inline-block;
+ }
+ .calendarHeader .dayViewIconOn , .calendarHeader .dayViewIcon,
+ .calendarHeader .weekViewIconOn ,.calendarHeader .weekViewIcon {
+ float: left;
+ background-repeat: no-repeat;
+ margin-right: 3px;
+ width: 24px;
+ height: 18px;
+ }
+ .calendarHeader .dayViewIconOn {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: -26px -36px;
+ display: block
+ }
+ .calendarHeader .dayViewIcon {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: 0 -36px;
+ display: block
+ }
+ .calendarHeader .weekViewIconOn {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: -26px -146px;
+ display: block
+ }
+ .calendarHeader .weekViewIcon {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: 0 -146px;
+ display: block
+ }
+
+ .calendarHeader .arrowIcons .prevCalArrow,.calendarHeader .arrowIcons .nextCalArrow {
+ width: 22px;
+ height: 19px;
+ margin: 0;
+ background: url(/img/alohaSkin/nextPrevBtn_sprite.png) left top no-repeat
+ }
+
+ .calendarHeader .arrowIcons .nextCalArrow {
+ background-position: right top
+ }
+
+ .calendarHeader .arrowIcons a:hover .prevCalArrow {
+ background-position: left -19px
+ }
+
+ .calendarHeader .arrowIcons a:hover .nextCalArrow {
+ background-position: right -19px
+ }
+ .dateLinks .datePickerIcon {
+ background-image: url(/img/func_icons/util/datePicker16.gif);
+ background-position: 0 0;
+ width: 16px;
+ height: 17px
+ }
+
+
+</style>
<script type="text/javascript">
function searchBySalesDptJs() {
var baseUrl = '{!ProvinceUrl}';
@@ -74,6 +141,7 @@
document.location.href = baseUrl;
}
function change2DayView() {
+ debugger
var baseUrl = '{!DayViewUrl}';
var pSearch = encodeURIComponent(j$(escapeVfId('Page:Form:searchText')).val());
if (pSearch != '') {
@@ -192,18 +260,21 @@
<apex:selectList value="{!cond1}" id="cond1" size="1"><apex:selectOptions value="{!equalOpts}"/></apex:selectList>
<apex:inputText value="{!val1}" id="val1" style="width:200px"/>
<input type="submit" value="Search" onclick="searchJs();return false;"/>
- <apex:inputCheckbox value="{!ocmUser}" id="ocmUser" onclick="searchJs();return false;"/><apex:outputLabel value="閿�鍞湰閮�" for="ocmUser"/>
- <apex:inputCheckbox value="{!allProvince}" id="allProvince" onclick="searchJs();return false;"/><apex:outputLabel value="鍏ㄩ儴鐪�" for="allProvince"/>
+ <apex:inputCheckbox value="{!ocmUser}" id="ocmUser" onclick="searchJs();return false;" style='vertical-align: text-bottom;'/><apex:outputLabel value="閿�鍞湰閮�" for="ocmUser"/>
+ <apex:inputCheckbox value="{!allProvince}" id="allProvince" style='vertical-align: text-bottom;' onclick="searchJs();return false;"/><apex:outputLabel value="鍏ㄩ儴鐪�" for="allProvince"/>
</div>
<div style="clear:both;"></div>
<div class="dateLinks line2" style="margin:1px 10px;">
<apex:inputText value="{!searchText}" id="searchText" style="width:200px" html-placeholder="Search Calendar" onchange="searchMark();return false;" onkeypress="return onKeyEvent(event);"/>
- <input type="button" value="Prev" onclick="prevMark();return false;"/>
- <input type="button" value="Next" onclick="nextMark();return false;"/>
+ <input type="button" value="Prev" class='btn' onclick="prevMark();return false;"/>
+ <input type="button" value="Next" class='btn' onclick="nextMark();return false;"/>
</div><script type="text/javascript">var jSearch = j$(escapeVfId('Page:Form:searchText'));jSearch.attr("current", "0");jSearch.attr("max", "{!markCnt}");</script>
<apex:outputPanel layout="none" rendered="{!IF(IsWeek, true, false)}">
<!-- 閫� -->
- <div class="dwmIcons line2">
+ <div class="dwmIcons line2" style="margin-right:20px;height: 29px;vertical-align: bottom;">
+ <!-- <input type="button" value="鏃ヨ鍥�" onclick="change2DayView();return false;" class="btn dayViewIcon" onblur="this.className = 'btn dayViewIcon';" onfocus="this.className = 'btn dayViewIconOn';" onmouseout="this.className = 'btn dayViewIcon';this.className = 'btn dayViewIcon';" onmouseover="this.className = 'btn dayViewIconOn';this.className = 'btn dayViewIconOn';"/>
+ <input type="button" value="鍛ㄨ鍥�" onclick="change2WeekView();return false;" class="btn weekViewIconOn" onblur="this.className = 'btn weekViewIconOn';" onfocus="this.className = 'btn weekViewIconOn';" onmouseout="this.className = 'btn weekViewIconOn';this.className = 'btn weekViewIconOn';" onmouseover="this.className = 'btn weekViewIconOn';this.className = 'btn weekViewIconOn';"/> -->
+
<a onclick="change2DayView();" title="鏃ヨ鍥�"><img src="/s.gif" alt="鏃ヨ鍥�" class="dayViewIcon" onblur="this.className = 'dayViewIcon';" onfocus="this.className = 'dayViewIconOn';" onmouseout="this.className = 'dayViewIcon';this.className = 'dayViewIcon';" onmouseover="this.className = 'dayViewIconOn';this.className = 'dayViewIconOn';" title="鏃ヨ鍥�" /></a>
<a onclick="change2WeekView();" title="鍛ㄨ鍥�"><img src="/s.gif" alt="鍛ㄨ鍥�" class="weekViewIconOn" onblur="this.className = 'weekViewIconOn';" onfocus="this.className = 'weekViewIconOn';" onmouseout="this.className = 'weekViewIconOn';this.className = 'weekViewIconOn';" onmouseover="this.className = 'weekViewIconOn';this.className = 'weekViewIconOn';" title="鍛ㄨ鍥�" /></a>
</div>
@@ -217,9 +288,13 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(IsWeek, false, true)}">
<!-- 鏃� -->
- <div class="dwmIcons line2">
+ <div class="dwmIcons line2" style="margin-right:20px;height: 29px;vertical-align: bottom;">
+ <!-- <input type="button" value="鏃ヨ鍥�" onclick="change2DayView();return false;" class="btn dayViewIconOn" onblur="this.className = 'btn dayViewIconOn';" onfocus="this.className = 'btn dayViewIconOn';" onmouseout="this.className = 'btn dayViewIconOn';this.className = 'btn dayViewIconOn';" onmouseover="this.className = 'btn dayViewIconOn';this.className = 'btn dayViewIconOn';"/>
+ <input type="button" value="鍛ㄨ鍥�" onclick="change2WeekView();return false;" class="btn weekViewIcon" onblur="this.className = 'btn weekViewIcon';" onfocus="this.className = 'btn weekViewIconOn';" onmouseout="this.className = 'btn weekViewIcon';this.className = 'btn weekViewIcon';" onmouseover="this.className = 'btn weekViewIconOn';this.className = 'btn weekViewIconOn';"/> -->
+
<a onclick="change2DayView();" title="鏃ヨ鍥�"><img src="/s.gif" alt="鏃ヨ鍥�" class="dayViewIconOn" onblur="this.className = 'dayViewIconOn';" onfocus="this.className = 'dayViewIconOn';" onmouseout="this.className = 'dayViewIconOn';this.className = 'dayViewIconOn';" onmouseover="this.className = 'dayViewIconOn';this.className = 'dayViewIconOn';" title="鏃ヨ鍥�" /></a>
<a onclick="change2WeekView();" title="鍛ㄨ鍥�"><img src="/s.gif" alt="鍛ㄨ鍥�" class="weekViewIcon" onblur="this.className = 'weekViewIcon';" onfocus="this.className = 'weekViewIconOn';" onmouseout="this.className = 'weekViewIcon';this.className = 'weekViewIcon';" onmouseover="this.className = 'weekViewIconOn';this.className = 'weekViewIconOn';" title="鍛ㄨ鍥�" /></a>
+
</div>
<div class="dateText line2">
<apex:outputText value="{0, date, E yyyy/MM/dd}">
@@ -228,30 +303,41 @@
<apex:inputCheckbox value="{!t2}" onclick="showDayAll(this);"/><span style="font-size:80%;">鍏ㄩ儴灞曞紑</span>
</div>
</apex:outputPanel>
- <div class="arrowIcons line2">
+ <div class="arrowIcons line2" style="height: 32px;line-height: 32px;vertical-align: bottom;">
<a href="{!PrevUrl}" title="Prev" class="prev"><img src="/s.gif" alt="Prev" title="Prev" class="prevCalArrow"/></a>
- <a href="{!NextUrl}" title="Next" class="next"><img src="/s.gif" alt="Next" title="Next" class="nextCalArrow"/></a>
+ <a href="{!NextUrl}" title="Next" class="next"><img src="/s.gif" alt="Next" title="Next" class="nextCalArrow" style="margin-left: -4px;"/></a>
</div>
- <div class="dateLinks line2" style="margin:4px 10px 2px 0px;">
+ <div class="dateLinks line2" style=" height: 29px;vertical-align: bottom;">
+
<input type="hidden" value="{!mdDayFormat}" id="mdDayFormat" onchange="changedDay(this.value)" />
<img src="/s.gif" alt="閫夋嫨鏃ユ湡" class="datePickerIcon" onclick="DatePicker.pickDate(true, 'mdDayFormat', false, this);DatePicker.datePicker.cancelHide(getEvent(event));" title="閫夋嫨鏃ユ湡"/>
</div>
- <div class="reportActions" style="float:left;margin-left:20px;margin-bottom:0px;">
- <div class="menuButton" id="runMutton" style="position:relative;margin-bottom:0px;">
- <div class="menuButtonButton hasDefault" id="runMuttonButton" style="height:16px;padding-top:2px;padding-bottom:2px;">
- <span class="menuButtonLabel" id="runMuttonLabel" tabindex="0" style="position:absolute;top:3px;left:5px;">鎶ヨ〃锛忎华琛ㄦ澘</span>
+ <div class="reportActions" style="margin-left:20px;margin-bottom:1px;display: inline-block;">
+ <div class="menuButton" id="runMutton" style="position:relative;margin-bottom:1px;width:120px;height: 32px;">
+ <div class="menuButtonButton hasDefault" id="runMuttonButton" style="height:16px;padding-bottom:2px;">
+ <span class="menuButtonLabel" id="runMuttonLabel" tabindex="0" style="position:absolute;left:5px;">鎶ヨ〃锛忎华琛ㄦ澘</span>
</div>
- <div class="menuButtonMenu" id="runMuttonMenu" style="display:none;">
+ <div class="menuButtonMenu" id="runMuttonMenu" style="display:none;margin-top:15px;">
<!-- <a href="/00O10000003s5pN" target="_blank" class="menuButtonMenuLink">鎶ュ憡璇︾粏</a>
<a href="/00O10000003sfjN" target="_blank" class="menuButtonMenuLink">鏈懆璁″垝</a>
<a href="/00O10000004UUa5" target="_blank" class="menuButtonMenuLink">姣忔湀鎶ュ憡鍜屽疄闄呮嫓璁垮尮閰�</a>
<a href="/01Z10000000foL2" target="_blank" class="menuButtonMenuLink">閿�鍞华琛ㄦ澘</a>
<a href="/01Z10000000fqLn" target="_blank" class="menuButtonMenuLink">FSE浠〃鏉�</a> -->
- <a href="/00O10000003s5pN" target="_blank" class="menuButtonMenuLink">涓婂懆鎶ュ憡鏄庣粏</a>
+
+ <!-- 淇敼纭紪鐮� zzm 20230602-->
+ <!-- <a href="/00O10000003s5pN" target="_blank" class="menuButtonMenuLink">涓婂懆鎶ュ憡鏄庣粏</a>
<a href="/00O10000004wbL7" target="_blank" class="menuButtonMenuLink">鏈懆璁″垝</a>
<a href="/00O10000004UUa5" target="_blank" class="menuButtonMenuLink">鏈堝埆璁″垝瀹炴柦鎯呭喌</a>
<a href="/01Z100000010pq7" target="_blank" class="menuButtonMenuLink">鎺ㄥ箍浠〃鏉�</a>
- <a href="/01Z10000000T76l" target="_blank" class="menuButtonMenuLink">鏈嶅姟浠〃鏉�</a>
+ <a href="/01Z10000000T76l" target="_blank" class="menuButtonMenuLink">鏈嶅姟浠〃鏉�</a> -->
+
+ <a href="/{!preweekPlanID}" target="_blank" class="menuButtonMenuLink">涓婂懆鎶ュ憡鏄庣粏</a>
+ <a href="/{!weekPlanID}" target="_blank" class="menuButtonMenuLink">鏈懆璁″垝</a>
+ <a href="/{!monthPlanID}" target="_blank" class="menuButtonMenuLink">鏈堝埆璁″垝瀹炴柦鎯呭喌</a>
+ <a href="/{!promotPlanId}" target="_blank" class="menuButtonMenuLink">鎺ㄥ箍浠〃鏉�</a>
+ <a href="/{!servePlanId}" target="_blank" class="menuButtonMenuLink">鏈嶅姟浠〃鏉�</a>
+
+
</div>
</div><script type="text/javascript">new MenuButton('runMutton', false);</script>
</div>
diff --git a/force-app/main/default/pages/RepPAEDecisionRecord.page b/force-app/main/default/pages/RepPAEDecisionRecord.page
index 724f7b0..71d224b 100644
--- a/force-app/main/default/pages/RepPAEDecisionRecord.page
+++ b/force-app/main/default/pages/RepPAEDecisionRecord.page
@@ -207,7 +207,7 @@
</table>
<apex:outputPanel layout="none" rendered="{!IF(RecordTypeName = 'ASACDecision'&& rdRecord.PAE_reappear_confirm__c = '鏈‘璁�',false , true)}">
- <table style="width:100%; {!IF(RecordTypeName = 'ASACDecision'&& rdRecord.PAE_reappear_confirm__c = '鏈‘璁�', 'display: none;', '')}" >
+ <table style="width:100%;margin-bottom: 10px; {!IF(RecordTypeName = 'ASACDecision'&& rdRecord.PAE_reappear_confirm__c = '鏈‘璁�', 'display: none;', '')}" >
<tr>
<td>
diff --git a/force-app/main/default/pages/SetPersonalProductTarget.page b/force-app/main/default/pages/SetPersonalProductTarget.page
index 24ecf1a..541c700 100644
--- a/force-app/main/default/pages/SetPersonalProductTarget.page
+++ b/force-app/main/default/pages/SetPersonalProductTarget.page
@@ -441,7 +441,7 @@
</apex:actionFunction>
<!--CHAN-BDQBLX 20210129 ljh end -->
<apex:pageBlock id="headBlock" tabStyle="Report">
- <table id="ButtonTable" border="0" >
+ <table id="ButtonTable" border="0" style='height: 45px;'>
<tr>
<td>
鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103)}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
@@ -472,7 +472,7 @@
<apex:commandButton value="鍙嶆槧鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs();return false;" rendered="{!Not(isPast)}"/>
</td>
<!--CHAN-BDQBLX 20210129 ljh start -->
- <td>
+ <td style='padding: 0 5px;'>
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘"></apex:commandbutton>
</td>
<td>
diff --git a/force-app/main/default/pages/SetProductTarget.page b/force-app/main/default/pages/SetProductTarget.page
index d2e1352..d053c14 100644
--- a/force-app/main/default/pages/SetProductTarget.page
+++ b/force-app/main/default/pages/SetProductTarget.page
@@ -342,9 +342,7 @@
// }
passToController(this.result);
popupBox.hide();
- }
-
-
+ }
}
}
//CHAN-BDQBLX 20210205 ljh end
@@ -431,7 +429,7 @@
</apex:outputPanel>
<!--CHAN-BDQBLX 20210205 ljh end -->
<apex:pageBlock id="headBlock" tabStyle="Report">
- <table id="ButtonTable" border="0" width="100%">
+ <table id="ButtonTable" border="0" width="100%" style='margin-bottom: 5px;'>
<tr>
<td>
鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
@@ -454,8 +452,8 @@
<!--CHAN-BDQBLX 20210204 ljh end -->
</tr>
</table>
- <table id="ButtonTable" border="0" width="100%">
- <tr>
+ <table id="ButtonTable" border="0" width="100%" >
+ <tr style='line-height: 40px;height: 40px;'>
<td width="15%"></td>
<td align="center">
<apex:commandButton value="淇濆瓨" rerender="dummy" onclick="saveJs();return false;" rendered="{!Not(isPast) && loginUser.ProfileId == $Label.ProfileId_SystemAdmin}"/>
@@ -589,4 +587,4 @@
</script>
</apex:pageBlock>
</apex:form>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/SetProvinceTarget.page b/force-app/main/default/pages/SetProvinceTarget.page
index 1da0caa..e479398 100644
--- a/force-app/main/default/pages/SetProvinceTarget.page
+++ b/force-app/main/default/pages/SetProvinceTarget.page
@@ -271,7 +271,7 @@
<apex:pageBlock id="headBlock" tabStyle="Report">
<table id="ButtonTable" border="0" width="100%">
- <tr>
+ <tr style='height: 40px;'>
<td width="15%">鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px" onchange="searchJs(this.value);return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList></td>
<!--CHAN-BDQBLX 20210129 you start -->
@@ -389,4 +389,4 @@
</script>
</apex:pageBlock>
</apex:form>
-</apex:page>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/SetupCheck_PicklistValuesGet.page b/force-app/main/default/pages/SetupCheck_PicklistValuesGet.page
index e4ba8dc..cbca87e 100644
--- a/force-app/main/default/pages/SetupCheck_PicklistValuesGet.page
+++ b/force-app/main/default/pages/SetupCheck_PicklistValuesGet.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="false" title="閬告姙銉偣銉堝�ゅ彇寰�" name="閬告姙銉偣銉堝�ゅ彇寰�" Controller="SetupCheck_PicklistValuesGetController">
+<apex:page showHeader="false" title="閬告姙銉偣銉堝�ゅ彇寰�" name="閬告姙銉偣銉堝�ゅ彇寰�" Controller="SetupCheck_PicklistValuesGetController" lightningStylesheets="true">
<script>
var pick_Vals = new Array();
<apex:repeat value="{!val_PicklistValues}" var="pickval" id="PicklistRepeat">
diff --git a/force-app/main/default/pages/SiteTemplate.page b/force-app/main/default/pages/SiteTemplate.page
index 2476eb5..fdee1fd 100644
--- a/force-app/main/default/pages/SiteTemplate.page
+++ b/force-app/main/default/pages/SiteTemplate.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="false" id="SiteTemplate">
+<apex:page showHeader="false" id="SiteTemplate" lightningStylesheets='true'>
<apex:stylesheet value="{!URLFOR($Resource.SiteSamples, 'SiteStyles.css')}"/>
<apex:insert name="header">
<c:SiteHeader />
diff --git a/force-app/main/default/pages/StdExceptionTemplate.page b/force-app/main/default/pages/StdExceptionTemplate.page
index 965917d..c43af00 100644
--- a/force-app/main/default/pages/StdExceptionTemplate.page
+++ b/force-app/main/default/pages/StdExceptionTemplate.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="false" title="{!$Label.site.site_under_construction}" id="StdExceptionTemplate" cache="false">
+<apex:page showHeader="false" title="{!$Label.site.site_under_construction}" id="StdExceptionTemplate" cache="false" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.SiteSamples, 'SiteStyles.css')}"/>
<center>
<apex:panelGrid bgcolor="white" columns="1">
diff --git a/force-app/main/default/pages/StraightBackAddress.page b/force-app/main/default/pages/StraightBackAddress.page
index 91c9f1c..1b8ecdf 100644
--- a/force-app/main/default/pages/StraightBackAddress.page
+++ b/force-app/main/default/pages/StraightBackAddress.page
@@ -5,7 +5,7 @@
@last modified on : 03-30-2022
@last modified by : ChangeMeIn@UserSettingsUnder.SFDoc
-->
-<apex:page controller="StraightBackAddressController" action="{!init}" showHeader="false" lightningStylesheets="true" sidebar="true" id="allPage" title="鐩磋繑鏀惰揣鍦板潃">
+<apex:page controller="StraightBackAddressController" action="{!init}" showHeader="false" sidebar="true" id="allPage" title="鐩磋繑鏀惰揣鍦板潃" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -13,6 +13,7 @@
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<script type="text/javascript">
var checkedTrue;
var tableDataStr = '';
@@ -37,6 +38,10 @@
var telePhonePlaintext = '';
var zipCodePlaintext = '';
var detailedAddressPlaintext = '';
+ //add by xq 2023/06/30 Start
+ var tableDataJsons = JSON.parse('{!tableDataJson}');
+ console.log('tableDataJsons = ' + JSON.stringify(tableDataJsons))
+ //add by xq 2023/06/30 end
function b(){
if (!isBlocking) {
blockme();
@@ -398,6 +403,8 @@
// Address__c DatetimeUpdate = new Address__c();
// DatetimeUpdate = tableData[i].address;
//璇︾粏鍦板潃
+ debugger
+ console.log('杩涘叆閲囩敤')
let address_str = address.Detailed_Address__c.trim();
if (addressAwsData.hasOwnProperty(address.AWS_Data_Id__c)) {
address_str = addressAwsData[address.AWS_Data_Id__c].detailedAddress;
@@ -440,7 +447,6 @@
let rc = new sforce.SObject('Repair__c');
rc.Id='{!RepairId}';
rc.address_Contacts__c=contactsName;
- debugger
rc.address_ZipCode__c = address.ZipCode__c;
rc.address_City__c = cityName;
rc.address_Contacts_Name__c = ContactPerson;
@@ -658,7 +664,7 @@
console.log('contacts == null')
return;
}
- let temp = {}
+ let temp = {};
temp.telephone = result.object.telephone;
temp.zipCode = result.object.zipCode;
temp.detailedAddress = result.object.detailedAddress;
@@ -681,7 +687,7 @@
var interval=self.setInterval(function (){
console.log('setInterval index= ' + index);
if(index == correct){
- console.log('PIDATA = ' + JSON.stringify(PIData))
+ console.log('PIDATA = ' + JSON.stringify(PIData));
resolve('success')
clearInterval(interval)
}
@@ -692,6 +698,16 @@
//zhj PIPL 2022-06-08 start
function q2(){
+ //瑙ｅ瘑淇℃伅add by xq 2023/07/03 Start
+ for(var i in tableDataJsons){
+ if(PIData[tableDataJsons[i]]){
+ document.getElementById(tableDataJsons[i]).innerText = PIData[tableDataJsons[i]].lastName;
+ document.getElementById(tableDataJsons[i] + '_phone').innerText = PIData[tableDataJsons[i]].telephone;
+ document.getElementById(tableDataJsons[i]+'_ZipCode').innerText = PIData[tableDataJsons[i]].zipCode;
+ document.getElementById(tableDataJsons[i]+'_Detailed_Address').innerText = PIData[tableDataJsons[i]].detailedAddress;
+ }
+ }
+ //瑙ｅ瘑淇℃伅add by xq 2023/07/03 end
// sforce.connection.sessionId = '{!GETSESSIONID()}';
// var p = new Promise(function(resolve, reject){
// //鏌ヨ鑱旂郴浜虹殑鏁版嵁
@@ -780,7 +796,7 @@
createDiv.style.background="#dddddd";
createDiv.style.position = "absolute";
parentNode.appendChild(createDiv);
- parentNode.style.position = "relative";
+ parentNode.style.position = "relative";
}
function hidePIDiv(awsDataId){
@@ -873,7 +889,6 @@
AWSService.post(staticResource.searchUrl,{
dataIds:arr1
},function(data){
- ub();
if(data && data.object && data.object.length > 0){
for (let di in data.object) {
if (data.object[di] && data.object[di].dataId) {
@@ -882,6 +897,7 @@
}
}
+ ub();
},staticResource.token)
}
@@ -890,7 +906,6 @@
AWSService.post(staticResourceContact.searchUrl,{
dataIds:arr2
},function(data){
- ub();
if(data && data.object && data.object.length > 0){
for (let di in data.object) {
if (data.object[di] && data.object[di].dataId) {
@@ -899,6 +914,7 @@
}
}
+ ub();
},staticResourceContact.token)
}
}
@@ -1013,12 +1029,13 @@
<td align="left" class="oraddress" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;" address-data-id="{!or.address.AWS_Data_Id__c}" contact-data-id="{!or.address.Contacts__r.AWS_Data_Id__c}">
<!-- <apex:outputfield value="{!or.address.Contacts__c}" id="{!or.address.Contacts__c}_{!or.address.Id}"/> -->
<!-- <a href="#" id="{!or.address.Id}" onmouseover="showPIDiv('{!or.address.Id}')" onmouseout="hidePIDiv('{!or.address.Id}')" aws-data-id="{!or.address.Contacts__r.AWS_Data_Id__c}">{!or.address.Contacts__r.Name}</a> -->
- <a href="#" id="{!or.address.Id}" onmouseover="showPIDiv('{!or.address.Id}')" onmouseout="hidePIDiv('{!or.address.Id}')" aws-data-id="{!or.address.AWS_Data_Id__c}">{!or.address.ContactName__c}</a>
+ <!-- <a href="#" id="{!or.address.Id}" onmouseover="showPIDiv('{!or.address.Id}')" onmouseout="hidePIDiv('{!or.address.Id}')" aws-data-id="{!or.address.AWS_Data_Id__c}">{!or.address.ContactName__c}</a> -->
+ <a href="#" id="{!or.address.Id}" aws-data-id="{!or.address.AWS_Data_Id__c}">{!or.address.ContactName__c}</a><!--add by xq 2023/06/30 Start-->
</td>
- <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
- <apex:outputText value="{!or.address.Telephone__c}" />
+ <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;" id="{!or.address.Id + '_phone'}">
+ <apex:outputText value="{!or.address.Telephone__c}" />
</td>
- <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
+ <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;" id="{!or.address.Id + '_ZipCode'}">
<apex:outputText value="{!or.address.ZipCode__c}" />
</td>
<td align="center" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
@@ -1027,16 +1044,16 @@
<td align="center" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
<apex:outputfield value="{!or.address.City__c}" />
</td>
- <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;">
+ <td align="left" style="vertical-align: inherit;border-width: 0px 1px 1px 0px;" id="{!or.address.Id + '_Detailed_Address'}">
<apex:outputText value="{!or.address.Detailed_Address__c}" />
</td>
- <td align="center" style="vertical-align: inherit;width:30px;">
+ <td align="center" style="vertical-align: inherit;width:70px;border-width: 0px 0px 1px 0px;display:{!or.canEdit};">
<apex:commandButton value=" 缂栬緫 " onclick="onEditorJs('{!or.address.id}');return false;" style="background:#98c1fbf7;display:{!or.canEdit};"/>
</td>
- <td align="center" style="vertical-align: inherit;width:30px;">
+ <td align="center" style="vertical-align: inherit;width:70px;border-width: 0px 0px 1px 0px;display:{!or.canCopy};">
<apex:commandButton value=" 澶嶅埗 " onclick="onCopyJs('{!or.address.id}');return false;" style="background: #98c1fbf7;display:{!or.canCopy};"/>
</td>
- <td align="center" style="vertical-align: inherit;width:30px;">
+ <td align="center" style="vertical-align: inherit;width:70px;border-width: 0px 0px 1px 0px;display:{!or.canAdopt};">
<apex:commandButton value=" 閲囩敤 " onclick="onAdoptJs(event,JSON.parse('{!or.addressJson}'));return false;" style="background: #98c1fbf7;display:{!or.canAdopt};"/>
</td>
</tr>
@@ -1086,9 +1103,7 @@
<!-- <apex:inputTextarea value="{!insUpdData.Detailed_Address__c}" id="Detailed_Address__c" style="resize:vertical;width: 90%" rows="3" cols="3"/> -->
<apex:inputfield value="{!insUpdData.Detailed_Address__c}" id="Detailed_Address__c" style="resize:vertical;width: 98%"/>
- <!-- 2023-02-13 zyh add Start -->
- <div id="errorMsg" style="color: red;"></div>
- <!-- 2023-02-13 zyh add end -->
+ <div id="errorMsg" class="errorMsg"></div>
</apex:pageblocksection>
<div style="text-align: center;">
diff --git a/force-app/main/default/pages/contact_phone.page b/force-app/main/default/pages/contact_phone.page
index ea079d5..f243960 100644
--- a/force-app/main/default/pages/contact_phone.page
+++ b/force-app/main/default/pages/contact_phone.page
@@ -1,4 +1,4 @@
-<apex:page standardController="contact">
+<apex:page standardController="contact" lightningStylesheets="true">
<!-- Begin Default Content REMOVE THIS -->
<h1>Congratulations</h1>
This is your new Page
diff --git a/force-app/main/default/pages/maintenanceContractPage.page b/force-app/main/default/pages/maintenanceContractPage.page
index c4649cd..e113386 100644
--- a/force-app/main/default/pages/maintenanceContractPage.page
+++ b/force-app/main/default/pages/maintenanceContractPage.page
@@ -1,4 +1,4 @@
-<apex:page showHeader="false" sidebar="false" id="MaintenanceContractApp" title="MaintenanceContractApp">
+<apex:page showHeader="false" sidebar="false" id="MaintenanceContractApp" title="MaintenanceContractApp" lightningStylesheets='true'>
<apex:includeLightning />
<div style="width:100%;height:100%;" id="MaintenanceContractApp" />
<script>
--
Gitblit v1.9.1