From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/pages/OFSInsReportLayout.page | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/pages/OFSInsReportLayout.page b/force-app/main/default/pages/OFSInsReportLayout.page
index 9e5d847..c1826ae 100644
--- a/force-app/main/default/pages/OFSInsReportLayout.page
+++ b/force-app/main/default/pages/OFSInsReportLayout.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" showHeader="false" sidebar="false" controller="OFSInsReportLayoutController" applyBodyTag="false" applyHtmlTag="false" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" controller="OFSInsReportLayoutController" applyBodyTag="false" applyHtmlTag="false" action="{!init}" lightningStylesheets="true">
<!-- <apex:page id="Page" showHeader="false" sidebar="false" standardcontroller="Inspection_Item__c" extensions="OFSInsReportLayoutController" applyBodyTag="false" applyHtmlTag="false" action="{!init}"> -->
<html>
<head>
@@ -81,6 +81,11 @@
sortTablefunc(key);
}
+ function exchangeAssetJs() {
+ blockme();
+ exchangeAssetfunc();
+ }
+
function saveByRepairJs(aid, an, ahid, ahn, adid, adn, aaid, aan, rstr) {
tmpaid = aid;
tmpan = an;
@@ -138,9 +143,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;
@@ -167,9 +169,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;
j$("[field-api='Responsible_Person__c']").val(aws_data1.responsiblePerson);
- document.getElementById("Page:Form:Block:Responsible_Person_Encrypted__c").value = aws_data1.responsiblePersonEncrypt;
if (callback) {
callback();
@@ -218,7 +218,7 @@
for (let i = 0; i < divs.length; i++) {
for (let j = 0; j < divs[i].classList.length; j++) {
for(let clsi in divs[i].classList){let cls=divs[i].classList[clsi];
- if (cls.indexOf('error')>-1) {
+ if (typeof cls == 'string' && cls.indexOf('error')>-1) {
return true;
}
}
@@ -285,6 +285,8 @@
</script>
<apex:actionFunction name="searchfunc" action="{!searchBtn}" rerender="Form,Block,UnCheckSection" onComplete="unblockUI();"></apex:actionFunction>
+
+<apex:actionFunction name="exchangeAssetfunc" action="{!exchangeAsset}" rerender="Form" onComplete="unblockUI();"></apex:actionFunction>
<apex:actionFunction name="sortTablefunc" action="{!sortTable}" rerender="Form" onComplete="unblockUI();">
<apex:param name="firstParam" assignTo="{!sortKey}" value="" />
@@ -357,8 +359,6 @@
</div>
<div style="position: relative;top:0;height:700px;overflow:hidden;overflow-y:auto;-webkit-overflow-scrolling: touch;">
<input type="hidden" value="{!ir.Id}" id="IrId"/>
- <apex:inputHidden value="{!ir.Responsible_Person_Encrypted__c}" id="Responsible_Person_Encrypted__c"/>
- <apex:inputHidden value="{!ir.phone_Encrypted__c}" id="phone_Encrypted__c"/>
<apex:inputHidden value="{!ir.AWS_Data_Id__c}" id="AWS_Data_Id__c"/>
@@ -539,7 +539,8 @@
<td>
<apex:commandButton value="琛岃拷鍔�" action="{!addNewRows}" disabled="{!Not($ObjectType.Inspection_Item__c.createable)}"
style="margin-left:10px;float:left;" onclick="blockme();" oncomplete="unblockUI();" rerender="Form" />
- <apex:commandButton value="鍒锋柊閫変腑鐨勪繚鏈夎澶�" action="{!exchangeAsset}" onclick="blockme();" oncomplete="unblockUI();" rerender="Form" />
+ <apex:commandButton value="鍒锋柊閫変腑鐨勪繚鏈夎澶�" onclick="exchangeAssetJs();return false;" rerender="dummy"/>
+ <!-- <apex:commandButton value="鍒锋柊閫変腑鐨勪繚鏈夎澶�" action="{!exchangeAsset}" onclick="blockme();" oncomplete="unblockUI();" rerender="Form" /> -->
<!-- <apex:commandButton value="鍒锋柊鍖婚櫌涓嬬殑鍏ㄩ儴淇濇湁璁惧" action="{!getAssetFromHp}" onclick="blockme();" oncomplete="unblockUI();" rerender="Form" /> -->
</td>
</tr>
@@ -571,7 +572,7 @@
<td style="width:95px" align="left"><apex:inputText value="{!val1}" id="val1" style="width:100px"/></td>
<td align="left">
- <apex:commandButton value="妫�绱�" onclick="searchJs();" style="width:130px" rerender="dummy"/>
+ <apex:commandButton value="妫�绱�" onclick="searchJs();return false;" style="width:130px" rerender="dummy"/>
<apex:commandButton value="娓呴櫎鏉′欢" onclick="clearAndSearch();" style="width:130px" rerender="dummy"/>
--
Gitblit v1.9.1