From 8db20630a2675ca14e03ccdee91c614397b5c964 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 16:21:46 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js | 375 ++++++++++++++++++++++++-----------------------------
1 files changed, 172 insertions(+), 203 deletions(-)
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
index 50e0ee9..e177114 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
@@ -15,13 +15,9 @@
component.find('select_DealerPersonnel').set('v.options', this.conv_selected(res.allselectlist.DealerPersonnel__c));
component.find('select_purpose_type').set('v.options', this.conv_selected(res.allselectlist.WorkRecord__c));
component.find('select_ProductClassification').set('v.options', this.conv_selected(res.allselectlist.ProductClassification__c));
- // component.find('select_OtherBrandConsumables').set('v.options', this.conv_selected(res.allselectlist.OtherBrandConsumables__c));
- component.find('select_ProductCcategory').set('v.options', this.conv_selected(res.allselectlist.ProductCcategory__c));
- // component.set('v.select_WorkMark',true);
component.find('select_stageName').set('v.options', this.conv_selected(res.allselectlist.StageName__c));
component.set('v.selected_agency_person', res.allselectlist.AgencyPerson__c[0].label);
component.set('v.dialog_type', '鏂板缓');
-
this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
component.set('v.login', false);
}
@@ -33,7 +29,23 @@
});
$A.enqueueAction(action);
},
-
+ //鍏朵粬鍝佺墝浜у搧绫诲埆 涓嬫媺妗嗚祴鍊�
+ selectProductCcategory : function(component){
+ var select_ProductClassification = component.find('select_ProductClassification').get('v.value');
+ if(select_ProductClassification != ''){
+ var action = component.get('c.selectProductCcategory');
+ action.setCallback(this,function( response){
+ var state = response.getState();
+ if (state == 'SUCCESS') {
+ var res = response.getReturnValue();
+ component.find('select_ProductCcategory').set('v.options', JSON.parse(JSON.stringify(res)));
+ }
+ });
+ $A.enqueueAction(action);
+ }else{
+ component.find('select_ProductCcategory').set('v.options', []);
+ }
+ },
//鏍规嵁鍛ㄥ拰鎷呭綋鏌ヨ鏁版嵁缁欏垵濮嬮〉闈㈣祴鏁版嵁
get_reports: function (component, event, helper, date_str, person_str) {
if (!date_str) {
@@ -45,7 +57,6 @@
"date_str": date_str,
"person_str": person_str,
});
-
component.set('v.login', true);
action.setCallback(this, function (response) {
var state = response.getState();
@@ -53,7 +64,6 @@
var res = response.getReturnValue();
component.set('v.reports', res.reports);
component.set('v.report_count', res.reports.length);
-
// 鏇存柊淇濆瓨寰屻伄select_data鐢�
var report_id = component.get('v.update_select_report_data_id');
if (report_id != "") {
@@ -75,7 +85,6 @@
else {
component.set('v.errorMessage', 'get_reports failed.');
this.showErrorToast(component);
- // this.error('get_reports failed.');
component.set('v.login', false);
}
});
@@ -108,9 +117,8 @@
}
return new_label;
},
-
-
- toggle_report: function (component, event, helper) {
+ //澶嶅埗鍜岀紪杈戝洖鏄剧殑浣嶇疆
+ toggle_report: function (component) {
var modal_window = component.find('modal_window');
var modal_bg = component.find('modal_bg');
if ($A.util.hasClass(modal_window, 'disp_none')) {
@@ -141,10 +149,10 @@
component.set('v.hospitalLinkId', select_data['Agency_Hospital__c']);
component.find('new_con').set('v.disabled', false);
}
- //浣跨敤浜у搧1
+ //浣跨敤浜у搧1(浜у搧鍨嬪彿)
var UseProduct1Text = '';
var UseProduct1Id = '';
- if (select_data['UseProduct1__c'] != '') {
+ if (select_data['UseProduct1__c'] != '' || select_data['UseProduct1__c'] != 'undefined') {
for (var i = 0; i < reports.length; i++) {
if (reports[i]['UseProduct1__c'] == select_data['UseProduct1__c']) {
UseProduct1Text = reports[i]['UseProduct1__r']['Name'];
@@ -180,7 +188,6 @@
component.set('v.UseProduct3', UseProduct3Text);
component.set('v.UseProduct3Id', select_data['UseProduct3__c']);
}
-
//娲诲姩鏃�
var reportDate;
if (select_data['Report_Date__c'] != '') {
@@ -199,32 +206,25 @@
if (select_data['DealerPersonnel__c'] != '') {
this.set_selected(component, 'select_DealerPersonnel', select_data['DealerPersonnel__c']);
}
- // 鎷滆浜�
+ // 鍖婚櫌浜哄憳
component.set('v.default_select_doctor_id', select_data['doctor2__c']);
- this.set_doctor_list(component, event, helper);
- // 宸ヤ綔璁板綍浼�
+ this.set_doctor_list(component);
+
+ // 宸ヤ綔璁板綍
if (select_data['WorkRecord__c'] != '') {
this.set_selected(component, 'select_purpose_type', select_data['WorkRecord__c']);
this.selectPurposeType(component);
-
}
- //浜у搧鍒嗙被
+ //浜у搧鍒嗙被(绗笁鍒嗙被)
if (select_data['ProductClassification__c'] != null) {
this.set_selected(component, 'select_ProductClassification', select_data['ProductClassification__c']);
this.selectProductClassification(component);
}
- alert(component.find('select_EffectProgress').get('v.value'));
-
// 绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺
if (select_data['ConsumptionOfConsumables__c'] != '') {
component.find('select_ConsumptionOfConsumables').set('v.value',select_data['ConsumptionOfConsumables__c']);
}
-
- // 鍏朵粬鍝佺墝鑰楁潗浣跨敤
- if (select_data['ProductCcategory__c'] != '') {
- this.set_selected(component, 'select_ProductCcategory', select_data['ProductCcategory__c']);
- }
- // 鏈＋浣跨敤浜у搧瀵瑰簲鏁伴噺
+ // 浜у搧鐢ㄩ噺
if (select_data['warlocksNumber__c'] != '') {
component.find('select_warlocksNumber').set('v.value',select_data['warlocksNumber__c']);
}
@@ -232,44 +232,45 @@
if (select_data['WorkMark__c'] != false) {
component.find('select_WorkMark').set('v.checked',select_data['WorkMark__c']);
}
- // 鍏朵粬鍝佺墝鑰楁潗浣跨敤
- // if (select_data['OtherBrandConsumables__c'] != '') {
- // this.set_selected(component, 'select_OtherBrandConsumables', select_data['OtherBrandConsumables__c']);
- // }
- // var OtherBrandConsumables = '';
- // var i = 0;
- // for (i = 0; i < reports.length; i++) {
- // OtherBrandConsumables = reports[i]["OtherBrandConsumables__c"];
- // break;
- // }
- // alert('22222'+OtherBrandConsumables);
- // if (OtherBrandConsumables != null && OtherBrandConsumables != '') {
-
- // component.find('select_OtherBrandConsumables').set('v.value', OtherBrandConsumables);
- // alert('3333333'+component.find('select_OtherBrandConsumables').get('v.value'));
- // }
+ debugger;
+
var report_id = component.get('v.edit_copy_select_report_id');
if (report_id != "") {
var select_EffectProgress1 = '';
- var OtherBrandConsumables = '';
+ var WarlockClassification = '';
+ var ProductCcategory = '';
+ var productCategories = '';
var i = 0;
for (i = 0; i < reports.length; i++) {
- select_EffectProgress1 = reports[i]["EffectProgress__c"];
- OtherBrandConsumables = reports[i]["OtherBrandConsumables__c"];
- break;
+ if (report_id == reports[i]["Id"]) {
+ select_EffectProgress1 = reports[i]["EffectProgress__c"];
+ WarlockClassification = reports[i]["WarlockClassification__c"];
+ ProductCcategory = reports[i]["ProductCcategory__c"];
+ productCategories = reports[i]["productCategories__c"];
+ break;
+ }
}
+ //鏁堟灉/杩涘害
if (select_EffectProgress1 != null && select_EffectProgress1 != '') {
component.find('select_EffectProgress').set('v.value', select_EffectProgress1);
}
- if (OtherBrandConsumables != null && OtherBrandConsumables != '') {
- component.find('select_OtherBrandConsumables').set('v.value', OtherBrandConsumables);
+ //鏈＋鍒嗙被
+ if (WarlockClassification != null && WarlockClassification != '') {
+ component.find('select_OtherBrandConsumables').set('v.value', WarlockClassification);
+ }
+ //宸查噰鐢ㄥ叾浠栧搧鐗�
+ if (ProductCcategory != null && ProductCcategory != '') {
+ component.find('select_ProductCcategory').set('v.value', ProductCcategory);
+ this.selectpurposetype(component);
+ }
+ //鍏朵粬鍝佺墝浜у搧绫诲埆
+ if (productCategories != null && productCategories != '') {
+ component.find('select_productCategories').set('v.value', productCategories);
}
component.set('v.edit_copy_select_report_id', "");
}
- alert(component.find('select_EffectProgress').get('v.value'));
}
} else {
- // CLOSE agency_report_header_id
var select_report_data = component.get('v.select_report_data');
var Report_Date__c = component.get('v.data.Report_Date__c');
var Agency_Hospital__c = component.get('v.hospitalLinkId');
@@ -282,8 +283,9 @@
var doctor2__c = component.find('select_doctor').get('v.value');
var WorkRecord__c = component.find('select_purpose_type').get('v.value');
var EffectProgress__c = component.find('select_EffectProgress').get('v.value');
- var OtherBrandConsumables__c = component.find('select_OtherBrandConsumables').get('v.value');
+ var WarlockClassification__c = component.find('select_OtherBrandConsumables').get('v.value');
var ProductCcategory__c = component.find('select_ProductCcategory').get('v.value');
+ var productCategories__c = component.find('select_productCategories').get('v.value');
var warlocksNumber__c = component.find('select_warlocksNumber').get('v.value');
var WorkMark__c = component.find('select_WorkMark').get('v.checked');
if (component.get('v.mode') == 'new') {
@@ -299,8 +301,9 @@
!DealerPersonnel__c &&
!doctor2__c &&
!EffectProgress__c &&
- !OtherBrandConsumables__c &&
+ !WarlockClassification__c &&
!ProductCcategory__c &&
+ !productCategories__c &&
!warlocksNumber__c &&
!WorkMark__c &&
!WorkRecord__c
@@ -314,7 +317,6 @@
} else if (component.get('v.mode') == 'copy') {
var confirm_title = '璀﹀憡!'
var confirm_text = '鏀惧純鏂板缓鍛ㄦ姤锛�';
-
if (select_report_data['Report_Date__c'] == Report_Date__c &&
select_report_data['Agency_Hospital__c'] == Agency_Hospital__c &&
select_report_data['UseProduct1__c'] == UseProduct1__c &&
@@ -325,8 +327,9 @@
select_report_data['DealerPersonnel__c'] == DealerPersonnel__c &&
select_report_data['doctor2__c'] == doctor2__c &&
select_report_data['EffectProgress__c'] == EffectProgress__c &&
- select_report_data['OtherBrandConsumables__c'] == OtherBrandConsumables__c &&
+ select_report_data['WarlockClassification__c'] == WarlockClassification__c &&
select_report_data['ProductCcategory__c'] == ProductCcategory__c &&
+ select_report_data['productCategories__c'] == productCategories__c &&
select_report_data['warlocksNumber__c'] == warlocksNumber__c &&
select_report_data['WorkMark__c'] == WorkMark__c &&
select_report_data['WorkRecord__c'] == WorkRecord__c ) {
@@ -349,8 +352,9 @@
select_report_data['DealerPersonnel__c'] == DealerPersonnel__c &&
select_report_data['doctor2__c'] == doctor2__c &&
select_report_data['EffectProgress__c'] == EffectProgress__c &&
- select_report_data['OtherBrandConsumables__c'] == OtherBrandConsumables__c &&
+ select_report_data['WarlockClassification__c'] == WarlockClassification__c &&
select_report_data['ProductCcategory__c'] == ProductCcategory__c &&
+ select_report_data['productCategories__c'] == productCategories__c &&
select_report_data['warlocksNumber__c'] == warlocksNumber__c &&
select_report_data['WorkMark__c'] == WorkMark__c &&
select_report_data['WorkRecord__c'] == WorkRecord__c ) {
@@ -361,7 +365,6 @@
this.close_confirm(component, confirm_title, confirm_text);
}
}
-
}
},
//鍏抽棴椤甸潰鏄� 灏忕殑鎻愮ず妗嗘槸鍚︽斁寮冩柊寤哄懆鎶�
@@ -373,7 +376,6 @@
var modal_bg = component.find('modal_bg');
var modal_confirm = component.find('modal_confirm');
var modal_confirm_bg = component.find('modal_confirm_bg');
-
if (confirm_status == 0) {
$A.util.addClass(modal_window, 'disp_none');
$A.util.addClass(modal_bg, 'disp_none');
@@ -405,6 +407,10 @@
var select_date = component.find('select_date').get('v.value');
// 鎷呭綋
var select_agency = component.find('select_agency_person').get('v.value');
+ var cm = 0;
+ if(select_agency.indexOf(";") != -1){
+ select_agency = select_agency.split(";")[0];
+ }
component.set('v.selected_date', select_date);
// 鎷呭綋
var name = component.get('v.selected_agency_person');
@@ -444,7 +450,7 @@
}
}
},
-
+ //缂栬緫鎸夐挳
edit_button: function (component, event, helper) {
this.allclear(component);
component.set('v.loadOpp', true);
@@ -464,7 +470,7 @@
component.set('v.edit_copy_select_report_id', component.get('v.reports')[index].Id);
var ret = this.create_report_header(component, event, helper, name, select_agency, select_date);
},
-
+ //淇濆瓨
save_report: function (component, event, helper) {
component.find('save_button').set('v.disabled', true);
var etEng = component.get('v.etEng');
@@ -474,67 +480,48 @@
if (component.get('v.mode') == 'edit') {
// 鍛� Submit_date__c
Submit_date__c = component.get('v.select_report_data').Submit_date__c;
-
// 鎷呭綋 Person_In_Charge2__c
Person_In_Charge2__c = component.get('v.select_report_data').Person_In_Charge2__c;
} else {
// 鍛� Submit_date__c
Submit_date__c = this.get_date_string(component.find('select_date').get('v.value'));
-
// 鎷呭綋 Person_In_Charge2__c
Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
}
// Agency_Report_Header__c
var Agency_Report_Header__c = component.get('v.agency_report_header_id');
-
-
- // 鍖婚櫌 Agency_Hospital__c (Agency_Hospital_Link__c)
+ // 鍖婚櫌
var Agency_Hospital__c = component.get('v.hospitalLinkId');
-
- // 浜у搧鍒嗙被
+ // 浜у搧鍒嗙被(绗笁鍒嗙被)
var ProductClassification__c = component.find('select_ProductClassification').get('v.value');
-
- // 浣跨敤浜у搧1 UseProduct1__c
+ // 浣跨敤浜у搧1(浜у搧鍨嬪彿) UseProduct1__c
var UseProduct1__c = component.get('v.UseProduct1Id');
-
// 浣跨敤浜у搧2 UseProduct2__c
var UseProduct2__c = component.get('v.UseProduct2Id');
-
-
// 浣跨敤浜у搧3 UseProduct3__c
var UseProduct3__c = component.get('v.UseProduct3Id');
-
-
- // 绉戝 Department_Cateogy__c 鏈壘鍒�
+ // 绉戝 Department_Cateogy__c
var Department_Cateogy__c = component.find('select_department').get('v.value');
-
// 缁忛攢鍟嗕汉鍛� DealerPersonnel__c
var DealerPersonnel__c = component.find('select_DealerPersonnel').get('v.value');
-
- // 鎷滆浜� doctor2__c
+ // 鍖婚櫌浜哄憳 doctor2__c
var doctor2__c = component.find('select_doctor').get('v.value');
-
- // 宸ヤ綔璁板綍浼� WorkRecord__c
+ // 宸ヤ綔璁板綍浼� WorkRecord__c
var WorkRecord__c = component.find('select_purpose_type').get('v.value');
-
// 鏁堟灉/杩涘害 EffectProgress__c
- var EffectProgress__c = component.find('select_EffectProgress').get('v.value');
-
- // 绉戝鍚屾潵鑰楁潗鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c 鏈壘鍒�
+ var EffectProgress__c = component.find('select_EffectProgress').get('v.value');
+ // 绉戝鍚屾潵鑰楁潗鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c
var ConsumptionOfConsumables__c = component.find('select_ConsumptionOfConsumables').get('v.value');
-
- // 鍏朵粬鍝佺墝鑰楁潗浣跨敤 OtherBrandConsumables__c
- var OtherBrandConsumables__c = component.find('select_OtherBrandConsumables').get('v.value');
-
- // 浜у搧绫诲埆 ProductCcategory__c
+ // 鏈＋鍒嗙被 WarlockClassification__c
+ var WarlockClassification__c = component.find('select_OtherBrandConsumables').get('v.value');
+ // 宸查噰鐢ㄥ叾浠栧搧鐗� ProductCcategory__c
var ProductCcategory__c = component.find('select_ProductCcategory').get('v.value');
-
- // 鏈＋浣跨敤浜у搧瀵瑰簲鏁伴噺 warlocksNumber__c
- var warlocksNumber__c = component.find('select_warlocksNumber').get('v.value');
-
+ // 鍏朵粬鍝佺墝浜у搧绫诲埆 productCategories__c
+ var productCategories__c = component.find('select_productCategories').get('v.value');
+ // 浜у搧鐢ㄩ噺 warlocksNumber__c
+ var warlocksNumber__c = component.find('select_warlocksNumber').get('v.value');
// 宸ヤ綔鏍囪 WorkMark__c
var WorkMark__c = component.find('select_WorkMark').get('v.checked');
-
var StageName__c = component.find('select_stageName').get('v.value');
var Amount__c = component.get('v.oppdata.Amount__c') != null ? component.get('v.oppdata.Amount__c').toString() : '';
var OCMSale_Price__c = component.get('v.oppdata.OCMSale_Price__c') != null ? component.get('v.oppdata.OCMSale_Price__c').toString() : '';
@@ -566,18 +553,19 @@
if (!Person_In_Charge2__c) { error.push("鎷呭綋 涓嶅瓨鍦�"); }
if (!Agency_Report_Header__c) { this.error("Report Header Id 涓嶅瓨鍦�"); }
if (!Agency_Hospital__c) { error.push("鍖婚櫌 涓嶅瓨鍦�"); }
- if (!UseProduct1__c) { error.push("浣跨敤浜у搧1 涓嶅瓨鍦�"); }
+ if (!UseProduct1__c) { error.push("浣跨敤浜у搧1(浜у搧鍨嬪彿) 涓嶅瓨鍦�"); }
if (!UseProduct2__c) { error.push("浣跨敤浜у搧2 涓嶅瓨鍦�"); }
if (!UseProduct3__c) { error.push("浣跨敤浜у搧3 涓嶅瓨鍦�"); }
if (!Department_Cateogy__c) { error.push("绉戝 涓嶅瓨鍦�"); }
if (!DealerPersonnel__c) { error.push("缁忛攢鍟嗕汉鍛� 涓嶅瓨鍦�"); }
- if (!doctor2__c) { error.push("鎷滆浜� 涓嶅瓨鍦�"); }
- if (!WorkRecord__c) { error.push("宸ヤ綔璁板綍浼� 涓嶅瓨鍦�"); }
+ if (!doctor2__c) { error.push("鍖婚櫌浜哄憳 涓嶅瓨鍦�"); }
+ if (!WorkRecord__c) { error.push("宸ヤ綔璁板綍 涓嶅瓨鍦�"); }
if (!EffectProgress__c) { error.push("鏁堟灉/杩涘害 涓嶅瓨鍦�"); }
- if (!OtherBrandConsumables__c) { error.push("鍏朵粬鍝佺墝鑰楁潗浣跨敤 涓嶅瓨鍦�"); }
- if (!ProductCcategory__c) { error.push("浜у搧绫诲埆 涓嶅瓨鍦�"); }
+ // if (!OtherBrandConsumables__c) { error.push("鏈＋鍒嗙被 涓嶅瓨鍦�"); }
+ if (!ProductCcategory__c) { error.push("宸查噰鐢ㄥ叾浠栧搧鐗� 涓嶅瓨鍦�"); }
+ // if (!productCategories__c) { error.push("鍏朵粬鍝佺墝浜у搧绫诲埆 涓嶅瓨鍦�"); }
if (!ConsumptionOfConsumables__c) { error.push("绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺 涓嶈兘涓虹┖"); }
- if (!warlocksNumber__c) { error.push("鏈＋浣跨敤浜у搧瀵瑰簲鏁伴噺 涓嶈兘涓虹┖"); }
+ if (!warlocksNumber__c) { error.push("浜у搧鐢ㄩ噺 涓嶈兘涓虹┖"); }
for (var i = 0; i < error.length; i++) {
component.set('v.errorMessage', error[i]);
this.showErrorToast(component);
@@ -597,8 +585,9 @@
"ConsumptionOfConsumables": ConsumptionOfConsumables__c,
"WorkRecord": WorkRecord__c,
"EffectProgress": EffectProgress__c,
- "OtherBrandConsumables" : OtherBrandConsumables__c,
+ "WarlockClassification" : WarlockClassification__c,
"ProductCcategory" : ProductCcategory__c,
+ "productCategories" : productCategories__c,
"warlocksNumber" : warlocksNumber__c,
"WorkMark" : WorkMark__c,
"ProductClassification": ProductClassification__c,
@@ -617,8 +606,6 @@
"Close_Forecasted_Date": Close_Forecasted_Date__c,
"Report_Date": Report_Date__c
});
-
-
action.setCallback(this, function (response) {
var state = response.getState();
if (state == 'SUCCESS') {
@@ -627,7 +614,6 @@
var report_id = response.getReturnValue();
component.set('v.create_agency_report_id', report_id);
var select_agency_list = component.get('v.allselectlist').AgencyPerson__c;
-
for (var i = 0; i < select_agency_list.length; i++) {
if (select_agency_list[i].value == component.get('v.select_report_data').Person_In_Charge2__c) {
select_agency_list[i].selected = true;
@@ -636,14 +622,12 @@
}
}
component.find('select_agency_person').set('v.options', select_agency_list);
-
component.set('v.update_select_report_data_id', report_id);
this.get_reports(component, event, helper, component.get('v.select_report_data').Submit_date__c, component.get('v.select_report_data').Person_In_Charge2__c);
component.find('save_button').set('v.disabled', false);
component.set('v.login', false);
}
else {
-
component.set('v.errorMessage', 'save_report failed.');
this.showErrorToast(component);
component.find('save_button').set('v.disabled', false);
@@ -661,7 +645,8 @@
"warlocksNumber" : warlocksNumber__c,
"DealerPersonnel": DealerPersonnel__c,
"ProductCcategory" : ProductCcategory__c,
- "OtherBrandConsumables" : OtherBrandConsumables__c,
+ "productCategories" : productCategories__c,
+ "WarlockClassification" : WarlockClassification__c,
"ProductClassification": ProductClassification__c,
"WorkRecord": WorkRecord__c,
"EffectProgress": EffectProgress__c,
@@ -701,17 +686,14 @@
if (reports_now.length > 0 && reports_now != "") {
reports_now_count = reports_now.length;
}
-
// Save&New鏅傘伄銈︺偅銉炽儔銈﹀唴銉囥兗銈夸竴瑕�
if (res.length > 0) {
reports_now[reports_now_count] = res[0];
-
reports_now.sort(function (a, b) {
if (a.Name > b.Name) return -1;
if (a.Name < b.Name) return 1;
return 0;
});
-
component.set('v.reports_now', reports_now);
component.set('v.reports_now_count', reports_now.length);
var data_list = component.find('modal_data_list_tr');
@@ -720,16 +702,13 @@
else {
component.set('v.errorMessage', 'get_reports_now failed.');
this.showErrorToast(component);
- // this.error('get_reports_now failed.');
component.find('save_button').set('v.disabled', false);
component.set('v.login', false);
}
});
$A.enqueueAction(action2);
-
this.allclear(component);
component.find('select_WorkMark').set('v.value', false);
-
component.find('save_button').set('v.disabled', false);
component.set('v.login', false);
this.doinit(component, event, helper);
@@ -757,7 +736,7 @@
component.set('v.UseProduct2Id', '');
component.set('v.UseProduct3', '');
component.set('v.UseProduct3Id', '');
- component.set('v.select_ProductClassification', '');
+ component.find('select_ProductClassification').set('v.value', '');
component.find('select_warlocksNumber').set('v.value', null);
component.find('select_department').set('v.value', '');
component.find('select_ConsumptionOfConsumables').set('v.value', null);
@@ -766,9 +745,11 @@
component.find('select_doctor').set('v.options', clear);
component.find('select_DealerPersonnel').set('v.options', this.conv_selected(component.get('v.allselectlist.DealerPersonnel__c')));
component.find('select_purpose_type').set('v.options', this.conv_selected(component.get('v.allselectlist.WorkRecord__c')));
- component.find('select_ProductCcategory').set('v.options', this.conv_selected(component.get('v.allselectlist.ProductCcategory__c')));
+ // component.find('select_ProductCcategory').set('v.options', this.conv_selected(component.get('v.allselectlist.ProductCcategory__c')));
component.find('select_EffectProgress').set('v.value', '');
component.find('select_OtherBrandConsumables').set('v.value', '');
+ component.find('select_ProductCcategory').set('v.value', '');
+ component.find('select_productCategories').set('v.value', '');
// ToDo闇�瑕佹祴璇曟墜鏈轰笂鑳借繍琛屼笉
component.set('v.data.Report_Date__c', '');
component.set('v.oppdata.Close_Forecasted_Date__c', '');
@@ -783,12 +764,9 @@
$A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
$A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
$A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
- // $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
- // this.selectPurposeType(component);
- // this.selectProductClassification(component);
-
-
-
+ this.selectPurposeType(component);
+ this.selectProductClassification(component);
+ this.selectpurposetype(component);
},
report_date_list: function (component, event, helper, count) {
@@ -814,11 +792,9 @@
});
}
}
-
component.find('select_date').set('v.options', ret_obj);
component.set('v.report_date_list', ret_obj);
},
-
create_report_header: function (component, event, helper, name, s_agency, s_date) {
s_date = this.get_date_string(s_date);
if (s_date == false) {
@@ -826,7 +802,6 @@
this.showErrorToast(component);
return false;
}
-
var head_key = this.create_header_input_key(s_agency, s_date);
component.set('v.agency_report_header', head_key);
if (head_key == false) {
@@ -834,7 +809,6 @@
this.showErrorToast(component);
return false;
}
-
var key2 = s_date.replace(/-/g, '');
var action = component.get('c.createReportHeader');
action.setParams({
@@ -855,30 +829,25 @@
else {
component.set('v.errorMessage', 'createReportHeader callback failed.');
this.showErrorToast(component);
- // this.error('createReportHeader callback failed.');
component.set('v.login', false);
}
});
$A.enqueueAction(action);
},
-
create_header_input_key: function (agency_id, s_date) {
if (typeof (s_date) != 'string') {
s_date = this.get_date_string(s_date);
if (s_date == false) {
component.set('v.errorMessage', 'get_date_string in create_header_input_key.');
this.showErrorToast(component);
- // this.error('get_date_string in create_header_input_key.');
return false;
}
}
if (!agency_id || !s_date) {
return false;
}
-
s_date = s_date.replace(/-/g, '');
var headkey = agency_id + ":" + s_date;
-
return headkey;
},
@@ -889,7 +858,6 @@
var obj_type = Object.prototype.toString.call(obj).slice(8, -1);
return obj_type;
},
-
// create yyyy-mm-dd string
get_date_string: function (val) {
if (typeof (val) == 'string') {
@@ -913,14 +881,12 @@
if (String(mm).length == 1) {
mm = '0' + mm;
}
-
var dd = '';
if (String(val.getDate()).length == 1) {
dd = '0' + val.getDate();
} else {
dd = val.getDate();
}
-
val = val.getFullYear() + '-' + mm + '-' + dd;
} else {
return false;
@@ -966,7 +932,6 @@
component.set('v.hospitalLinkId', hospital_data[i].Id);
component.set('v.data.Agency_Hospital__c', hospital_data[i].Id);
component.find('new_con').set('v.disabled', false);
- //break;
}
}
component.set("v.hospital", accname);
@@ -975,7 +940,7 @@
},
- //妯＄硦鏌ヨ浣跨敤浜у搧1
+ //妯＄硦鏌ヨ浣跨敤浜у搧1(浜у搧鍨嬪彿)
searchUseProduct1: function (component, event, helper) {
var UseProduct1Name = event.getParam("value");
var select_ProductClassification = component.find('select_ProductClassification').get('v.value');
@@ -1130,8 +1095,7 @@
}
},
-
-
+ //hospitalLinkId 缁忛攢鍟嗗尰闄㈢殑ID 鍖婚櫌浜哄憳澶嶅埗鐨勫湴鏂�
doctor_change: function (component, event, helper) {
var doctor_value = component.find('select_doctor').get('v.value');
var doctor_list = component.get('v.doctor_list');
@@ -1147,8 +1111,7 @@
component.set('v.doctor_title', '');
}
},
-
- set_doctor_list: function (component, event, helper) {
+ set_doctor_list: function (component) {
var hospital_id = component.get('v.hospitalLinkId');
if (hospital_id) {
component.set('v.login', true);
@@ -1171,7 +1134,6 @@
res[i].selected = false;
}
}
-
component.find('select_doctor').set('v.options', res);
component.set('v.doctor_title', doctor_title);
} else {
@@ -1180,7 +1142,6 @@
component.set('v.doctor_title', res[0].Doctor_Division1__c);
}
}
-
component.set('v.default_select_doctor_id', '');
component.set('v.doctor_list', res);
component.set('v.login', false);
@@ -1194,7 +1155,6 @@
$A.enqueueAction(action);
}
},
-
productcategoryChange1: function (component, event, helper) {
var product_category_id = component.find('select_Product1').get('v.value');
var pcId1 = component.find('select_Product2').get('v.value');
@@ -1209,7 +1169,6 @@
}
},
productcategoryChange2: function (component, event, helper) {
-
var product_category_id = component.find('UseProduct2_TEXT').get('v.value');
var pcId1 = component.find('UseProduct1_TEXT').get('v.value');
var pcId2 = component.find('UseProduct3_TEXT').get('v.value');
@@ -1235,7 +1194,6 @@
component.find('select_Product3').set('v.value', '');
}
},
-
conv_selected: function (obj) {
for (var i = 0; i < obj.length; i++) {
if (obj[i].selected) {
@@ -1248,7 +1206,6 @@
}
return obj;
},
-
set_selected: function (component, aura_id_name, value) {
var select_tmp = component.find(aura_id_name).get('v.options');
if (select_tmp) {
@@ -1265,8 +1222,6 @@
return false;
}
},
-
-
//寮瑰嚭 鎴愬姛鎻愮ず
showSuccessToast: function (component) {
$A.util.removeClass(component.find('successDiv'), 'slds-hide');
@@ -1294,7 +1249,6 @@
3000
);
},
-
error: function (message) {
var toastEvent = $A.get("e.force:showToast");
toastEvent.setParams({
@@ -1305,21 +1259,17 @@
});
toastEvent.fire();
},
-
createCon: function (component, event, helper) {
var modal_newAC = component.find('modal_newAC');
$A.util.removeClass(modal_newAC, 'disp_none');
component.set('v.truthy', true);
},
-
-
hideCmp: function (component, event, helper) {
var div1 = component.find('report')
var div2 = component.find('report_list')
$A.util.addClass(div1, 'disp_none');
$A.util.addClass(div2, 'disp_none');
},
-
handleSuccess: function (component, event, helper) {
var insertId = event.getParams().response.Id;
var displayValue = event.getParams().response.fields.Name.value;
@@ -1327,11 +1277,10 @@
component.set('v.truthy', false);
var modal_newAC = component.find('modal_newAC')
$A.util.addClass(modal_newAC, 'disp_none');
- component.set('v.successMessage', '.瀹㈡埛浜哄憳宸插垱寤恒��');
+ component.set('v.successMessage', '.鍖婚櫌浜哄憳宸插垱寤恒��');
this.showSuccessToast(component);
this.set_doctor_list(component, event, helper);
},
-
createCancel: function (component, event, helper) {
component.set('v.truthy', false);
var modal_newAC = component.find('modal_newAC')
@@ -1377,30 +1326,24 @@
alert('File read cancelled');
};
reader.onloadstart = function (e) {
-
var output = '<ui type=\"disc\"><li><strong>' + file.name + '</strong> (' + file.type + ')- ' + file.size + 'bytes, last modified: ' + file.lastModifiedDate.toLocaleDateString() + '</li></ui>';
component.set("v.filename", file.name);
component.set("v.TargetFileName", output);
-
};
reader.onload = function (e) {
+ debugger;
var data = e.target.result;
+
component.set("v.fileContentData", data);
console.log("file data" + JSON.stringify(data));
- // console.log("file data"+encodeURI(JSON.stringify(data),"utf-8"));
var allTextLines = data.split(/\r\n|\n/);
+ console.log("qqqqqqqqqqqqqqqqqqq" + allTextLines);
var dataRows = allTextLines.length - 1;
var headers = allTextLines[0].split(',');
-
- // console.log("Rows length::"+dataRows);
-
-
var numOfRows = component.get("v.NumOfRecords");
if (dataRows > numOfRows + 1 || dataRows == 1 || dataRows == 0) {
-
alert("File Rows between 1 to " + numOfRows + " .");
component.set("v.showMain", true);
-
}
else {
var lines = [];
@@ -1434,7 +1377,6 @@
}
var reader = new FileReader();
reader.onloadend = function () {
-
};
reader.readAsDataURL(file);
},
@@ -1459,18 +1401,14 @@
for (var i = 0; i < ress.length; i++) {
res1 += ress[i].substr(7) + '\n';
}
-
console.log("==" + res1);
- // String logerror = res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶";
component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
this.showErrorToast(component);
- // this.error(res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
component.set('v.login', false);
} else {
component.set('v.successMessage', '瀵煎叆鎴愬姛');
this.showSuccessToast01(component);
component.set("v.showMain", true);
-
component.set('v.login', false);
this.doinit(component, event, helper);
}
@@ -1503,8 +1441,8 @@
}
columnDivider = ',';
lineDivider = '\n';
- keys = ['Submit_date__c', 'Person_In_Charge2__c', 'Report_Date__c', 'Agency_Hospital__c','Department_Cateogy__c','DealerPersonnel__c','WorkRecord__c','doctor2__c','ProductClassification__c','UseProduct1__c', 'UseProduct2__c','UseProduct3__c', 'EffectProgress__c','ConsumptionOfConsumables__c', 'OtherBrandConsumables__c', 'ProductCcategory__c', 'warlocksNumber__c','WorkMark__c'];
- thkeys = ['鍛�', '鎷呭綋', '娲诲姩鏃�', '鍖婚櫌', '绉戝', '缁忛攢鍟嗕汉鍛�', '宸ヤ綔璁板綍', '瀹㈡埛浜哄憳','浜у搧鍒嗙被', '浣跨敤浜у搧1', '浣跨敤浜у搧2','浣跨敤浜у搧3','鏁堟灉/杩涘害','绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺','鍏朵粬鍝佺墝鑰楁潗浣跨敤','浜у搧绫诲埆','鏈＋浣跨敤浜у搧瀵瑰簲鏁伴噺','宸ヤ綔鏍囪']
+ keys = ['Submit_date__c', 'Person_In_Charge2__c', 'Report_Date__c', 'Agency_Hospital__c','Department_Cateogy__c','DealerPersonnel__c','WorkRecord__c','doctor2__c','ProductClassification__c','UseProduct1__c', 'UseProduct2__c','UseProduct3__c', 'EffectProgress__c','ConsumptionOfConsumables__c', 'WarlockClassification__c', 'ProductCcategory__c', 'productCategories__c','warlocksNumber__c','WorkMark__c'];
+ thkeys = ['鍛�', '鎷呭綋', '娲诲姩鏃�', '鍖婚櫌', '绉戝', '缁忛攢鍟嗕汉鍛�', '宸ヤ綔璁板綍', '鍖婚櫌浜哄憳','浜у搧鍒嗙被(绗笁鍒嗙被)', '浣跨敤浜у搧1(浜у搧鍨嬪彿)', '浣跨敤浜у搧2','浣跨敤浜у搧3','鏁堟灉/杩涘害','绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺','鏈＋鍒嗙被','宸查噰鐢ㄥ叾浠栧搧鐗�','鍏朵粬鍝佺墝浜у搧绫诲埆','浜у搧鐢ㄩ噺','宸ヤ綔鏍囪']
csvStringResult = '';
csvStringResult += thkeys.join(columnDivider);
csvStringResult += lineDivider;
@@ -1535,14 +1473,17 @@
} else if (skey == 'UseProduct3__c') {
csvStringResult += objectRecords[i].UseProduct3__r.Name;
} else if (skey == 'EffectProgress__c'){
- csvStringResult += objectRecords[i].EffectProgress__r.Name;
- }else if (skey == 'OtherBrandConsumables__c'){
- csvStringResult += objectRecords[i].OtherBrandConsumables__r.Name;
+ csvStringResult += objectRecords[i].EffectProgress__r.EffectProgress__c;
+ }else if (skey == 'WarlockClassification__c'){
+ csvStringResult += objectRecords[i].WarlockClassification__r.WarlockClassification__c;
+ }else if(skey == 'ProductCcategory__c'){
+ csvStringResult += objectRecords[i].ProductCcategory__r.ProductCcategory__c;
+ }else if(skey == 'productCategories__c'){
+ csvStringResult += objectRecords[i].productCategories__r.productCategories__c;
}else{
csvStringResult += objectRecords[i][skey] ;
}
counter++;
-
}
console.log("瀵煎嚭寰幆缁撴潫");
csvStringResult += lineDivider;
@@ -1552,8 +1493,8 @@
// 瀵煎嚭椤甸潰鏄剧ず鐨勬ā鏉�
showExportDate: function (component, objectRecords) {
console.log('杩涘叆showexceportdate' + objectRecords);
- var keys = ['Submit_date__c', 'Person_In_Charge2__c', 'Report_Date__c', 'Agency_Hospital__c','Department_Cateogy__c','DealerPersonnel__c','WorkRecord__c','doctor2__c','ProductClassification__c','UseProduct1__c', 'UseProduct2__c','UseProduct3__c', 'EffectProgress__c','ConsumptionOfConsumables__c', 'OtherBrandConsumables__c', 'ProductCcategory__c', 'warlocksNumber__c','WorkMark__c'];
- var headers = ['鍛�', '鎷呭綋', '娲诲姩鏃�', '鍖婚櫌', '绉戝', '缁忛攢鍟嗕汉鍛�', '宸ヤ綔璁板綍', '瀹㈡埛浜哄憳','浜у搧鍒嗙被', '浣跨敤浜у搧1', '浣跨敤浜у搧2','浣跨敤浜у搧3','鏁堟灉/杩涘害','绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺','鍏朵粬鍝佺墝鑰楁潗浣跨敤','浜у搧绫诲埆','鏈＋浣跨敤浜у搧瀵瑰簲鏁伴噺','宸ヤ綔鏍囪']
+ var keys = ['Submit_date__c', 'Person_In_Charge2__c', 'Report_Date__c', 'Agency_Hospital__c','Department_Cateogy__c','DealerPersonnel__c','WorkRecord__c','doctor2__c','ProductClassification__c','UseProduct1__c', 'UseProduct2__c','UseProduct3__c', 'EffectProgress__c','ConsumptionOfConsumables__c', 'WarlockClassification__c', 'ProductCcategory__c','productCategories__c', 'warlocksNumber__c','WorkMark__c'];
+ var headers = ['鍛�', '鎷呭綋', '娲诲姩鏃�', '鍖婚櫌', '绉戝', '缁忛攢鍟嗕汉鍛�', '宸ヤ綔璁板綍', '鍖婚櫌浜哄憳','浜у搧鍒嗙被(绗笁鍒嗙被)', '浣跨敤浜у搧1(浜у搧鍨嬪彿)', '浣跨敤浜у搧2','浣跨敤浜у搧3','鏁堟灉/杩涘害','绉戝鍚岀被鑰楁潗鏈堜娇鐢ㄩ噺','鏈＋鍒嗙被','宸查噰鐢ㄥ叾浠栧搧鐗�','鍏朵粬鍝佺墝浜у搧绫诲埆','浜у搧鐢ㄩ噺','宸ヤ綔鏍囪']
var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
content += "<thead><tr class=\"slds-text-title--caps\">";
for (i = 0; i < headers.length; i++) {
@@ -1586,9 +1527,13 @@
} else if (skey == 'UseProduct3__c') {
content += '<td>' + objectRecords[i].UseProduct3__r.Name + '</td>';
} else if (skey == 'EffectProgress__c'){
- content += '<td>' + objectRecords[i].EffectProgress__r.Name + '</td>';
- }else if (skey == 'OtherBrandConsumables__c'){
- content += '<td>' + objectRecords[i].OtherBrandConsumables__r.Name + '</td>';
+ content += '<td>' + objectRecords[i].EffectProgress__r.EffectProgress__c + '</td>';
+ }else if (skey == 'WarlockClassification__c'){
+ content += '<td>' + objectRecords[i].WarlockClassification__r.WarlockClassification__c + '</td>';
+ }else if (skey == 'ProductCcategory__c'){
+ content += '<td>' + objectRecords[i].ProductCcategory__r.ProductCcategory__c + '</td>';
+ }else if (skey == 'productCategories__c'){
+ content += '<td>' + objectRecords[i].productCategories__r.productCategories__c + '</td>';
}else{
content += '<td>' + objectRecords[i][skey] + '</td>';
}
@@ -1621,7 +1566,6 @@
component.set('v.login', false);
this.showExportDate(component, res);
component.set('v.reports_date', res);
-
} else {
alert('瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩');
component.set('v.login', false);
@@ -1701,7 +1645,6 @@
res[i].selected = false;
}
}
-
component.find('select_doctor').set('v.options', res);
component.set('v.doctor_title', doctor_title);
} else {
@@ -1710,7 +1653,6 @@
component.set('v.doctor_title', res[0].Doctor_Division1__c);
}
}
-
component.set('v.default_select_doctor_id', '');
component.set('v.doctor_list', res);
component.set('v.login', false);
@@ -1741,7 +1683,7 @@
}
}
},
- //鏈＋浣跨敤浜у搧瀵瑰簲鏁伴噺楠岃瘉蹇呴』杈撳叆鏁板瓧
+ //浜у搧鐢ㄩ噺楠岃瘉蹇呴』杈撳叆鏁板瓧
select_warlocksNumber : function(component, event, helper) {
var sc = event.getSource().get('v.value');
if(sc != null){
@@ -1758,28 +1700,11 @@
}
}
},
- // 浜у搧鍒嗗尯鏍规嵁褰撳墠鐧诲綍浜虹殑鐢ㄦ埛浜у搧鍖哄垎瀛楁鏉ュ仛闄愬埗 鏄疎T浜у搧鍒嗗尯瀛楁 鎴栬�匛NG浜у搧鍒嗗尯瀛楁
- // select_ProductClassification : function(component, event, helper) {
- // var action = component.get("c.getProductClassification");
- // action.setParams({
- // 'ok':'ok'
- // });
- // action.setCallback(this, function (response) {
- // var state = response.getState();
- // if (state === "SUCCESS") {
- // var ProductClassificationValue = response.getReturnValue();
- // console.log('ProductClassificationValue================>'+ProductClassificationValue);
- // // component.set("v.select_ProductClassification", response.getReturnValue());
- // component.find('select_ProductClassification').set('v.options', ProductClassificationValue);
- // }
- // });
- // $A.enqueueAction(action);
- // },
-
//宸ヤ綔浼氳褰�
selectPurposeType: function (component,event,helper) {
var doctor_value = component.find('select_purpose_type').get('v.value');
- var select_EffectProgress = component.find('select_EffectProgress').get('v.value');
+ alert(doctor_value);
+ if(doctor_value != ''){
var action = component.get('c.selectPurposeTypes');
action.setParams({
'doctor_value': doctor_value
@@ -1792,12 +1717,17 @@
}
});
$A.enqueueAction(action);
+ }else{
+ component.find('select_EffectProgress').set('v.options', []);
+ }
},
+
selectProductClassification: function (component,event,helper) {
var select_ProductClassification = component.find('select_ProductClassification').get('v.value');
+ if(select_ProductClassification != ''){
var action = component.get('c.selectProductClassificationc');
action.setParams({
- 'select_ProductClassification': select_ProductClassification
+ "select_ProductClassification": select_ProductClassification
});
action.setCallback(this, function (response) {
var state = response.getState();
@@ -1807,5 +1737,44 @@
}
});
$A.enqueueAction(action);
+ }else{
+ component.find('select_OtherBrandConsumables').set('v.options', []);
}
+ this.selectProductCcategory(component);
+ },
+ select_ProductCcategory: function (component,event,helper) {
+ var select_ProductCcategory = component.find('select_ProductCcategory').get('v.value');
+ if(select_ProductCcategory != ''){
+ var result = component.find('result');
+ $A.util.removeClass(result, 'disp_none');
+ var action = component.get('c.selectProductCcategory01');
+ action.setParams({
+ "select_ProductCcategory": select_ProductCcategory
+ });
+ action.setCallback(this, function (response) {
+ var state = response.getState();
+ if (state == 'SUCCESS') {
+ var res = response.getReturnValue();
+ component.find('select_productCategories').set("v.options", JSON.parse(JSON.stringify(res)));
+ }
+ });
+ $A.enqueueAction(action);
+ }else{
+ component.find('select_productCategories').set('v.options', []);
+ var result = component.find('result');
+ $A.util.addClass(result, 'disp_none');
+ }
+ },
+ selectpurposetype : function(component,event,helper){
+ var select_ProductCcategory = component.find('select_ProductCcategory').get('v.value');
+ if (select_ProductCcategory == null && select_ProductCcategory == undefined) {
+ var result = component.find('result');
+ $A.util.removeClass(result, 'disp_none');
+ } else {
+ component.find('select_productCategories').set('v.value', '');
+ var result = component.find('result');
+ $A.util.addClass(result, 'disp_none');
+ this.select_ProductCcategory(component);
+ }
+ },
})
\ No newline at end of file
--
Gitblit v1.9.1