From 3affb8b01f55f90cc047d3048e4ec04aad249e9d Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 09:56:47 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/eSignFormAttachment.page | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/force-app/main/default/pages/eSignFormAttachment.page b/force-app/main/default/pages/eSignFormAttachment.page
index 016c01a..c023007 100644
--- a/force-app/main/default/pages/eSignFormAttachment.page
+++ b/force-app/main/default/pages/eSignFormAttachment.page
@@ -7,7 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<title>
- 鏌ョ湅闄勪欢
+ 鏌ョ湅鏂囦欢
</title>
<script>
var widthJs = "500px";
@@ -139,7 +139,7 @@
<!-- 鏍囬 -->
<div style="height: 40px;background-color:#0f218b;width: 100%;text-align: center;">
<h1 style="color: white;font-size: 24px;">
- 鏌ョ湅闄勪欢
+ 鏌ョ湅鏂囦欢
</h1>
</div>
<div style="height: 30px; margin-top: 10px;">
@@ -150,7 +150,7 @@
4銆�#control 鏃嬭浆鍥炬爣
5銆�#OriginalDiv 鍒囨崲鍘熷浘鍜岀敾甯� -->
<div id="popLayer">
- <!--宸︿晶琛ㄦ牸 灞曠ず鎵�鏈夌殑闄勪欢-->
+ <!--宸︿晶琛ㄦ牸 灞曠ず鎵�鏈夌殑鏂囦欢-->
<div class="solution-list">
<apex:pageBlock id="oppBlock" tabStyle="Report">
<apex:outputPanel >
@@ -158,21 +158,21 @@
<apex:variable value="identif" var="identif" rendered="{!IF(identifier == '缁忛攢鍟�', true, false)}" >
<table class="list" style="border-bottom-width: 0px; width:100%; font-size:11px; border-spacing:0;" border="" id="tableHeader_L">
<tr class="headerRow" height="30px" align="center">
- <td><a href="#" onclick="return false;" >闄勪欢鍚嶇О</a></td>
- <td width="55px"><a href="#" onclick="return false;">闄勪欢绫诲瀷</a></td>
+ <td><a href="#" onclick="return false;" >鏂囦欢鍚嶇О</a></td>
+ <td width="55px"><a href="#" onclick="return false;">鏂囦欢绫诲瀷</a></td>
</tr>
<apex:repeat value="{!acccData}" var="or" id="oppTable">
<apex:variable value="{!1}" var="cnt"/>
- <apex:variable value="trcnt" var="trcnt" rendered="{!IF(or.accessory.ContentType == '缁忛攢鍟�', true, false)}">
- <tr style="cursor:pointer;" onclick="changeColor('{!or.accessory.Id}');onShowImge('{!or.accessory.Id}',this);" class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
+ <apex:variable value="trcnt" var="trcnt" rendered="{!IF(or.accessory.Description == '缁忛攢鍟�', true, false)}">
+ <tr style="cursor:pointer;" onclick="changeColor('{!or.accessory.ContentDocumentId}');onShowImge('{!or.accessory.ContentDocumentId}',this);" class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
<td align="center" id="" style="border-right-width:thin">
- <a href="#"><apex:outputText value="{!or.accessory.Name}" /></a>
+ <a href="#"><apex:outputText value="{!or.accessory.Title}.{!or.accessory.FileType}" /></a>
</td>
<td width="55px" align="center">
- <apex:outputText value="{!or.accessory.ContentType}" />
+ <apex:outputText value="{!or.accessory.Description}" />
</td>
<td style="display:none">
- <apex:outputText value="{!or.accessory.Id}"/>
+ <apex:outputText value="{!or.accessory.ContentDocumentId}"/>
</td>
</tr>
</apex:variable>
@@ -186,8 +186,8 @@
<table class="list" style="border-bottom-width: 0px; width:100%; font-size:11px; border-spacing:0;" border="" id="tableHeader_M">
<apex:variable value="identif" var="identif" rendered="{!IF(identifier2 == '鍖婚櫌' && identifier != '缁忛攢鍟�' , true, false)}">
<tr class="headerRow" height="30px" align="center">
- <td><a href="#" onclick="return false;" >闄勪欢鍚嶇О</a></td>
- <td width="55px"><a href="#" onclick="return false;">闄勪欢绫诲瀷</a></td>
+ <td><a href="#" onclick="return false;" >鏂囦欢鍚嶇О</a></td>
+ <td width="55px"><a href="#" onclick="return false;">鏂囦欢绫诲瀷</a></td>
</tr>
</apex:variable>
<apex:variable value="identif" var="identif" rendered="{!IF(identifier2 == '鍖婚櫌' && identifier == '缁忛攢鍟�' , true, false)}">
@@ -197,16 +197,16 @@
</apex:variable>
<apex:repeat value="{!acccData}" var="or" id="oppTable2">
<apex:variable value="{!1}" var="cnt"/>
- <apex:variable value="trcnt" var="trcnt" rendered="{!IF(or.accessory.ContentType == '鍖婚櫌', true, false)}">
- <tr style="cursor:pointer;" onclick="changeColor('{!or.accessory.Id}');onShowImge('{!or.accessory.Id}',this);" class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
+ <apex:variable value="trcnt" var="trcnt" rendered="{!IF(or.accessory.Description == '鍖婚櫌', true, false)}">
+ <tr style="cursor:pointer;" onclick="changeColor('{!or.accessory.ContentDocumentId}');onShowImge('{!or.accessory.ContentDocumentId}',this);" class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
<td align="center" id="" style="border-right-width:thin">
- <a href="#"><apex:outputText value="{!or.accessory.Name}" /></a>
+ <a href="#"><apex:outputText value="{!or.accessory.Title}.{!or.accessory.FileType}" /></a>
</td>
<td width="55px" align="center">
- <apex:outputText value="{!or.accessory.ContentType}" />
+ <apex:outputText value="{!or.accessory.Description}" />
</td>
<td style="display:none">
- <apex:outputText value="{!or.accessory.Id}"/>
+ <apex:outputText value="{!or.accessory.ContentDocumentId}"/>
</td>
</tr>
</apex:variable>
@@ -226,10 +226,10 @@
</h1>
</div>
<div class="solution-item" id="imgeDiv">
- <div id="onCloseId" style="position: absolute;top:55px;padding-left:73%;cursor:pointer;display:none;"><a href="javascript:void(0)" onclick="closePop()" style="padding-rigth:13px;color:#fff;font-weight:bolder;font-size:15px;text-decoration: none;">鍏抽棴</a></div>
+ <div id="onCloseId" style="position: absolute;top:75px;padding-left:67%;cursor:pointer;display:none;"><a href="javascript:void(0)" onclick="closePop()" style="padding-rigth:13px;color:#fff;font-weight:bolder;font-size:15px;text-decoration: none;">鍏抽棴</a></div>
<!-- 澧炲姞pdf鍏抽棴鎸夐挳 绮剧悽鎶�鏈� thh 2021-09-27 start -->
<div class="PdfCss" id="fontpdf" style="display: none;">
- <h1 style="position:absolute;top:50%;margin:-4% 0 0 -10%;">
+ <h1 style="position:absolute;top:50%;">
<font face="verdana" style="font-size: 40px;">姝ら〉鏆傛椂鍙敮鎸佸浘鐗囨枃浠剁殑棰勮</font>
</h1>
</div>
@@ -320,10 +320,10 @@
document.getElementById("imgeDiv").style.display='block';
fadeIn("imgeDiv",1000);
- //鑾峰彇鐐瑰嚮鐨勯檮浠跺悕绉�
+ //鑾峰彇鐐瑰嚮鐨勬枃浠跺悕绉�
var accName = obj.cells[0].innerText;
//asdf-kjklljk 鐢靛瓙绛炬敹-鎷呭綋鐜妭浼樺寲寮�鍙� 绮剧悽鎶�鏈� wql 2021/08/09 start
- //鑾峰彇鐐瑰嚮鐨勯檮浠剁被鍨�
+ //鑾峰彇鐐瑰嚮鐨勬枃浠剁被鍨�
var accContentType = obj.cells[1].innerText;
//asdf-kjklljk 鐢靛瓙绛炬敹-鎷呭綋鐜妭浼樺寲寮�鍙� 绮剧悽鎶�鏈� wql 2021/08/09 end
//鎴彇鍚庣紑鍚�
@@ -340,7 +340,7 @@
}else{
//濡傛灉涓嶆槸鍥剧墖锛岄偅涔堜笅杞芥枃浠�
//window.open('https://ocsm--stagefull--c.documentforce.com/servlet/servlet.FileDownload?file='+accId);
- window.open('https://ocsm--c.ap0.content.force.com/servlet/servlet.FileDownload?file='+accId);
+ window.open('/sfc/servlet.shepherd/document/download/'+accId);
debugger
//鍙宠竟鐨勭敾甯冩樉绀�
showPdf();
@@ -478,7 +478,8 @@
}
//鍥剧墖鍔犺浇鍜宑anvas 鐢诲浘
function imgShow(accId,accContentType){
- var imageUrl = "/servlet/servlet.FileDownload?file="+accId;
+ // var imageUrl = "/servlet/servlet.FileDownload?file="+accId;
+ var imageUrl = "/sfc/servlet.shepherd/document/download/"+accId;
//js鍔ㄦ�佽祴鍊�
document.getElementById("j_id0:testImg").src = imageUrl;
//js鍔ㄦ�佽祴鍊�
@@ -846,14 +847,14 @@
mouseDownLocation = windowToCanvas(canvas, event.clientX, event.clientY);
if (isPointInImageArea(mouseDownLocation)) {
isMouseDown = true;
- document.title = '鏌ョ湅闄勪欢';
+ document.title = '鏌ョ湅鏂囦欢';
}
}
/**榧犳爣寮硅捣*/
document.body.onmouseup = function() {
isMouseDown = false;
canvas.style.cursor = "default";
- document.title = '鏌ョ湅闄勪欢';
+ document.title = '鏌ョ湅鏂囦欢';
}
/**榧犳爣绉诲姩*/
pandiv.onmousemove = function(event) {
--
Gitblit v1.9.1