From 614b1b648eceb33e325ed7cf8d8cb6a7a71b9ddc Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 11:28:13 +0800
Subject: [PATCH] backup0626
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp | 27 +
.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/config | 7
force-app/main/default/aura/CreateTarget/CreateTargetHelper.js | 28 ++
force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls | 22 +
force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml | 2
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js | 525 ++++++++++++++++++++++++++++++++++++++++---
.sf/config.json | 2
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 22 +
force-app/main/default/aura/WeeklyReport/WeeklyReportController.js | 4
force-app/main/default/aura/CreateTarget/CreateTarget.cmp | 10
force-app/main/default/aura/WeeklyReport/WeeklyReport.css | 3
.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/HEAD | 1
force-app/main/default/aura/CreateTarget/CreateTarget.css | 6
force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 40 +-
14 files changed, 610 insertions(+), 89 deletions(-)
diff --git a/.sf/config.json b/.sf/config.json
index 090aeab..3debff0 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,3 @@
{
- "target-org": "OlympusProd"
+ "target-org": "OlympusStageEnv"
}
\ No newline at end of file
diff --git a/.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/HEAD b/.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/HEAD
new file mode 100644
index 0000000..b870d82
--- /dev/null
+++ b/.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/config b/.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/config
new file mode 100644
index 0000000..d545cda
--- /dev/null
+++ b/.sf/orgs/00D0k000000EKIhEAO/localSourceTracking/config
@@ -0,0 +1,7 @@
+[core]
+ repositoryformatversion = 0
+ filemode = false
+ bare = false
+ logallrefupdates = true
+ symlinks = false
+ ignorecase = true
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
index cd40cf4..193e849 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -1,4 +1,4 @@
-<aura:component controller="CreateTargetCmp" implements="forceCommunity:availableForAllPageTypes,force:hasRecordId" access="global" >
+<aura:component controller="CreateTargetCmp" implements="force:appHostable,forceCommunity:availableForAllPageTypes,force:hasRecordId" access="global" >
<aura:handler name="init" value="{!this}" action="{!c.doInit}"/>
<aura:attribute name="recordId" type="Id" />
<aura:attribute name="hospital" type="string" default=""/>
@@ -44,11 +44,12 @@
<div class="button_area">
<ui:button label="{!v.button_text}" press="{!c.toggle_report}"/>
</div>
+
<div aura:id="modal_window" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
<div class="slds-modal__container">
<div class="slds-modal__header">
<button class="slds-button slds-modal__close slds-button--icon-inverse" title="Close" onclick="{!c.toggle_report}">
- <lightning:icon class="close_icn" iconName="utility:close" size="medium" alternativeText="Indicates approval"/>
+ <lightning:icon iconName="utility:close" size="medium" alternative-text="close" variant="inverse"/>
<span class="slds-assistive-text">Close</span>
</button>
<h2 id="headerTarget" class="slds-text-heading--medium">鐩爣({!v.OCMTerm})</h2>
@@ -61,6 +62,9 @@
<div class="slds-form-element slds-size--1-of-2">
<label class="slds-form-element__label" for="input-hos">鍖婚櫌</label>
<force:inputField value="{!v.record.Agency_Hospital__c}" aura:id="input-hos"/>
+ <!-- <lightning:recordEditForm objectApiName="Agency_Opportunity__c" recordId="{!v.record.Id}">
+ <lightning:inputField fieldName="Agency_Hospital__c"/>
+ </lightning:recordEditForm> -->
</div>
</div>
<!-- <h4 class="slds-section__title">璁块棶鐩爣</h4>
@@ -89,7 +93,7 @@
</div>
<div class="slds-form-element slds-size--1-of-7">
<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
- <ui:inputText aura:id="select_GI4_2" class="slds-select" />
+ <ui:inputText aura:id="select_GI4_2" class="slds-select"/>
</div>
<div class="slds-form-element slds-size--1-of-7">
<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml
index 17a8a42..5a95bf7 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>39.0</apiVersion>
+ <apiVersion>57.0</apiVersion>
<description>A Lightning Component Bundle</description>
</AuraDefinitionBundle>
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.css b/force-app/main/default/aura/CreateTarget/CreateTarget.css
index 9365600..68a877a 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.css
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.css
@@ -3,4 +3,10 @@
}
.THIS.disp_none {
display: none;
+}
+.THIS select {
+ --lwc-lineHeightButton:36px;
+ --lwc-heightInput:36px;
+ min-height: 0px !important;
+ height: 36px !important;
}
\ No newline at end of file
diff --git a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
index e28ad09..b46d9ab 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
+++ b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
@@ -8,14 +8,18 @@
action.setParams({"recordId": recordId});
action.setCallback(this, function(response) {
var state = response.getState();
+ console.log("state1:"+state);
if(state === "SUCCESS") {
var ah = response.getReturnValue();
var select_ah = ah.Id;
var select_ah_name = ah.Name;
-
- component.set('v.record.Agency_Hospital__c', select_ah);
+ // component.set('v.record.Agency_Hospital__c', select_ah);
+ //add by Deloitte 2023-6-8
+ let agencyHosp = component.get('v.record');
+ agencyHosp.Agency_Hospital__c = select_ah;
// alert(JSON.stringify(component.find('input-hos').get("v.body")[0].get('v.values')));
if ($A.get("$Browser.formFactor") == 'DESKTOP') {
+ console.log("flag1");
var values = [{
type: 'Agency_Hospital_Link__c',
id: select_ah,
@@ -26,9 +30,17 @@
alt:'Agency_Hospital_Link__c'
}
}];
- component.find('input-hos').get("v.body")[0].set('v.values', values);
+ // component.find('input-hos').get("v.body")[0].set('v.values', values);
+ //add by Deloitte 2023-6-8
+ if(component.find('input-hos').get("v.body") && component.find('input-hos').get("v.body").length>0){
+ component.find('input-hos').get("v.body")[0].set('v.values', values);
+ }
} else {
- component.find('input-hos').get("v.body")[0].set('v.selectedLabel', select_ah_name);
+ // component.find('input-hos').get("v.body")[0].set('v.selectedLabel', select_ah_name);
+ //add by Deloitte 2023-6-8
+ if(component.find('input-hos').get("v.body") && component.find('input-hos').get("v.body").length>0){
+ component.find('input-hos').get("v.body")[0].set('v.selectedLabel', select_ah_name);
+ }
}
} else if (state === "ERROR") {
@@ -49,6 +61,7 @@
var action = component.get("c.getProductList");
action.setCallback(this, function(response) {
var state = response.getState();
+ console.log("state2:"+state);
if(state === "SUCCESS") {
var opts = response.getReturnValue();
// alert(JSON.stringify(opts["GI"]));
@@ -96,6 +109,13 @@
}
});
$A.enqueueAction(action);
+
+ var modal_window = component.find('modal_window');
+ var modal_bg = component.find('modal_bg');
+
+ if ($A.util.hasClass(modal_window, 'disp_none') && !component.get("v.recordId")) {
+ $A.get('e.force:refreshView').fire();
+ }
},
toggle_report : function(component, event, helper) {
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index e3e4623..7f5d645 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -25,6 +25,7 @@
<aura:attribute name="doclist" type="List" />
<aura:attribute name="docmap" type="Map" />
<aura:attribute name="login" type="Boolean" default="false" />
+ <aura:attribute name="loginEdit" type="Boolean" default="false" />
<aura:attribute name="modal_import_spinner" type="Boolean" default="false" />
<aura:attribute name="loadOpp" type="Boolean" default="false" />
<aura:attribute name="reportPageData" type="Map" />
@@ -125,7 +126,9 @@
<!-- 鎵归噺娣诲姞鏃ユ姤 end-->
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
- <lightning:spinner alternativeText="Loading" size="medium" />
+ <aura:renderIf isTrue="{!!v.loginEdit}">
+ <lightning:spinner alternativeText="Loading" size="medium" />
+ </aura:renderIf>
</aura:renderIf>
<div aura:id="report" id="report">
<div class="slds-grid slds-wrap slds-grid--pull-padded">
@@ -394,8 +397,8 @@
<div aura:id="modal_exportbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
<!-- 鎵归噺瀵煎嚭鏃ユ姤 end-->
<div aura:id="modal_window" role="dialog" tabindex="-1"
- class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
- <div class="slds-modal__container">
+ class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget" >
+ <div class="slds-modal__container" >
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv">
<!-- <ui:inputText aura:id="articleURL" /> -->
<div class="demo-only" style="height: 8rem;">
@@ -430,13 +433,17 @@
</div>
</div>
</div>
- <div class="slds-modal__header">
- <h2 id="headerTarget" class="slds-text-heading--medium">
- 鏃ユ姤({!v.selected_date} {!v.selected_agency_person})</h2>
- <ui:button aura:id="close_button" label="鍏抽棴"
- class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.toggle_report}" />
- </div>
- <div class="slds-modal__content slds-grow slds-p-around--medium">
+
+ <div class="slds-modal__content slds-grow slds-p-around--medium" style="position: relative;">
+ <aura:renderIf isTrue="{!v.loginEdit}">
+ <lightning:spinner alternativeText="Loading" size="medium" style="width: 100%; height: 100%;"/>
+ </aura:renderIf>
+ <div class="slds-modal__header">
+ <h2 id="headerTarget" class="slds-text-heading--medium">
+ 鏃ユ姤({!v.selected_date} {!v.selected_agency_person})</h2>
+ <ui:button aura:id="close_button" label="鍏抽棴"
+ class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.toggle_report}" />
+ </div>
<div class="slds-box slds-theme--shade">
<div class="slds-grid slds-wrap slds-grid--pull-padded">
<div
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
index e5f83a9..c3ae9e8 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
@@ -1,7 +1,7 @@
({
doinit: function (component, event, helper) {
document.title = "杩芥函鏃ユ姤";
- debugger
+
this.report_date_list(component, event, helper, 5);
component.set('v.login', true);
var action = component.get('c.getalldata');
@@ -14,7 +14,7 @@
component.set('v.allselectlist', res.allselectlist);
component.set('v.doclist', res.doclist);
//fy
- debugger
+
var xx = res.UserProType;
component.set('v.UserProType', res.UserProType);
var gg = component.get('v.UserProType');
@@ -59,7 +59,7 @@
},
//鏍规嵁鍛ㄥ拰鎷呭綋鏌ヨ鏁版嵁缁欏垵濮嬮〉闈㈣祴鏁版嵁
get_reports: function (component, event, helper, date_str, person_str) {
- debugger
+
if (!date_str) {
return false;
}
@@ -78,7 +78,7 @@
});
component.set('v.login', true);
action.setCallback(this, function (response) {
- debugger
+
var state = response.getState();
if (state == 'SUCCESS') {
var res = response.getReturnValue();
@@ -128,7 +128,7 @@
m[data.object[di].dataId] = data.object[di];
}
}
- debugger
+
for (let ri in res.reports) {
if (res.reports[ri] && res.reports[ri].doctor2__r && res.reports[ri].doctor2__r.AWS_Data_Id__c && m.hasOwnProperty(res.reports[ri].doctor2__r.AWS_Data_Id__c)) {
res.reports[ri].doctor2__r.awsdata = m[res.reports[ri].doctor2__r.AWS_Data_Id__c];
@@ -197,7 +197,7 @@
},
//澶嶅埗鍜岀紪杈戝洖鏄剧殑浣嶇疆
toggle_report: function (component) {
- debugger
+
var modal_window = component.find('modal_window');
var modal_bg = component.find('modal_bg');
if ($A.util.hasClass(modal_window, 'disp_none')) {
@@ -320,7 +320,7 @@
if (select_data['WorkMark__c'] != false) {
component.find('select_WorkMark').set('v.checked', select_data['WorkMark__c']);
}
- debugger;
+ ;
var report_id = component.get('v.edit_copy_select_report_id');
if (report_id != "") {
@@ -456,6 +456,269 @@
}
}
},
+ toggle_report_edit: function (component) {
+ var modal_window = component.find('modal_window');
+ var modal_bg = component.find('modal_bg');
+ if ($A.util.hasClass(modal_window, 'disp_none')) {
+ // OPEN
+ $A.util.removeClass(modal_window, 'disp_none');
+ $A.util.removeClass(modal_bg, 'disp_none');
+ component.set('v.loginEdit',true);
+ //澶嶅埗 鍜岀紪杈� 鍥炴樉闂鍦ㄨ繖閲岄潰
+ if (component.get('v.mode') == 'edit' || component.get('v.mode') == 'copy') {
+ var select_data = '';
+ if (component.get('v.mode') == 'edit') {
+ select_data = component.get('v.select_report_data');
+ } else if (component.get('v.mode') == 'copy') {
+ select_data = component.get('v.select_report_data_radio');
+ }
+ var reports = component.get('v.reports');
+ var Agency_Hospital_text = '';
+ var Agency_Hospital_parent_id = '';
+ // 鍖婚櫌鍚�
+ if (select_data['Agency_Hospital__c'] != '') {
+ for (var i = 0; i < reports.length; i++) {
+ if (reports[i]['Agency_Hospital__c'] == select_data['Agency_Hospital__c']) {
+ Agency_Hospital_text = reports[i]['Agency_Hospital__r']['Name'];
+ Agency_Hospital_parent_id = reports[i]['Agency_Hospital__r']['Hospital__c'];
+ }
+ }
+ component.set('v.hospital', Agency_Hospital_text);
+ component.set('v.hospitalId', Agency_Hospital_parent_id);
+ component.set('v.hospitalLinkId', select_data['Agency_Hospital__c']);
+ component.find('new_con').set('v.disabled', false);
+ }
+ //浣跨敤浜у搧1(浜у搧鍨嬪彿)
+ var UseProduct1Text = '';
+ var UseProduct1Id = '';
+ 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']['Asset_Model_No__c'];
+ UseProduct1Id = reports[i]['UseProduct1__c'];
+ }
+ }
+ component.set('v.UseProduct1', UseProduct1Text);
+ component.set('v.UseProduct1Id', select_data['UseProduct1__c']);
+ }
+ //浣跨敤浜у搧2
+ var UseProduct2Text = '';
+ var UseProduct2Id = '';
+ if (select_data['UseProduct2__c'] != '' && select_data['UseProduct2__c'] != undefined) {
+ for (var i = 0; i < reports.length; i++) {
+ if (reports[i]['UseProduct2__c'] == select_data['UseProduct2__c']) {
+ UseProduct2Text = reports[i]['UseProduct2__r']['Asset_Model_No__c'];
+ UseProduct2Id = reports[i]['UseProduct2__c'];
+ }
+ }
+ component.set('v.UseProduct2', UseProduct2Text);
+ component.set('v.UseProduct2Id', select_data['UseProduct2__c']);
+ }
+ //浣跨敤浜у搧3
+ var UseProduct3Text = '';
+ var UseProduct3Id = '';
+ if (select_data['UseProduct3__c'] != '' && select_data['UseProduct3__c'] != undefined) {
+ for (var i = 0; i < reports.length; i++) {
+ if (reports[i]['UseProduct3__c'] == select_data['UseProduct3__c']) {
+ UseProduct3Text = reports[i]['UseProduct3__r']['Asset_Model_No__c'];
+ UseProduct3Id = reports[i]['UseProduct3__c'];
+ }
+ }
+ component.set('v.UseProduct3', UseProduct3Text);
+ component.set('v.UseProduct3Id', select_data['UseProduct3__c']);
+ }
+ //娲诲姩鏃�
+ var reportDate;
+ if (select_data['Report_Date__c'] != '') {
+ for (var i = 0; i < reports.length; i++) {
+ if (reports[i]['Report_Date__c'] == select_data['Report_Date__c']) {
+ reportDate = reports[i]["Report_Date__c"];
+ }
+ }
+ component.set('v.data.Report_Date__c', reportDate);
+ }
+ // 绉戝
+ // if (select_data['Department_Cateogy__c'] != '') {
+ // component.find('select_department').set('v.value',select_data['Department_Cateogy__c']);
+ // }
+ //fy Department_Cateogy_text__c
+ if (select_data['Department_Cateogy_text__c'] != '') {
+ component.find('select_department').set('v.value', select_data['Department_Cateogy_text__c']);
+ }
+ //缁忛攢鍟嗕汉鍛�
+ if (select_data['DealerPersonnel__c'] != '') {
+ this.set_selected(component, 'select_DealerPersonnel', select_data['DealerPersonnel__c']);
+ }
+ // 娲诲姩鍖哄垎
+ if (select_data['WorkRecord__c'] != '') {
+ this.set_selected(component, 'select_purpose_type', select_data['WorkRecord__c']);
+ this.selectPurposeType(component);
+ }
+ // 鎷滆浜�
+ if (select_data['WorkRecord__c'] == '绉戝浼�') {
+ component.set('v.default_select_doctor_id2', select_data['doctor3__c']);
+ var a = component.get('v.default_select_doctor_id2');
+ this.set_doctor_list_edit(component);
+ } else {
+ component.set('v.default_select_doctor_id', select_data['doctor2__c']);
+ this.set_doctor_list_edit(component);
+ }
+ //浜у搧鍒嗙被(绗笁鍒嗙被)
+ if (select_data['ProductClassification__c'] != null) {
+ this.set_selected(component, 'select_ProductClassification', select_data['ProductClassification__c']);
+ this.selectProductClassification(component);
+ }
+ // 浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺
+ if (select_data['ConsumptionOfConsumables__c'] != '') {
+ component.find('select_ConsumptionOfConsumables').set('v.value', select_data['ConsumptionOfConsumables__c']);
+ }
+ // 浜у搧鐢ㄩ噺
+ if (select_data['warlocksNumber__c'] != '') {
+ component.find('select_warlocksNumber').set('v.value', select_data['warlocksNumber__c']);
+ }
+ // 鏀彺闇�姹�
+ if (select_data['WorkMark__c'] != false) {
+ component.find('select_WorkMark').set('v.checked', select_data['WorkMark__c']);
+ }
+ ;
+
+ var report_id = component.get('v.edit_copy_select_report_id');
+ if (report_id != "") {
+ var select_EffectProgress1 = '';
+ var WarlockClassification = '';
+ var ProductCcategory = '';
+ var productCategories = '';
+ var i = 0;
+ for (i = 0; i < reports.length; i++) {
+ 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 (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', "");
+ }
+
+ }
+ } else {
+ 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');
+ var UseProduct1__c = component.get('v.UseProduct1Id');
+ var UseProduct2__c = component.get('v.UseProduct2Id');
+ var UseProduct3__c = component.get('v.UseProduct3Id');
+ var Department_Cateogy__c = component.find('select_department').get('v.value');
+ var ConsumptionOfConsumables__c = component.find('select_ConsumptionOfConsumables').get('v.value');
+ var DealerPersonnel__c = component.find('select_DealerPersonnel').get('v.value');
+ 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 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') {
+ var confirm_title = '璀﹀憡!'
+ var confirm_text = '鏀惧純鏂板缓鏃ユ姤锛�';
+ if (!Report_Date__c &&
+ !Agency_Hospital__c &&
+ !UseProduct1__c &&
+ !UseProduct2__c &&
+ !UseProduct3__c &&
+ !Department_Cateogy__c &&
+ !ConsumptionOfConsumables__c &&
+ !DealerPersonnel__c &&
+ !doctor2__c &&
+ !EffectProgress__c &&
+ !WarlockClassification__c &&
+ !ProductCcategory__c &&
+ !productCategories__c &&
+ !warlocksNumber__c &&
+ !WorkMark__c &&
+ !WorkRecord__c
+ ) {
+ this.allclear(component);
+ $A.util.addClass(modal_window, 'disp_none');
+ $A.util.addClass(modal_bg, 'disp_none');
+ this.close_confirm(component, confirm_title, confirm_text);
+ } else {
+ this.close_confirm(component, confirm_title, confirm_text);
+ }
+ } 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 &&
+ select_report_data['UseProduct2__c'] == UseProduct2__c &&
+ select_report_data['UseProduct3__c'] == UseProduct3__c &&
+ select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
+ select_report_data['ConsumptionOfConsumables__c'] == ConsumptionOfConsumables__c &&
+ select_report_data['DealerPersonnel__c'] == DealerPersonnel__c &&
+ select_report_data['doctor2__c'] == doctor2__c &&
+ select_report_data['EffectProgress__c'] == EffectProgress__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) {
+ this.allclear(component);
+ $A.util.addClass(modal_window, 'disp_none');
+ $A.util.addClass(modal_bg, 'disp_none');
+ } else {
+ this.close_confirm(component, confirm_title, confirm_text);
+ }
+ } else if (component.get('v.mode') == 'edit') {
+ 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 &&
+ select_report_data['UseProduct2__c'] == UseProduct2__c &&
+ select_report_data['UseProduct3__c'] == UseProduct3__c &&
+ select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
+ select_report_data['ConsumptionOfConsumables__c'] == ConsumptionOfConsumables__c &&
+ select_report_data['DealerPersonnel__c'] == DealerPersonnel__c &&
+ select_report_data['doctor2__c'] == doctor2__c &&
+ select_report_data['EffectProgress__c'] == EffectProgress__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) {
+ this.allclear(component);
+ $A.util.addClass(modal_window, 'disp_none');
+ $A.util.addClass(modal_bg, 'disp_none');
+ } else {
+ this.close_confirm(component, confirm_title, confirm_text);
+ }
+ }
+
+ }
+ //component.set('v.loginEdit',false);
+ },
//鍏抽棴椤甸潰鏄� 灏忕殑鎻愮ず妗嗘槸鍚︽斁寮冩柊寤烘棩鎶�
close_confirm: function (component, title, text) {
var confirm_status = component.get('v.confirm_status');
@@ -465,7 +728,7 @@
var modal_bg = component.find('modal_bg');
var modal_confirm = component.find('modal_confirm');
var modal_confirm_bg = component.find('modal_confirm_bg');
- debugger
+
if (confirm_status == 0) {
$A.util.addClass(modal_window, 'disp_none');
$A.util.addClass(modal_bg, 'disp_none');
@@ -514,7 +777,7 @@
},
// 澶嶅埗鎸夐挳
copy_button: function (component, event, helper) {
- debugger
+
this.allclear(component);
component.set('v.mode', 'copy');
component.set('v.dialog_type', '鏂板缓');
@@ -543,10 +806,10 @@
},
//鍒犻櫎鎸夐挳
delete_button: function (component, event, helper) {
- debugger
+
var select_report_data = component.get('v.select_report_data_radio');
if (confirm('鏄惁鍒犻櫎璇ユ暟鎹紵')) {
- debugger
+
component.set('v.login', true);
var action = component.get('c.deleteAgencyReport');
action.setParams({
@@ -569,7 +832,7 @@
},
//澶嶅埗鎸夐挳鍙敤
change_report_radio: function (component, event, helper) {
- debugger
+
var reports = component.get('v.reports');
for (var i = 0; i < reports.length; i++) {
if (reports[i].Name == event.getSource().get('v.label')) {
@@ -582,9 +845,10 @@
},
//缂栬緫鎸夐挳
edit_button: function (component, event, helper) {
- this.allclear(component);
+ //component.set('v.loginEdit', true);
debugger
- component.set('v.loadOpp', true);
+ this.allclear(component);
+ //component.set('v.loadOpp', true);
var index = event.getSource().get('v.value');
component.set('v.select_report_data', component.get('v.reports')[index]);
component.set('v.mode', 'edit');
@@ -599,7 +863,7 @@
var new_label = this.get_agency_person_name(component, select_agency);
component.set('v.selected_agency_person', new_label);
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);
+ var ret = this.create_report_header_edit(component, event, helper, name, select_agency, select_date);
// SWAG-CF58C3 fy start
this.set_aws_url(component, 'Agency_Contact__c')
// SWAG-CF58C3 fy end
@@ -623,7 +887,7 @@
// 鎷呭綋 Person_In_Charge2__c
Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
}
- debugger
+
// Agency_Report_Header__c
var Agency_Report_Header__c = component.get('v.agency_report_header_id');
// 鍖婚櫌
@@ -1014,6 +1278,49 @@
});
$A.enqueueAction(action);
},
+ create_report_header_edit: function (component, event, helper, name, s_agency, s_date) {
+ component.set('v.login',true);
+ s_date = this.get_date_string(s_date);
+ if (s_date == false) {
+ //component.set('v.errorMessage', 'get_date_string failed.');
+ this.error('get_date_string failed.');
+ 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) {
+ //component.set('v.errorMessage', 'create_header_input_key failed.');
+ this.error('create_header_input_key failed.');
+ this.showErrorToast(component);
+ return false;
+ }
+ var key2 = s_date.replace(/-/g, '');
+ var action = component.get('c.createReportHeader');
+ action.setParams({
+ "name": name,
+ "s_date": s_date,
+ "s_agency": s_agency,
+ "head_key": head_key,
+ });
+ component.set('v.loginEdit', true);
+ action.setCallback(this, function (response) {
+ var state = response.getState();
+ if (state == 'SUCCESS') {
+ var res = response.getReturnValue();
+ component.set('v.agency_report_header_id', res);
+ component.set('v.loginEdit', false);
+ this.toggle_report_edit(component, event, helper);
+ }
+ else {
+ //component.set('v.errorMessage', 'createReportHeader callback failed.');
+ this.error('createReportHeader callback failed.');
+ this.showErrorToast(component);
+ component.set('v.loginEdit', 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);
@@ -1112,7 +1419,7 @@
component.set("v.hospitalId", '');
},
selectHos: function (component, event, helper) {
- debugger
+
var hospital_list = component.find('hospital_list');
$A.util.removeClass(hospital_list, 'slds-is-open');
var accname = event.currentTarget.dataset.accname;
@@ -1133,7 +1440,7 @@
component.set("v.hospitals", accname);
component.set("v.hospital", accname);
component.set("v.hospitalId", accid);
- debugger
+
component.set('v.setdoctorlisthos', true);
this.set_doctor_list(component, event, helper);
},
@@ -1178,7 +1485,7 @@
component.set('v.data.UseProduct1__c', '');
},
seletUseProduct1Change: function (component, event, helper) {
- debugger
+
var UseProduct1_List = component.find('UseProduct1_List');
$A.util.removeClass(UseProduct1_List, 'slds-is-open');
var accname = event.currentTarget.dataset.accname;
@@ -1327,7 +1634,7 @@
},
//hospitalLinkId 缁忛攢鍟嗗尰闄㈢殑ID 鎷滆浜哄鍒剁殑鍦版柟
doctor_change: function (component, event, helper) {
- debugger
+
var doctorurpose = component.find('select_purpose_type').get('v.value');
var doctor_value = component.find('select_doctor').get('v.value');
var doctor_list = component.get('v.doctor_list');
@@ -1369,13 +1676,14 @@
this.error('AWS url/token error.');
this.showErrorToast(component);
component.set('v.login', false);
+ component.set('v.loginEdit', false);
}
});
$A.enqueueAction(action);
},
insert_agencycontact: function (component, token, newUrl, payload, agencyHospitalid, helper, hospitalName) {
- debugger
+
console.log('newUrl = ' + newUrl);
console.log('payload = ' + payload);
console.log('token = ' + token);
@@ -1518,7 +1826,7 @@
action.setCallback(this, function (response) {
var state = response.getState();
if (state == 'SUCCESS') {
- debugger;
+ ;
var res = this.conv_selected(response.getReturnValue());
//fy
var setdoctorlisthos = component.get('v.setdoctorlisthos');
@@ -1610,7 +1918,7 @@
}
}
// component.set('v.default_select_doctor_id', '');
- debugger
+
component.set('v.doctor_list', res);
component.set('v.login', false);
}
@@ -1632,13 +1940,145 @@
}
}
},//fy 20220414
+ set_doctor_list_edit: function (component) {
+ console.log('set_doctor_list')
+ var doctor_value = component.find('select_purpose_type').get('v.value');
+ var hospital_id = component.get('v.hospitalLinkId');
+ console.log('hospital_id = ' + hospital_id);
+ if (hospital_id) {
+ if (doctor_value == '绉戝浼�') {
+ component.set('v.loginEdit', true);
+ this.set_doctor_list2(component);
+ } else {
+ component.set('v.loginEdit', true);
+ var action = component.get('c.getDoctorList');
+ action.setParams({
+ "hospital_id": hospital_id,
+ });
+ action.setCallback(this, function (response) {
+ var state = response.getState();
+ if (state == 'SUCCESS') {
+ ;
+ var res = this.conv_selected(response.getReturnValue());
+ //fy
+ var setdoctorlisthos = component.get('v.setdoctorlisthos');
+ if (setdoctorlisthos) {
+ component.set('v.default_select_doctor_id', '');
+ component.set('v.setdoctorlisthos', false);
+ }
+ //fy
+ var default_doctor = component.get('v.default_select_doctor_id');
+ if (default_doctor != '' && res.length > 0) {
+ var doctor_title = '';
+ let awsids = [];
+ for (var i = 0; i < res.length; i++) {
+ if (res[i].value == default_doctor) {
+ res[i].selected = true;
+ doctor_title = res[i].Doctor_Division1__c;
+ } else {
+ res[i].selected = false;
+ }
+ if (res[i].AWS_Data_Id__c) {
+ awsids.push(res[i].AWS_Data_Id__c);
+ }
+ }
+ component.find('select_doctor').set('v.options', res);
+ component.set('v.doctor_title', doctor_title);
+ console.log('awsids = ' + JSON.stringify(awsids))
+ if (awsids.length > 0) {
+ let PIConfig = component.get('v.PIConfig');
+ let staticResourceAgencyContact = JSON.parse(PIConfig.staticResourceAgencyContact);
+ AWSService.search(staticResourceAgencyContact.searchUrl, {
+ dataIds: awsids
+ }, function (data) {
+ console.log('data = ' + JSON.stringify(data))
+ if (data && data.object && data.object.length) {
+ let m = {};
+ for (let di in data.object) {
+ if (data.object[di] && data.object[di].dataId) {
+ m[data.object[di].dataId] = data.object[di];
+ }
+ }
+
+ for (let ri in res) {
+ if (res[ri] && res[ri].AWS_Data_Id__c && m.hasOwnProperty(res[ri].AWS_Data_Id__c)) {
+ res[ri].label = m[res[ri].AWS_Data_Id__c].name;
+ }
+ }
+ component.find('select_doctor').set('v.options', res);
+ }
+
+ component.set('v.loginEdit', false);
+ }, staticResourceAgencyContact.token);
+ }
+ } else {
+ let awsids = [];
+ for (var i = 0; i < res.length; i++) {
+ if (res[i].AWS_Data_Id__c) {
+ awsids.push(res[i].AWS_Data_Id__c);
+ }
+ }
+ component.find('select_doctor').set('v.options', res);
+ if (awsids.length > 0) {
+ let PIConfig = component.get('v.PIConfig');
+ let staticResourceAgencyContact = JSON.parse(PIConfig.staticResourceAgencyContact);
+ AWSService.search(staticResourceAgencyContact.searchUrl, {
+ dataIds: awsids
+ }, function (data) {
+ if (data && data.object && data.object.length) {
+ let m = {};
+ for (let di in data.object) {
+ if (data.object[di] && data.object[di].dataId) {
+ m[data.object[di].dataId] = data.object[di];
+ }
+ }
+
+ for (let ri in res) {
+ if (res[ri] && res[ri].AWS_Data_Id__c && m.hasOwnProperty(res[ri].AWS_Data_Id__c)) {
+ res[ri].label = m[res[ri].AWS_Data_Id__c].name;
+ }
+ }
+ component.find('select_doctor').set('v.options', res);
+ }
+
+ component.set('v.loginEdit', false);
+ }, staticResourceAgencyContact.token);
+ }
+ // component.find('select_doctor').set('v.options', res);
+ if (res.length > 0) {
+ 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.loginEdit', false);
+ }
+ else {
+ // component.set('v.errorMessage', 'set_doctor_list failed.');
+ this.error('set_doctor_list failed.');
+ this.showErrorToast(component);
+ component.set('v.loginEdit', false);
+ }
+ });
+ $A.enqueueAction(action);
+ }
+
+ } else {
+ if (doctor_value == '绉戝浼�') {
+ this.set_doctor_list2(component);
+ } else {
+ component.find('select_doctor').set('v.options', '');
+ }
+ }
+ },
set_doctor_list2: function (component) {
var action1 = component.get('c.selectdoctor3c');
action1.setCallback(this, function (response) {
var state = response.getState();
if (state == 'SUCCESS') {
var res = response.getReturnValue();
- debugger
+
for (var i = 0; i < res.length; i++) {
if (res[i].selected == 'true') {
res[i].selected = true;
@@ -1646,11 +2086,12 @@
res[i].selected = false;
}
}
- debugger
+
component.find('select_doctor').set('v.options', res);
var doctor3value = component.get('v.default_select_doctor_id2');
this.set_selected(component, 'select_doctor', doctor3value);
component.set('v.login', false);
+ component.set('v.loginEdit', false);
}
});
$A.enqueueAction(action1);
@@ -1710,7 +2151,7 @@
return obj;
},
set_selected: function (component, aura_id_name, value) {
- debugger;
+ ;
var select_tmp = component.find(aura_id_name).get('v.options');
if (select_tmp) {
for (var i = 0; i < select_tmp.length; i++) {
@@ -1728,7 +2169,7 @@
},
//寮瑰嚭 鎴愬姛鎻愮ず
showSuccessToast: function (component) {
- debugger
+
$A.util.removeClass(component.find('successDiv'), 'slds-hide');
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('successDiv'), 'slds-hide');
@@ -1738,7 +2179,7 @@
},
//寮瑰嚭 鎴愬姛鎻愮ず
showSuccessToast01: function (component) {
- debugger
+
$A.util.removeClass(component.find('successDiv01'), 'slds-hide');
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('successDiv01'), 'slds-hide');
@@ -1748,7 +2189,7 @@
},
//寮瑰嚭 閿欒鎻愮ず
showErrorToast: function (component) {
- debugger
+
$A.util.removeClass(component.find('errorDiv'), 'slds-hide');
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('errorDiv'), 'slds-hide');
@@ -1758,7 +2199,7 @@
},
//寮瑰嚭 閿欒鎻愮ず
showErrorToast01: function (component) {
- debugger
+
$A.util.removeClass(component.find('errorDiv01'), 'slds-hide');
window.setTimeout($A.getCallback(function () {
$A.util.addClass(component.find('errorDiv01'), 'slds-hide');
@@ -1851,7 +2292,7 @@
component.set("v.TargetFileName", output);
};
reader.onload = function (e) {
- debugger;
+ ;
var data = e.target.result;
component.set("v.fileContentData", data);
@@ -1959,13 +2400,13 @@
action1.setCallback(this, function (response) {
var state = response.getState();
if (state === "SUCCESS") {
- debugger
+
var ress = response.getReturnValue();
if (ress) {
var valur = ress.split('error1');
if (valur.length <= 1) {
var res = JSON.parse(response.getReturnValue());
- debugger
+
var dataArr = new Array();
var dataMap = new Map();
res.forEach(item => {
@@ -1975,7 +2416,7 @@
dataMap.set(item.AWS_Data_Id__c, item.AWS_Data_Id__c);
}
});
- debugger
+
let obj = Object.create(null);
obj['dataIds'] = dataArr;
var payload = JSON.stringify(obj);
@@ -2143,7 +2584,7 @@
let errorArray = error.split('error1');
let errorDatas = [];
let errorDataRow = [];
- debugger
+
var fileContentData = component.get("v.fileContentData").split('\n');
console.log('fileContentData = ' + JSON.stringify(fileContentData))
console.log('errorArray = ' + JSON.stringify(errorArray))
@@ -2223,7 +2664,7 @@
console.log('fileStr=' + fileStr);
$A.getCallback(function () {
- debugger
+
helper.ImportMethod(component, fileStr, helper);
})();
@@ -2248,7 +2689,7 @@
let errorDataRow = [];
var fileContentData = component.get("v.fileContentData").split('\n');
console.log('fileContentData[1].split(,)[5] = ' + fileContentData[1].split(',')[5])
- debugger
+
for (var i = 0; i < ress.length; i++) {
res1 += ress[i].substr(7) + '\n';
if (ress[i] != '') {
@@ -2264,7 +2705,7 @@
}
errorDatas.push(errorData);
} else {
- debugger
+
if(ress[i].substr(7).substring(5) == '鎷滆浜轰笉瀛樺湪'){
errorDatas[index].errorInfo += '; ' + '鎷滆浜� ' + fileContentData[errorDatas[index].errorRow].split(',')[5] + '涓嶅瓨鍦�';
}else{
@@ -2650,7 +3091,7 @@
},
//宸ヤ綔浼氳褰�
selectPurposeType: function (component, event, helper) {
- debugger
+
var doctor_value = component.find('select_purpose_type').get('v.value');
// alert(doctor_value);
if (doctor_value != '绉戝浼�') {
@@ -2678,7 +3119,7 @@
},
selectProductClassification: function (component, event, helper) {
- debugger
+
var select_ProductClassification = component.find('select_ProductClassification').get('v.value');
if (select_ProductClassification != '') {
var action = component.get('c.selectProductClassificationc');
@@ -2700,7 +3141,7 @@
},
select_ProductCcategory: function (component, event, helper) {
var select_ProductCcategory = component.find('select_ProductCcategory').get('v.value');
- debugger
+
if (select_ProductCcategory != '') {
var result = component.find('result');
var UserProType = component.get('v.UserProType');
@@ -2740,7 +3181,7 @@
$A.util.addClass(result, 'disp_none');
}
} else {
- debugger
+
component.find('select_productCategories').set('v.value', '');
var result = component.find('result');
$A.util.addClass(result, 'disp_none');
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index 5c1b113..d2795b4 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -345,13 +345,15 @@
<div class="slds-modal__content slds-grow slds-p-around--medium">
<div class="slds-box slds-theme--shade">
<div class="slds-grid slds-wrap slds-grid--pull-padded" >
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop" >
娲诲姩鏃�
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/>
+ <!-- <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/> -->
+ <lightning:input type="date" value="{!v.data.Report_Date__c}" aura:id="input-report-date"
+ variant="label-hidden" />
</div>
<!-- 鍖婚櫌 -->
- <div aura:id="hospital_list" class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5" data-select="single">
+ <div aura:id="hospital_list" class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5 marginTop" data-select="single">
<ui:inputText aura:id="hospital_input_text" label="鍖婚櫌" class="field" value="{!v.hospital}" updateOn="keyup"/>
<div class="slds-lookup__menu" id="lookup-66">
<ul class="slds-lookup__list" role="listbox">
@@ -369,34 +371,34 @@
</div>
<!-- 绉戝鍒嗙被 -->
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop">
{!v.fieldsmap.Department_Cateogy__c}
<ui:inputSelect aura:id="select_department" class="slds-select" change="{!c.select_department}"/>
</div>
<!-- 鍏堢敓 -->
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop">
{!v.fieldsmap.doctor2__c}
<ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}"/>
</div>
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12 marginTop">
<br/>
<ui:button label="鏂板缓" class="slds-button" press="{!c.createCon}" disabled="true" aura:id="new_con"/>
</div>
<!-- 鑱屼綅 -->
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop">
{!v.fieldsmap.visitor_title__c}
<div>{!v.doctor_title}</div>
</div>
<!-- 娲诲姩鍖哄垎 -->
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop">
{!v.fieldsmap.Purpose_Type__c}
<ui:inputSelect aura:id="select_purpose_type" class="slds-select" change="{!c.select_purpose_type}"/>
</div>
<!-- 璇环 -->
- <div aura:id="input-opportunity-opp" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12">
+ <div aura:id="input-opportunity-opp" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12 marginTop">
{!v.fieldsmap.Opportunity__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
<!-- <force:inputField value="{!v.data.Opportunity__c}" aura:id="input-opportunity"/> -->
@@ -417,53 +419,53 @@
filter="{!v.opportunity_cfilter}"
subTitleFormat="{0}+{1}+{2}"/>
</div>
- <div aura:id="input-opportunity-blank" class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12">
+ <div aura:id="input-opportunity-blank" class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12 marginTop">
</div>
- <div aura:id="input-opportunity-stage" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ <div aura:id="input-opportunity-stage" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
{!v.fieldsmap.StageName__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
<ui:inputSelect aura:id="select_stageName" class="slds-select"/>
<!-- <force:inputField value="{!v.oppdata.StageName__c}" aura:id="input-oppstage" /> -->
</div>
- <div aura:id="input-opportunity-amount1" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ <div aura:id="input-opportunity-amount1" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
{!v.fieldsmap.Amount__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
<force:inputField value="{!v.oppdata.Amount__c}" class=""/>
</div>
- <div aura:id="input-opportunity-amount2" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ <div aura:id="input-opportunity-amount2" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
{!v.fieldsmap.OCMSale_Price__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
<force:inputField value="{!v.oppdata.OCMSale_Price__c}" class=""/>
</div>
- <div aura:id="input-opportunity-date" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
+ <div aura:id="input-opportunity-date" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12 marginTop">
{!v.fieldsmap.Close_Forecasted_Date__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
<force:inputField value="{!v.oppdata.Close_Forecasted_Date__c}" class=""/>
</div>
<!-- 瑁藉搧鍒嗛 -->
- <div aura:id="product_category_select1" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ <div aura:id="product_category_select1" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
{!v.fieldsmap.Product_Category1__c}
<!-- <force:inputField value="{!v.data.Product_Category1__c}" aura:id="input-product-category1"/> -->
<ui:inputSelect aura:id="select_Product1" class="slds-select" change="{!c.productcategoryChange1}"/>
</div>
- <div aura:id="product_category_select2" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ <div aura:id="product_category_select2" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
{!v.fieldsmap.Product_Category2__c}
<!-- <force:inputField value="{!v.data.Product_Category2__c}" aura:id="input-product-category2"/> -->
<ui:inputSelect aura:id="select_Product2" class="slds-select" change="{!c.productcategoryChange2}"/>
</div>
- <div aura:id="product_category_select3" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ <div aura:id="product_category_select3" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
{!v.fieldsmap.Product_Category3__c}
<!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
<ui:inputSelect aura:id="select_Product3" class="slds-select" change="{!c.productcategoryChange3}"/>
</div>
<!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start-->
<!-- 鏀彺闇�姹� change="{!c.SupportNeeds__c}"-->
- <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
+ <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6 marginTop">
{!v.fieldsmap.SupportNeeds__c}
<ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
</div>
<!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end-->
- <div aura:id="result" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
+ <div aura:id="result" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 marginTop">
{!v.fieldsmap.Result__c}
<ui:inputSelect aura:id="select_result" class="slds-select"/>
<!-- <ui:inputText label="缁撴灉" class="bcolor" value="{!v.result}"/> -->
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
index 98e8382..6ba5412 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
@@ -149,4 +149,7 @@
position: absolute;
top:100px;
}
+.THIS .marginTop{
+ margin-top: 10px;
+}
/* add by Deloitte-Link 2023-6-19 end*/
\ No newline at end of file
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
index ad2732b..9c2e49c 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
@@ -21,9 +21,7 @@
new_report : function(component, event, helper) {
component.find('save_button').set('v.label', '淇濆瓨骞舵柊寤�');
- let agencyReportHeaderTest = component.get('v.data');
- agencyReportHeaderTest.Report_Date__c = '';
- //component.set('v.data.Report_Date__c', '');
+ component.set('v.data.Report_Date__c', '');
helper.new_report(component, event, helper);
},
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index e4c2977..7816c68 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -2061,6 +2061,7 @@
let errorDatas = [];
let errorDataRow = [];
debugger
+ var fileContentData = component.get("v.fileContentData").split('\n');
for (var i=0; i<ress.length; i++) {
res1 += ress[i].substr(7)+'\n';
if (ress[i] != '') {
@@ -2073,13 +2074,20 @@
errorData.errorRow = ress[i].substr(7).substring(1, 2);
errorDataRow.push(errorData.errorRow);
errorData.errorInfo = ress[i].substr(7).substring(5).replace('=','');
+ if(errorData.errorInfo == '鎷滆浜轰笉瀛樺湪'){
+ console.log('errorData.errorRow = ' + errorData.errorRow)
+ errorData.errorInfo ='鎷滆浜� ' + fileContentData[errorData.errorRow].split(',')[4] + '涓嶅瓨鍦�';
+ }
errorDatas.push(errorData);
} else {
- errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
+ if(ress[i].substr(7).substring(5) == '鎷滆浜轰笉瀛樺湪'){
+ errorDatas[index].errorInfo += '; ' + '鎷滆浜� ' + fileContentData[errorDatas[index].errorRow].split(',')[4] + '涓嶅瓨鍦�';
+ }else{
+ errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
+ }
}
}
}
- var fileContentData = component.get("v.fileContentData").split('\n');
let errorColumns = [
{ label: '閿欒琛�', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
{ label: '閿欒淇℃伅', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true, initialWidth: 300, wrapText: true }
@@ -2179,6 +2187,7 @@
let errorDatas = [];
let errorDataRow = [];
debugger
+ var fileContentData = component.get("v.fileContentData").split('\n');
console.log('errorArray = ' + JSON.stringify(errorArray))
for (var i in errorArray) {
if (errorArray[i] != '') {
@@ -2191,9 +2200,16 @@
errorData.errorRow = errorArray[i].trim().substring(1, 2);
errorDataRow.push(errorData.errorRow);
errorData.errorInfo = errorArray[i].trim().substring(5,errorArray[i].trim().length).replace('=','');
+ if(errorData.errorInfo == '鎷滆浜篈WS涓嶅瓨鍦�'){
+ errorData.errorInfo ='鎷滆浜� ' + fileContentData[errorData.errorRow].split(',')[4] + '涓嶅瓨鍦�';
+ }
errorDatas.push(errorData);
} else {
- errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5,errorArray[i].trim().length);
+ if(errorArray[i].trim().substring(5) == '鎷滆浜篈WS涓嶅瓨鍦�'){
+ errorData[index].errorInfo = '; ' + '鎷滆浜� ' + fileContentData[errorDatas[index].errorRow].split(',')[4] + '涓嶅瓨鍦�';
+ }else{
+ errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5,errorArray[i].trim().length);
+ }
}
}
}
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
index ae50a30..13dca85 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived3Controller.cls
@@ -334,7 +334,6 @@
// 淇濆瓨鎸夐挳
public PageReference save() {
-
List<String> raids = Raid.split(':');
//妫�鏌ユ槸鍚﹀彲浠ョ户缁�
List<Rental_Apply__c> RaTarList = [select Id,Name,Campaign__c,Repair__c,next_action__c
@@ -346,6 +345,8 @@
,Campaign__r.Approved_Status__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
,repair__r.Return_Without_Repair_Date__c
,Repair__r.Repair_Final_Inspection_Date__c
+ ,AccDealerBlacklist__c//璐告槗鍚堣 you
+ //,EquipmentGuaranteeFlg__c//璐告槗鍚堣 you
,Repair__r.Repair_Shipped_Date__c
from Rental_Apply__c
where id in :raids];//20210602 ljh update 澧炲姞鏌ヨName SFDC-C3LBNL
@@ -379,13 +380,19 @@
String message6 = '';
String message7 = '';// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� end
String message8 = '';//add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣
+ String message9 = '';//璐告槗鍚堣 you
// 瑕佸垽鏂喅瑁佺姸鎬佷笉鑳芥槸鑽夌/椹冲洖/缁堟鐢宠/鍙栨秷/鍒犻櫎
List<String> statusList = System.Label.StatusProcessState.split(',');
Map<Id, Rental_Apply__c> RaMap = new Map<Id, Rental_Apply__c>();
for (Rental_Apply__c RaTar : RaTarList) {
// 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� start
// if( RaTar.Campaign__r.Status == '鍙栨秷'){
- if( RaTar.Campaign__r.Status == '鍙栨秷' || RaTar.Campaign__r.Status == '鍙栨秷鐢宠涓�'){
+ //璐告槗鍚堣 you
+ // && RaTar.EquipmentGuaranteeFlg__c==false
+ if(System.Label.TradeComplianceStatusFlagBP =='true' && RaTar.AccDealerBlacklist__c == '1'){
+ errorFlag = true;
+ message9 += RaTar.Name+'銆�';
+ }else if( RaTar.Campaign__r.Status == '鍙栨秷' || RaTar.Campaign__r.Status == '鍙栨秷鐢宠涓�'){
// 20230215 ljh DB202301265636 瀛︿細鍙栨秷鐢宠涔熸嫤鎴� end
// ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '瀛︿細宸插彇娑堬紝涓嶈兘缁х画鎿嶄綔浜�'));
// return null;
@@ -486,6 +493,10 @@
}
// add lc 20220927 SFDC-CJ48VE 澶囧搧棰勮鍑哄簱鏃ラ�昏緫璋冩暣 end
+ if(String.isNotBlank(message9)){
+ message += '鍗曞彿No.'+ message9.removeEnd('銆�')+ System.Label.IFTradeComplianceAlertBP;
+ }
+
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,message));
return null;
}
@@ -575,6 +586,8 @@
, Campaign__r.IF_Approved__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
, Campaign__r.Meeting_Approved_No__r.Name // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
, Campaign__r.Approved_Status__c // 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀�
+ , Hospital__r.TradeComplianceStatus__c//璐告槗鍚堣 you
+ , Outbound_TradeStatus__c//璐告槗鍚堣 you
from Rental_Apply__c where Id in :raSet];
Savepoint sp = Database.setSavepoint();
try {
@@ -667,7 +680,7 @@
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 start
ra.Is_keyPoint_Product__c = keyPointProduct.get(ra.Id);
//wangweipeng 鏄惁鏄噸鐐逛骇鍝� 2021/08/30 start
-
+ ra.Outbound_TradeStatus__c = ra.Hospital__r.TradeComplianceStatus__c;//璐告槗鍚堣 you
// 20220315 ljh obpm澶囧搧鍐宠鐘舵�佺浉鍏充慨鏀� update start
//20220217 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.4 鍑哄簱鎴愬姛鏃讹紝鎶婃鏃剁偣鐨勫喅瑁佺紪鍙峰拰鍐宠鐘舵�佸啓鍒板喅瑁佺紪鍙凤紙鍑哄簱锛夊拰鍐宠鐘舵�侊紙鍑哄簱锛変笂
// if (!campMap.isEmpty() && campMap.containsKey(ra.Campaign__c) && campMap.get(ra.Campaign__c).IF_Approved__c){
@@ -683,6 +696,9 @@
}
//if (needSaveDetail) ControllerUtil.updRAEquipmentSetDetail(eList);
if (needSaveDetail) {
+ // 澶囧搧浼樺寲杩藉姞 20230518 lc Start
+ RentalApplyEquipmentSetDetailHandler.skipUpdateAgain = true;
+ // 澶囧搧浼樺寲杩藉姞 20230518 lc End
FixtureUtil.withoutUpsertObjects(eList);
FixtureUtil.withoutUpsertObjects(raList);
}
--
Gitblit v1.9.1