From 2b969ede326bf33a9a0402ea96a0261631591dc4 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期三, 24 五月 2023 11:47:23 +0800
Subject: [PATCH] 入库管理编码验证程序调整
---
force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js | 104 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js b/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js
index bb2bfe6..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鏄惁涓虹┖ 涓嶄负绌哄垯闅愯棌妫�绱㈤〉
@@ -528,16 +546,31 @@
//濡傛灉绛炬敹鍗曞綍鍏ヨ〃鏈夋暟鎹紝鍏堝彇褰曞叆琛ㄧ殑鍚﹀垯灏辨绱㈢鏀跺崟淇℃伅
var result;
//瀛樻斁褰曞叆琛╨ist
- var eSignFormEntryList;
+ var eSignFormEntryList=[];
//瀛樻斁绛炬敹鍗昹ist
- var eSignFormList;
+ var eSignFormList=[];
+ //fy 20220727 start
+ //瀛樻斁闄勪欢鍚�
+ var AttachmentMap = new Map();
+ //fy 20220727 end
if (res) {
- if (res.eSignFormEntryList != null) {
+ if (res.eSignFormEntryList != undefined) {
eSignFormEntryList = res.eSignFormEntryList;
}
- if (res.eSignFormList != null) {
+ if (res.eSignFormList != undefined) {
eSignFormList = res.eSignFormList;
}
+ //fy 20220727 start
+ if (res.AttachmentStringList!=undefined) {
+ for(var i = 0; i < res.AttachmentStringList.length; i++){
+ var liststr=[];
+ liststr=res.AttachmentStringList[i].split('_');
+ if(liststr.length>0){
+ AttachmentMap.set(liststr[0],liststr[1]);
+ }
+ }
+ }
+ //fy 20220727 end
var today = this.getNowFormatDate();
if (eSignFormEntryList) {
for (var i = 0; i < eSignFormList.length; i++) {
@@ -583,6 +616,18 @@
}
var pageSize = cmp.get('v.pageSize');
+ //fy 20220727 start
+ debugger
+ if(res){
+ if(AttachmentMap.size>0){
+ for(var i = 0; i < result.length; i++){
+ if(AttachmentMap.has(result[i].Id)){
+ result[i].AttachmentName=AttachmentMap.get(result[i].Id);
+ }
+ }
+ }
+ }
+ //fy 20220727 end
cmp.set("v.data", result);
var data = result;
cmp.set("v.lineItemSize", data.length);
@@ -1002,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);
@@ -1017,7 +1069,7 @@
},
getURLISTrueParameter: function() {
- var url = location.search;
+ var url = window.location.search;
var flag;
if (url.indexOf("?") != -1) {
flag = true;
@@ -1129,7 +1181,7 @@
},
//js 妯＄硦妫�绱�
filterByName: function(aim, name) {
- return aim.filter(item => item.DNNameNo0__c.match(name));
+ return aim.filter(item => item.DNNameNo0__c.match(name)||item.ContractNO__c.match(name));
},
openESignPage: function(cmp, event) {
//鑾峰彇鎸夐挳涓睘鎬ame == 鑾峰彇鍙傛暟 绠卞彿
@@ -1405,8 +1457,28 @@
});
$A.enqueueAction(action);
- }
-
-
+ },
+ // 杩涘彛鍗曡瘉 fy start
+ showAttachmentDisplay: function(cmp, event) {
+ debugger
+ var DNId = event.target.name;
+ cmp.set('v.DNId', DNId);
+ cmp.set('v.AttachmentDisplayflag', true);
+ cmp.set('v.DNListPage', false);
+ },
+ rebackDNListPage: function(cmp, event) {
+ 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