From 042735c4d44e740121dbbb52257617d348a1c391 Mon Sep 17 00:00:00 2001
From: fuyu <fuyu@prec-tech.com>
Date: 星期一, 06 三月 2023 13:39:38 +0800
Subject: [PATCH] Merge branch '进口单证+obsap+导入'
---
force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js b/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js
index 0ed8a50..70891b5 100644
--- a/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js
+++ b/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js
@@ -1,6 +1,6 @@
({
init: function(cmp, event) {
-
+ debugger
// 鍒涘缓Base64瀵硅薄
var Base64 = {
_keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
@@ -84,9 +84,13 @@
};
//鍒ゆ柇url鏄惁鏈夊弬鏁�
+ debugger
var flag = this.getURLISTrueParameter();
//鍙傛暟瀵硅薄map
- var paramValue = this.getURLParameterValue();
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy start
+ // var paramValue = this.getURLParameterValue();
+ var paramValue = this.getURLParameterValue(cmp);
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy end
//鍙傛暟瀵硅薄map鐨勯暱搴�
var length = Object.keys(paramValue).length;
@@ -222,11 +226,25 @@
//瑙ｇ爜鍚庣殑绠＄悊缂栫爜
cmp.set("v.decodeCode", code.replace(reg, "$2"));
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy start
//闅愯棌妫�绱㈤〉
- cmp.set("v.DNNameInput", true);
+ // cmp.set("v.DNNameInput", true);
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy start
//鏄剧ず棣栭〉
cmp.set('v.buttonGroup', false);
-
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy start
+ if(paramValue.pinit=='true'){
+ cmp.set("v.DNNameInput", false);
+ cmp.set("v.code", code.replace(reg, "$2"));
+ cmp.set('v.allWidth', document.documentElement.clientWidth - 40);
+ cmp.set('v.floatWidth', document.documentElement.clientWidth * 0.85);
+ cmp.set('v.floatWidth1', document.documentElement.clientWidth);
+ console.log('floatWidth:' + document.documentElement.clientWidth * 0.85);
+ this.getAccountHandler(cmp);
+ }else{
+ cmp.set("v.DNNameInput", true);
+ }
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy end
}
//鍒ゆ柇DNName鏄惁涓虹┖ 涓嶄负绌哄垯闅愯棌妫�绱㈤〉
@@ -1029,14 +1047,21 @@
// add slds-hide class from mySpinner
var spinner = cmp.find("mySpinner");
$A.util.addClass(spinner, "slds-hide");
- },
- getURLParameterValue: function() {
+ }, //20230302 杩涘彛鍗曡瘉鏀归�� fy start
+ getURLParameterValue: function(cmp) {
+ // getURLParameterValue: function() {
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy end
- var querystring = location.search.substr(1);
+ var querystring = window.location.search.substr(1);
var paramValue = {};
querystring.split("&").forEach(function(part) {
var param = part.split("=");
paramValue[param[0]] = decodeURIComponent(param[1]);
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy start
+ if(param[0]=='AgencyID'){
+ cmp.set("v.AgencyIDM", param[1]);
+ }
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy end
});
//console.log('paramValue-' + paramValue);
@@ -1044,7 +1069,7 @@
},
getURLISTrueParameter: function() {
- var url = location.search;
+ var url = window.location.search;
var flag;
if (url.indexOf("?") != -1) {
flag = true;
@@ -1445,7 +1470,15 @@
debugger
cmp.set('v.AttachmentDisplayflag', false);
cmp.set('v.DNListPage', true);
- }
+ },
+ showAttachmentDisplay2: function(cmp, event) {
+ debugger
+ var DNId = event.target.name;
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy start
+ var AgencyIDM = cmp.get('v.AgencyIDM');
+ window.open('/eSignSystem/s/AttachmentDisplay?DNId=' + DNId+'&AgencyIDM='+AgencyIDM, '_blank');
+ //20230302 杩涘彛鍗曡瘉鏀归�� fy end
+ },
// 杩涘彛鍗曡瘉 fy end
})
\ No newline at end of file
--
Gitblit v1.9.1