From af7f2ebba1ca53c05ad1c47361c889afd53a9765 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期四, 10 八月 2023 17:26:26 +0800
Subject: [PATCH] 耗材备品
---
force-app/main/default/pages/ConsumReassign.page | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/force-app/main/default/pages/ConsumReassign.page b/force-app/main/default/pages/ConsumReassign.page
index 7a056cb..2447b67 100644
--- a/force-app/main/default/pages/ConsumReassign.page
+++ b/force-app/main/default/pages/ConsumReassign.page
@@ -1,9 +1,11 @@
-<apex:page Controller="ConsumReassignController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="閲嶆柊鍒嗛厤">
+<apex:page Controller="ConsumReassignController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="閲嶆柊鍒嗛厤" 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.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning 聽-->
+
<style>
.decrypt {
position: absolute;
@@ -17,6 +19,10 @@
a:hover .decrypt {
display: block;
width: 100px
+ }
+
+ th > input{
+ margin-left: revert;
}
</style>
<script type="text/javascript">
@@ -56,33 +62,36 @@
var awsdata_map = {};
function DecryptContactName(callback) {
-
+ //2023 08 02 寮犺但闃� PIPL鏀归�� Start
+ console.log('awsdata_map' + JSON.stringify(awsdata_map));
let no_in_ids = [];
j$("[aws-data-id]").each(function (i, e) {
let id = e.getAttribute("aws-data-id");
if (!(id && awsdata_map.hasOwnProperty(id))) {
no_in_ids.push(id);
- }
- });
- if (no_in_ids.length > 0) {
- AWSService.search(staticResource.searchUrl, JSON.stringify({
- "dataIds": no_in_ids
- }), function (data) {
- if (data.object && data.object.length > 0) {
- for (let d of data.object) {
- if (d.dataId) {
- awsdata_map[d.dataId] = d;
- }
+ if (no_in_ids.length > 0) {
+ AWSService.query(staticResource.queryUrl, id, function (data) {
+ console.log('data' + JSON.stringify(data));
+ if (data.object) {
+
+ awsdata_map[data.object.dataId] = data.object;
+ console.log('data.object.dataId' + data.object.dataId);
+ console.log('data.object' + data.object);
+
}
- }
+ BindToTile();
+ if (callback) callback();
+ }, staticResource.token);
+ }
+ else {
BindToTile();
if (callback) callback();
- }, staticResource.token);
- }
- else {
- BindToTile();
- if (callback) callback();
- }
+ }
+ }
+ console.log('awsdata_map' + JSON.stringify(id));
+ console.log('awsdata_map' + JSON.stringify(no_in_ids));
+ });
+ //2023 08 02 寮犺但闃� PIPL鏀归�� Start
}
function BindToTile() {
@@ -90,6 +99,10 @@
let id = e.getAttribute("aws-data-id");
if (id && awsdata_map.hasOwnProperty(id) && awsdata_map[id].trialUser) {
j$(e).find(".decrypt").html(awsdata_map[id].trialUser);
+ //2023 07 04 寮犺但闃� PIPL鏀归�� Start
+ document.getElementById(id).innerHTML = awsdata_map[id].trialUser;
+ console.log('awsdata_map[id].trialUser' + awsdata_map[id].trialUser)
+ //2023 07 04 寮犺但闃� PIPL鏀归�� End
}
});
}
@@ -112,18 +125,20 @@
<apex:outputText id="hasError" value="{!hasError}" style="display:none"/>
<apex:outputText id="rentalApplyId" value="{!rentalApplyId}" style="display:none"/>
- <table class="linetable" border="1" style="border-collapse: collapse;width: 750px;">
+ <table class="linetable" border="1" style="border-collapse: collapse;width: auto;">
<colgroup>
- <col width="25"/>
+ <col width="60"/>
<col width="110"/>
<col width="110"/>
<col width="110"/>
<col width="110"/>
<col width="110"/>
<col width="175"/>
+ <col width="110"/>
+ <col width="175"/>
</colgroup>
<tr style="background-color:#DCDCDC;">
- <th style="text-align:center">鍏ㄩ��
+ <th style="text-align:center">鍏ㄩ��
<apex:inputCheckbox id="checkAll" value="{!checkAll}" onclick="checkAll(this);" />
</th>
<th style="text-align:center">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.Consum_Apply_Equipment_Set__c.label}</th>
@@ -159,7 +174,9 @@
<td align="center">
<apex:outputField value="{!info.caesd.RAESD_Status__c}"></apex:outputField>
</td>
- <td align="center">
+ <!-- //2023 07 04 寮犺但闃� PIPL鏀归�� Start -->
+ <td align="center" id="{!info.caesd.AWS_Data_Id__c}">
+ <!-- //2023 07 04 寮犺但闃� PIPL鏀归�� End -->
<a style="position: relative" href="/{!info.caesd.Id}" aws-data-id="{!info.caesd.AWS_Data_Id__c}" title="">
<span>{!info.caesd.Trial_User__c}</span>
<span class="decrypt"></span>
--
Gitblit v1.9.1