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/staticresources/XinDailyReportTuning2Js.js | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/staticresources/XinDailyReportTuning2Js.js b/force-app/main/default/staticresources/XinDailyReportTuning2Js.js
index d2a980b..9e02391 100644
--- a/force-app/main/default/staticresources/XinDailyReportTuning2Js.js
+++ b/force-app/main/default/staticresources/XinDailyReportTuning2Js.js
@@ -1234,11 +1234,12 @@
} else if (recordName == 'OPD' || recordName == 'SIS' || recordName == 'SIS_ET' || recordName == 'SIS_ENG') {
// 20210107 SWAG-BX24F5 you start
var idReporter2 = j$(escapeVfId('Page:mainForm:idDayEdit:idReporter2')).value();
+
console.log(recordName + '==2021==' + idReporter2);
if (idReporter2 == '閿�鍞湇鍔�') {
recordName = 'OPD';
- } else if (idReporter2 == '閿�鍞帹骞�' && recordName == 'OPD') {
+ } else if (idReporter2 == '鎺ㄥ箍' && recordName == 'OPD') {//2022-4-21 yjk 閿�鍞帹骞挎敼涓烘帹骞�
//2021/01/27 liying start
hiddenDivShowFlg = true;
selectOPDSISReportType1();
@@ -1266,7 +1267,6 @@
}
var sTime = j$(escapeVfId('Page:mainForm:idDayEdit:idReportDate')).value() + ' ' + sHour + ':' + sMinute;
var eTime = j$(escapeVfId('Page:mainForm:idDayEdit:idReportDate')).value() + ' ' + eHour + ':' + eMinute;
-
rId = sforce.apex.execute("Add_Report", "addReportOP2", { repOwnerId: repOwnerId, reportId: reportId, dailyReportId: reId, eventId: id, recordType: recordName, aId: aId, visitor1: visitor1, visitor2: visitor2, visitor3: visitor3, visitor4: visitor4, visitor5: visitor5, opp1: opp1, opp2: opp2, opp3: opp3, opp4: opp4, opp5: opp5, reportDate: reportDate, sTime: sTime, eTime: eTime });
} else if (recordName == 'NTC') {
var sHour = j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':idActStartHour')).value();
@@ -1319,8 +1319,10 @@
}
if (j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).value() == null ||
j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).value() == '') {} else {
- urlStr = '/' + j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).value() + '/e?retURL=%2F' + j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).value();
- window.open(urlStr, '', '');
+ urlStr = '/' + j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).value() + '/e?retURL=%2F' + j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).value()+'&CF00N10000008ps6d_lkid='+OPDId;//2022-4-17 yjk
+ console.log(urlStr);
+ //window.open(urlStr, '', '');
+ window.open(urlStr, '_blank');
changeRed(index, redId);
}
@@ -1548,7 +1550,7 @@
}
}
-function openPDNew(index, id, recordName, hiddenId, redId, reportId) {
+function openPDNew(index, id, recordName, hiddenId, redId, reportId,_OPDId) {
var hiId = j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).value();
var rsflg = j$(escapeVfId('reportStatusFlg')).value();
j$(escapeVfId('Page:mainForm:idDayEdit:idActivities:' + index + ':' + hiddenId)).val(null);// 2021-12-07 yjk 姣忔鎵撳紑寮规
@@ -1673,10 +1675,19 @@
tempIndex = index;
tempActId = id;
- tempRecordTypeName = recordName;
+
+ //2022-4-22 yjk 濡傛灉鑱岀鏄帹骞匡紝鍒欓粯璁ょ粰tempRecordTypeName 灏哋PD鐨勫�兼敼涓� 璧嬪�� SIS start
+ var idReporter2 = j$(escapeVfId('Page:mainForm:idDayEdit:idReporter2')).value();
+ if(idReporter2 == '鎺ㄥ箍' && recordName == 'OPD'){
+ tempRecordTypeName = 'SIS';
+ }else{
+ tempRecordTypeName = recordName;
+ }
+ //2022-4-22 yjk 濡傛灉鑱岀鏄帹骞匡紝鍒欓粯璁ょ粰tempRecordTypeName 灏哋PD鐨勫�兼敼涓� 璧嬪�� SIS end
tempBtnIdHidden = hiddenId;
tempRedId = redId;
tempReportId = reportId;
+ OPDId = _OPDId;
var idStatus = j$(escapeVfId('Page:mainForm:idDayEdit:idStatus')).value();
var hidUserId = j$(escapeVfId('idHiddenUserId')).value();
@@ -1696,7 +1707,6 @@
return;
}
// 娲诲嫊1,2,3 銈備繚瀛樸仐銇熴亜銇с仚銆傘仢銇椼仸Trigger銇仸鍟嗚珖銇仼銇儏鍫便倰绌嶃伩涓娿亽銇俱仚
-
openPDNewJS(index);
} else {
setVisitorPlaceDisabled();
@@ -1870,6 +1880,7 @@
j$("#divOPD").hide();
hiddenDivShowFlg = true;
resetOPDSISRadio();
+ console.log(tempIndex, tempActId, tempRecordTypeName, tempBtnIdHidden, tempRedId, tempReportId);
openPD(tempIndex, tempActId, tempRecordTypeName, tempBtnIdHidden, tempRedId, tempReportId);
}
--
Gitblit v1.9.1