From 4f200849487fc6f914e237d5af3ecefd6d802457 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 10 七月 2023 09:52:59 +0800
Subject: [PATCH] backup1007
---
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp | 291 +--
force-app/main/default/classes/DealerInquiryModifyStateController.cls | 14
force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls | 7
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css | 60
force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger | 57
force-app/main/default/aura/CreateTarget/CreateTargetHelper.js | 40
force-app/main/default/pages/DealerInquiryModifyState.page-meta.xml | 2
force-app/main/default/aura/CreateTarget/CreateTarget.cmp-meta.xml | 2
force-app/main/default/lwc/lexConsumable/lexConsumable.js | 30
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js | 1236 ++--------------
.sf/config.json | 2
force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js | 498 ------
force-app/main/default/staticresources/lexdatatable.css | 2
force-app/main/default/classes/ArriveGoodsControllerTest.cls | 430 +++--
force-app/main/default/aura/WeeklyReport/WeeklyReportController.js | 12
force-app/main/default/classes/ArriveGoodsController.cls | 1171 +++-----------
force-app/main/default/pages/DealerInquiryModifyState.page | 314 +--
force-app/main/default/aura/CreateTarget/CreateTarget.cmp | 21
force-app/main/default/aura/WeeklyReport/WeeklyReport.css | 36
force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml | 2
force-app/main/default/aura/CreateTarget/CreateTarget.css | 6
force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js | 9
force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp | 169 -
23 files changed, 1,087 insertions(+), 3,324 deletions(-)
diff --git a/.sf/config.json b/.sf/config.json
index e8a7811..4c476fc 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,3 @@
{
- "target-org": "OlympusStageEnv"
+ "target-org": "OlympusProd"
}
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
index 3bd31c0..a093ee6 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -1,6 +1,6 @@
<aura:component
controller="CreateTargetCmp"
- implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
+ implements="forceCommunity:availableForAllPageTypes,force:hasRecordId"
access="global"
>
<aura:handler name="init" value="{!this}" action="{!c.doInit}" />
@@ -154,10 +154,10 @@
onclick="{!c.toggle_report}"
>
<lightning:icon
+ class="close_icn"
iconName="utility:close"
size="medium"
- alternative-text="close"
- variant="inverse"
+ alternativeText="Indicates approval"
/>
<span class="slds-assistive-text">Close</span>
</button>
@@ -174,17 +174,10 @@
<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"
- >
- <lightning:inputField
- variant="label-hidden"
- fieldName="Agency_Hospital__c"
- value="{!v.record.Agency_Hospital__c}"
- aura:id="input-hos"
- />
- </lightning:recordEditForm>
+ <force:inputField
+ value="{!v.record.Agency_Hospital__c}"
+ aura:id="input-hos"
+ />
</div>
</div>
<!-- <h4 class="slds-section__title">璁块棶鐩爣</h4>
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 171ac69..6462fb8 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>42.0</apiVersion>
+ <apiVersion>39.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 f79adff..26df70d 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.css
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.css
@@ -4,9 +4,3 @@
.THIS.disp_none {
display: none;
}
-.THIS select {
- --lwc-lineHeightButton: 36px;
- --lwc-heightInput: 36px;
- min-height: 0px !important;
- height: 36px !important;
-}
diff --git a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
index e021d2c..001c393 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
+++ b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
@@ -8,19 +8,14 @@
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);
- //add by Deloitte 2023-6-8
- let agency = component.get("v.record");
- agency.Agency_Hospital__c = select_ah;
- // component.set("v.record", agency);
+
+ component.set("v.record.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",
@@ -33,29 +28,15 @@
}
}
];
- // 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);
- }
+ 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);
- //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);
- }
+ component
+ .find("input-hos")
+ .get("v.body")[0]
+ .set("v.selectedLabel", select_ah_name);
}
} else if (state === "ERROR") {
var errors = response.getError();
@@ -74,7 +55,6 @@
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"]));
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
index 42b2d98..baa6567 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.cmp
@@ -1,6 +1,6 @@
<aura:component
controller="RetrospectiveWeeklyReportController"
- implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes,lightning:availableForFlowScreens"
+ implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
access="global"
>
<ltng:require styles="{!$Resource.multilineToastCSS}" />聽
@@ -23,8 +23,7 @@
<aura:attribute
name="acondata"
type="Agency_Contact__c"
- default="{sobjectType:'Ag
- ency_Contact__c'}"
+ default="{sobjectType:'Agency_Contact__c'}"
/>
<aura:attribute name="successMessage" type="String" />
<aura:attribute name="etEng" type="String" />
@@ -43,8 +42,6 @@
<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" />
<aura:attribute name="selectbody" type="String" />
@@ -156,12 +153,6 @@
<aura:attribute name="NumOfRecords" type="Integer" default="1000" />
<aura:attribute name="showMain" type="Boolean" default="true" />
<aura:attribute name="IsEventDefault" type="Boolean" default="true" />
- <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
- <aura:attribute name="errorData" type="Object" />
- <aura:attribute name="errorColumns" type="List" />
- <!-- show Error information -->
- <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
- <!-- end DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
<aura:attribute name="PIConfig" type="Map" />
@@ -171,40 +162,27 @@
<!-- 鎵归噺娣诲姞鏃ユ姤 end-->
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
- <aura:renderIf isTrue="{!!v.loginEdit}">
- <!-- <div class="slds-spinner_container">
- <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
- 聽 聽 <span class="slds-assistive-text">Loading</span>
- 聽 聽 <div class="slds-spinner__dot-a"></div>
- 聽 聽 <div class="slds-spinner__dot-b"></div>
- </div>
- </div> -->
+ <div class="slds-spinner_container height100vh">
<div
- class="slds-spinner_container"
- id="spinner"
- style="position: fixed; top: 123px"
+ class="slds-spinner--brand slds-spinner slds-spinner--medium"
+ role="alert"
>
- <div
- role="status"
- class="slds-spinner slds-spinner_medium slds-spinner_brand"
- >
- <span class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></div>
- </div>
+ <span class="slds-assistive-text">Loading</span>
+ <div class="slds-spinner__dot-a"></div>
+ <div class="slds-spinner__dot-b"></div>
</div>
- </aura:renderIf>
+ </div>
</aura:renderIf>
- <div aura:id="report" id="report">
+ <div aura:id="report" id="report" class="contents_wrapper">
<div class="slds-grid slds-wrap slds-grid--pull-padded">
- <div style="width: 150px"></div>
+ <div style="width: 200px"></div>
<div
- class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12 fontSize"
+ class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
>
鍛�
</div>
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12 fontSize"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
>
<ui:inputSelect
aura:id="select_date"
@@ -234,44 +212,35 @@
class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
style="display: contents"
>
- <ui:button
- aura:id="new_button"
- label="鏂板缓"
- press="{!c.new_report}"
- class="buttonFontSize"
- />
+ <ui:button aura:id="new_button" label="鏂板缓" press="{!c.new_report}" />
</div>
<div
- style="width: 400px"
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12"
+ style="width: 350px"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
<ui:button
aura:id="copy_button"
label="澶嶅埗"
press="{!c.copy_button}"
disabled="true"
- class="buttonFontSize"
/>
<ui:button
aura:id="delete_button"
label="鍒犻櫎"
press="{!c.delete_button}"
disabled="true"
- class="buttonFontSize"
/>
- <ui:button
- aura:id="import"
- label="瀵煎叆"
- press="{!c.import}"
- class="buttonFontSize"
- />
+ <ui:button aura:id="import" label="瀵煎叆" press="{!c.import}" />
<ui:button
aura:id="export"
label="瀵煎嚭"
press="{!c.export_condition}"
- class="buttonFontSize"
/>
- <!-- <ui:button aura:id="returnbutton" label="杩斿洖" press="{!c.return_main_page}" /> -->
+ <ui:button
+ aura:id="returnbutton"
+ label="杩斿洖"
+ press="{!c.return_main_page}"
+ />
</div>
</div>
</div>
@@ -287,41 +256,33 @@
>
<thead>
<tr class="slds-line-height--reset">
- <th
- class="table_header slds-text-title--caps fontSize"
- style="width: 250px"
- >
- <span class="slds-truncate" title="Name">鏃ユ姤缂栧彿</span>
- </th>
- <th class="table_header slds-text-title--caps fontSize">
+ <th class="table_header slds-text-title--caps"></th>
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.Person_In_Charge2__c}</span
>
<!-- {!v.fieldsmap.Person_In_Charge2__c} 鎷呭綋-->
</th>
- <th
- class="table_header slds-text-title--caps fontSize"
- style="width: 250px"
- >
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name">鍖婚櫌</span>
</th>
- <th class="table_header slds-text-title--caps fontSize">
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.Department_Cateogy__c}</span
>
<!-- {!v.fieldsmap.Department_Cateogy__c} 绉戝-->
</th>
- <th class="table_header slds-text-title--caps fontSize">
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name">鎷滆浜�</span>
<!-- {!v.fieldsmap.doctor2__c} 鎷滆浜� -->
</th>
- <th class="table_header slds-text-title--caps fontSize">
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.DealerPersonnel__c}</span
>
<!-- {!v.fieldsmap.visitor_title__c} 鑱屼綅-->
</th>
- <th class="table_header slds-text-title--caps fontSize">
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.WorkMark__c}</span
>
@@ -332,7 +293,7 @@
<tbody>
<aura:iteration items="{!v.reports}" var="item" indexVar="index">
<tr class="slds-hint-parent">
- <td role="gridcell" class="slds-cell-edit fontSize">
+ <td role="gridcell" class="slds-cell-edit">
<ui:inputRadio
class="report_radio"
name="report_radio"
@@ -348,7 +309,7 @@
onclick="{!c.edit_button}"
/>
</td>
- <td role="gridcell" class="slds-cell-edit fontSize">
+ <td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
<span
class="slds-truncate"
@@ -357,15 +318,12 @@
>
</span>
</td>
- <td scope="row" tabindex="0" class="slds-cell-edit fontSize">
- <div
- class="slds-grid slds-grid--align-spread"
- style="word-wrap: break-word"
- >
+ <th scope="row" tabindex="0" class="slds-cell-edit">
+ <span class="slds-grid slds-grid--align-spread">
{!item.Agency_Hospital__r.Name}
- </div>
- </td>
- <td role="gridcell" class="slds-cell-edit fontSize">
+ </span>
+ </th>
+ <td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
<span
class="slds-truncate"
@@ -374,7 +332,7 @@
>
</span>
</td>
- <td role="gridcell" class="slds-cell-edit fontSize">
+ <td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
<span class="slds-truncate" title="{!item.doctor2__r.Name}">
<span class="encrypt">{!item.doctor2__r.Name}</span>
@@ -382,7 +340,7 @@
</span>
</span>
</td>
- <td role="gridcell" class="slds-cell-edit fontSize">
+ <td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
<span
class="slds-truncate"
@@ -391,7 +349,7 @@
>
</span>
</td>
- <td role="gridcell" class="slds-cell-edit fontSize">
+ <td role="gridcell" class="slds-cell-edit">
<span class="slds-grid slds-grid--align-spread">
<span class="slds-truncate" title="{!item.WorkMark__c}">
<lightning:input
@@ -421,9 +379,6 @@
class="disp_none slds-modal slds-fade-in-open slds-modal--large"
aria-labelledby="headerTarget"
>
- <aura:renderIf isTrue="{!v.modal_import_spinner}">
- <lightning:spinner alternativeText="Loading" size="medium" />
- </aura:renderIf>
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
<!-- <ui:inputText aura:id="articleURL" /> -->
<div class="demo-only" style="height: 8rem">
@@ -449,24 +404,35 @@
</div>
</div>
</div>
- <!-- <div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv01" style="z-index: 10001">
- <div class="demo-only" style="height: 8rem;">
- <div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
- <div class=" slds-m-left_xx-large">
- <div
- class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
- <lightning:icon alternativeText="error" iconName="utility:error" size="small"
- class="buttonColor slds-m-right_small" />
- <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
- <lightning:icon alternativeText="Close" iconName="utility:close" size="small"
- onclick="{!c.closeErrorDiv}" />
- </div>
- </div>
- </div>
- </div>
+ <div
+ class="slds-modal slds-fade-in-open slds-hide"
+ aura:id="errorDiv01"
+ style="z-index: 10001"
+ >
+ <!-- <ui:inputText aura:id="articleURL" /> -->
+ <div class="demo-only" style="height: 8rem">
+ <div class="slds-notify_container slds-is-relative">
+ <div
+ class="slds-notify slds-notify_toast slds-theme_error"
+ role="status"
+ >
+ <div class="slds-m-left_xx-large">
+ <div
+ class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large"
+ >
+ <lightning:icon
+ alternativeText="error"
+ iconName="utility:error"
+ size="small"
+ class="buttonColor slds-m-right_small"
+ />
+ <h2 class="slds-text-heading_small">{!v.errorMessage}</h2>
+ </div>
</div>
- </div> -->
+ </div>
+ </div>
+ </div>
+ </div>
<div class="slds-modal__container">
<div class="slds-modal__header">
<h4 id="headerTarget" class="slds-float--left"></h4>
@@ -476,12 +442,12 @@
<ui:button
aura:id="close_button"
label="鍏抽棴"
- class="close_button slds-button slds-button--neutral slds-order--1 buttonFontSize"
+ class="close_button slds-button slds-button--neutral slds-order--1"
press="{!c.close_import}"
/>
</div>
<div
- class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium fontSize"
+ class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium"
>
<aura:if isTrue="{!v.showMain}">
<div>
@@ -494,7 +460,7 @@
</div>
<aura:set attribute="else">
<ui:outputRichText
- class="uiOutputRichText slds-m--around-large fontSize"
+ class="uiOutputRichText slds-m--around-large"
value="{!v.TableContent}"
/>
<div class="slds-p-around--large slds-align--absolute-center">
@@ -502,34 +468,13 @@
label="淇濆瓨"
variant="brand"
onclick="{!c.processFileContent}"
- class="buttonFontSize"
/>
<lightning:button
label="鍙栨秷"
variant="brand"
onclick="{!c.cancel}"
- class="buttonFontSize"
/>
</div>
- <aura:if isTrue="{!v.showErrorInfo}">
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button
- label="瀵煎嚭閿欒淇℃伅"
- variant="brand"
- onclick="{!c.exportErrorInfo}"
- />
- </div>
- <div class="slds-p-around--large slds-align--absolute-center">
- <div style="height: 300px; overflow-x: scroll">
- <lightning:datatable
- keyField="id"
- data="{! v.errorData }"
- columns="{! v.errorColumns }"
- hideCheckboxColumn="true"
- />
- </div>
- </div>
- </aura:if>
</aura:set>
</aura:if>
</div>
@@ -694,46 +639,35 @@
</div>
</div>
</div>
-
- <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-modal__header">
+ <h4 id="headerTarget" class="slds-float--left">{!v.dialog_type}</h4>
+ <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-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-7 slds-large-size--1-of-7"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
娲诲姩鏃�
<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-7 slds-large-size--1-of-7"
+ 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-6"
data-select="single"
>
<!-- label="鍖婚櫌" -->
@@ -743,7 +677,6 @@
class="field"
value="{!v.hospital}"
updateOn="keyup"
- variant="label-hidden"
/>
<div class="slds-lookup__menu" id="lookup-66">
<ul class="slds-lookup__list" role="listbox">
@@ -772,21 +705,18 @@
</div>
<!-- 绉戝鍒嗙被 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
{!v.fieldsmap.Department_Cateogy__c}
- <!-- <ui:inputText aura:id="select_department" class="slds-select"
- change="{!c.select_department}"/> -->
- <lightning:input
- type="text"
- onchange="{!c.select_department}"
+ <ui:inputText
aura:id="select_department"
- variant="label-hidden"
+ class="slds-select"
+ change="{!c.select_department}"
/>
</div>
<!-- 缁忛攢鍟嗕汉鍛� change="{!c.select_DealerPersonnel}" -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
style="width: 145px"
>
{!v.fieldsmap.DealerPersonnel__c}
@@ -797,7 +727,7 @@
</div>
<!-- 娲诲姩鍖哄垎 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
{!v.fieldsmap.WorkRecord__c}
<ui:inputSelect
@@ -808,7 +738,7 @@
</div>
<!-- 鎷滆浜� {!v.fieldsmap.doctor2__c}-->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
style="width: 145px"
>
鎷滆浜�
@@ -821,7 +751,7 @@
<!-- <p hidden="hidden"> -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-7 slds-large-size--1-of-7"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12"
>
<br />
<ui:button
@@ -837,7 +767,7 @@
<hr />
<!-- 浜у搧鍒嗙被(绗笁鍒嗙被) change="{!c.select_ProductClassification}" -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
浜у搧鍒嗙被(绗笁鍒嗙被)
<ui:inputSelect
@@ -849,7 +779,7 @@
<!-- 浣跨敤浜у搧1(浜у搧鍨嬪彿) UseProduct1__c -->
<div
aura:id="UseProduct1_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"
+ 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-6"
data-select="single"
>
<!-- label="浣跨敤浜у搧1(浜у搧鍨嬪彿)" -->
@@ -859,7 +789,6 @@
class="field"
value="{!v.UseProduct1}"
updateOn="keyup"
- variant="label-hidden"
/>
<div class="slds-lookup__menu" id="lookup-11">
<ul
@@ -896,7 +825,7 @@
<!-- 浣跨敤浜у搧2 UseProduct2__c -->
<div
aura:id="UseProduct2_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"
+ 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-6"
data-select="single"
>
<!-- label="浣跨敤浜у搧2" -->
@@ -906,7 +835,6 @@
class="field"
value="{!v.UseProduct2}"
updateOn="keyup"
- variant="label-hidden"
/>
<div class="slds-lookup__menu" id="lookup-22">
<ul
@@ -943,7 +871,7 @@
<!-- 浣跨敤浜у搧3 UseProduct3__c -->
<div
aura:id="UseProduct3_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"
+ 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-6"
data-select="single"
>
<!-- label="浣跨敤浜у搧3" -->
@@ -953,7 +881,6 @@
class="field"
value="{!v.UseProduct3}"
updateOn="keyup"
- variant="label-hidden"
/>
<div class="slds-lookup__menu" id="lookup-33">
<ul
@@ -990,7 +917,7 @@
<!-- 鏁堟灉/杩涘害 EffectProgress__c-->
<div
aura:id="product_category_select1"
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
{!v.fieldsmap.EffectProgress__c}
<ui:inputSelect
@@ -1001,16 +928,13 @@
<hr />
<!-- 浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺 ConsumptionOfConsumables__c-->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
{!v.fieldsmap.ConsumptionOfConsumables__c}
- <!-- <ui:inputText aura:id="select_ConsumptionOfConsumables" class="slds-select"
- change="{!c.select_ConsumptionOfConsumables}" /> -->
- <lightning:input
- type="text"
- onchange="{!c.select_ConsumptionOfConsumables}"
+ <ui:inputText
aura:id="select_ConsumptionOfConsumables"
- variant="label-hidden"
+ class="slds-select"
+ change="{!c.select_ConsumptionOfConsumables}"
/>
</div>
<!-- 鏈＋鍒嗙被 WarlockClassification__c -->
@@ -1050,17 +974,14 @@
class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
{!v.fieldsmap.warlocksNumber__c}
- <!-- <ui:inputText aura:id="select_warlocksNumber" class="slds-select"
- change="{!c.select_warlocksNumber}" /> -->
- <lightning:input
- type="text"
- onchange="{!c.select_warlocksNumber}"
+ <ui:inputText
aura:id="select_warlocksNumber"
- variant="label-hidden"
+ class="slds-select"
+ change="{!c.select_warlocksNumber}"
/>
</div>
<!-- 鏀彺闇�姹� WorkMark__c-->
- <div style="padding-left: 12px">
+ <div style="padding-left: 20px">
{!v.fieldsmap.WorkMark__c}
<lightning:input type="checkbox" aura:id="select_WorkMark" />
</div>
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
index 7451abc..642ebdb 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReport.css
@@ -1,135 +1,103 @@
-@import "c/lexCssUtility";
-
.THIS .bcolor {
color: #333;
}
-
.THIS.height100vh {
height: 100vh;
}
-
.THIS.contents_wrapper {
padding-top: 50px;
}
-
.THIS .mt5 {
margin-top: 5px;
}
-
.THIS .mt40 {
margin-top: 40px;
}
-
.THIS .edit_button {
float: right;
margin: -1.5em 0.5em 0 0;
border: 0;
}
-
.THIS .no_data_area {
text-align: center;
margin: 0.5em 0;
}
-
.THIS.report_list_area {
margin: 40px 0 20px 100px;
height: 60vh;
overflow-y: scroll;
}
-
.THIS .report_radio {
float: left;
}
-
.THIS .table_header {
width: 9.4rem;
height: 2em;
}
-
.THIS.disp_none {
display: none;
}
-
.THIS .disp_none {
display: none;
}
-
.THIS .tr {
text-align: right;
}
-
.THIS .close_button {
float: right;
margin-top: -2em;
}
-
.THIS .close_icn svg {
fill: #fefefe;
}
-
.THIS .slds-progress__marker {
cursor: default;
}
-
.THIS .progress_0 {
width: 0%;
}
-
.THIS .progress_100 {
width: 100%;
}
-
.THIS .new_btn_area {
text-align: center;
margin-top: 22px;
}
-
.THIS .new_btn {
width: 100%;
}
-
.THIS .save_button_area {
margin: 1em 0;
text-align: right;
}
-
.THIS .save_button {
background-color: #ffa500;
border: 1px solid #ff8c00;
}
-
.THIS .report_data_header {
border-bottom: 2px solid #ccc;
}
-
.THIS .report_data_area {
border-bottom: 1px solid #ccc;
}
-
.THIS.fade {
transition: 5s opacity linear;
}
-
.THIS.animation_off {
opacity: 0;
}
-
.THIS.animation_on {
opacity: 1;
}
-
.THIS .fade {
transition: 5s opacity linear;
}
-
.THIS .animation_off {
opacity: 0;
}
-
.THIS .animation_on {
opacity: 1;
}
-
.THIS .divbotuser {
width: fit-content;
}
@@ -151,14 +119,12 @@
.THIS .customRequired {
font-weight: 400;
}
-
.THIS .customRequired:before {
content: "*";
margin: 0 0.125rem 0 0.125rem;
color: rgb(194, 57, 52);
float: left;
}
-
.THIS .none {
display: none;
}
@@ -173,30 +139,4 @@
.THIS tr:hover .encrypt {
display: none;
-}
-
-.THIS tr:hover .encrypt {
- display: none;
-}
-
-.THIS .buttonFontSize {
- font-size: 18px;
- min-width: 80px;
- max-width: 110px;
-}
-
-.THIS .fontSize {
- font-size: 18px;
-}
-
-.THIS thead th {
- font-size: 18px;
-}
-
-.THIS table {
- table-layout: fixed;
-}
-.THIS td {
- white-space: normal;
- overflow-wrap: break-word;
}
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
index f5e6a6b..d19374d 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportController.js
@@ -299,12 +299,10 @@
CreateRecord: function (component, event, helper) {
var files = event.getSource().get("v.files");
helper.readFile(component, helper, files[0]);
- component.set("v.showErrorInfo", false);
},
processFileContent: function (component, event, helper) {
helper.saveRecords(component, event, helper);
- component.set("v.showErrorInfo", false);
},
cancel: function (component, event, helper) {
@@ -368,12 +366,5 @@
},
return_main_page: function (component, event, helper) {
window.open("/customer/", "_self");
- },
- exportErrorInfo: function (component, event, helper) {
- helper.exportErrorInfoHelper(component);
- },
- closeErrorDiv: function (component, event, helper) {
- var errorDiv01 = component.find("errorDiv01");
- $A.util.addClass(errorDiv01, "slds-hide");
}
});
diff --git a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
index 5cac1fd..d4f4a18 100644
--- a/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
+++ b/force-app/main/default/aura/RetrospectiveWeeklyReport/RetrospectiveWeeklyReportHelper.js
@@ -1,7 +1,6 @@
({
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 +13,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");
@@ -62,80 +61,9 @@
component.set("v.PIConfig", res.PIConfig); // 20220222 PI鏀归�� by Bright
component.set("v.login", false);
} else {
- //component.set('v.errorMessage', 'doinit failed.');
- this.error("doinit failed.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "doinit failed.");
+ this.showErrorToast(component);
component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
- doinitSave: function (component, event, helper) {
- document.title = "杩芥函鏃ユ姤";
- component.set("v.loginEdit", true);
- this.report_date_list(component, event, helper, 5);
- var action = component.get("c.getalldata");
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- component.set("v.alldata", res.reports);
- component.set("v.fieldsmap", res.fieldsMap);
- component.set("v.allselectlist", res.allselectlist);
- component.set("v.doclist", res.doclist);
- //fy
-
- var xx = res.UserProType;
- component.set("v.UserProType", res.UserProType);
- var gg = component.get("v.UserProType");
- //fy
- component
- .find("select_agency_person")
- .set(
- "v.options",
- this.conv_selected(res.allselectlist.AgencyPerson__c)
- );
- 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_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.PIConfig", res.PIConfig); // 20220222 PI鏀归�� by Bright
- component.set("v.loginEdit", false);
- } else {
- //component.set('v.errorMessage', 'doinit failed.');
- this.error("doinit failed.");
- //this.showErrorToast(component);
- component.set("v.loginEdit", false);
}
});
$A.enqueueAction(action);
@@ -179,8 +107,9 @@
date_str: date_str,
person_str: person_str
});
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
action.setCallback(this, function (response) {
+ debugger;
var state = response.getState();
if (state == "SUCCESS") {
var res = response.getReturnValue();
@@ -244,7 +173,7 @@
m[data.object[di].dataId] = data.object[di];
}
}
-
+ debugger;
for (let ri in res.reports) {
if (
res.reports[ri] &&
@@ -269,23 +198,22 @@
component.set("v.report_count", res.reports.length);
}
//fy 20220414 end
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
},
staticResourceAgencyContact.token
);
} else {
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
}
} else {
component.set("v.list_message", "no_data");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
} else {
- //component.set('v.errorMessage', 'get_reports failed.');
- this.error("get_reports failed.");
- //this.showErrorToast(component);
- component.set("v.loginEdit", false);
+ component.set("v.errorMessage", "get_reports failed.");
+ this.showErrorToast(component);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -333,6 +261,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")) {
@@ -500,6 +429,8 @@
.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 != "") {
var select_EffectProgress1 = "";
@@ -668,345 +599,6 @@
}
}
}
- },
- 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) {
@@ -1017,7 +609,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");
@@ -1072,6 +664,7 @@
},
// 澶嶅埗鎸夐挳
copy_button: function (component, event, helper) {
+ debugger;
this.allclear(component);
component.set("v.mode", "copy");
component.set("v.dialog_type", "鏂板缓");
@@ -1115,8 +708,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({
@@ -1139,6 +734,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")) {
@@ -1151,11 +747,9 @@
},
//缂栬緫鎸夐挳
edit_button: function (component, event, helper) {
- component.set("v.login", true);
- debugger;
- //component.set('v.loginEdit', true);
this.allclear(component);
- //component.set('v.loadOpp', true);
+ debugger;
+ 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");
@@ -1174,7 +768,7 @@
"v.edit_copy_select_report_id",
component.get("v.reports")[index].Id
);
- var ret = this.create_report_header_edit(
+ var ret = this.create_report_header(
component,
event,
helper,
@@ -1184,7 +778,6 @@
);
// SWAG-CF58C3 fy start
this.set_aws_url(component, "Agency_Contact__c");
- //component.set('v.login', false);
// SWAG-CF58C3 fy end
},
//淇濆瓨
@@ -1212,7 +805,7 @@
.find("select_agency_person")
.get("v.value");
}
-
+ debugger;
// Agency_Report_Header__c
var Agency_Report_Header__c = component.get("v.agency_report_header_id");
// 鍖婚櫌
@@ -1462,21 +1055,16 @@
// if (!productCategories__c) { error.push("鍏朵粬鍝佺墝浜у搧绫诲埆 涓嶅瓨鍦�"); }
- //let errorMsg = '';
for (var i = 0; i < error.length; i++) {
component.set("v.errorMessage", error[i]);
this.showErrorToast(component);
- //errorMsg += '; ' + error[i]
- //this.error(error[i]);
}
- // if(errorMsg != '')
- // this.error(errorMsg.substring(1));
if (error.length > 0) {
component.find("save_button").set("v.disabled", false);
return false;
}
// 淇濆瓨鍑︾悊
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
if (component.get("v.mode") == "edit") {
var Agency_Report__c = component.get("v.select_report_data").Id;
var action = component.get("c.editAgencyReport");
@@ -1510,7 +1098,6 @@
action.setCallback(this, function (response) {
var state = response.getState();
if (state == "SUCCESS") {
- debugger;
component.set("v.successMessage", "缂栬緫淇濆瓨鎴愬姛");
this.showSuccessToast(component);
var report_id = response.getReturnValue();
@@ -1539,13 +1126,12 @@
component.get("v.select_report_data").Person_In_Charge2__c
);
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else {
- //component.set('v.errorMessage', 'save_report failed.');
- this.error("淇濆瓨鏃ユ姤澶辫触");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "save_report failed.");
+ this.showErrorToast(component);
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -1619,27 +1205,24 @@
var data_list = component.find("modal_data_list_tr");
}
} else {
- // component.set('v.errorMessage', 'get_reports_now failed.');
- this.error("get_reports_now failed.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "get_reports_now failed.");
+ this.showErrorToast(component);
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", 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.loginEdit", false);
- debugger;
- this.doinitSave(component, event, helper);
+ component.set("v.login", false);
+ this.doinit(component, event, helper);
} else {
var error = response.getError();
- //component.set('v.errorMessage', '淇濆瓨鏃ユ姤澶辫触');
- this.error("淇濆瓨鏃ユ姤澶辫触");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "saveAgencyReport failed.");
+ this.showErrorToast(component);
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -1795,17 +1378,15 @@
) {
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);
+ component.set("v.errorMessage", "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);
+ component.set("v.errorMessage", "create_header_input_key failed.");
+ this.showErrorToast(component);
return false;
}
var key2 = s_date.replace(/-/g, "");
@@ -1825,58 +1406,8 @@
component.set("v.login", false);
this.toggle_report(component, event, helper);
} else {
- //component.set('v.errorMessage', 'createReportHeader callback failed.');
- this.error("createReportHeader callback failed.");
- //this.showErrorToast(component);
- component.set("v.login", false);
- }
- });
- $A.enqueueAction(action);
- },
- create_report_header_edit: function (
- component,
- event,
- helper,
- name,
- s_agency,
- s_date
- ) {
- 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.login", 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.login", 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.errorMessage", "createReportHeader callback failed.");
+ this.showErrorToast(component);
component.set("v.login", false);
}
});
@@ -1886,9 +1417,11 @@
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.error("get_date_string in create_header_input_key.");
- //this.showErrorToast(component);
+ component.set(
+ "v.errorMessage",
+ "get_date_string in create_header_input_key."
+ );
+ this.showErrorToast(component);
return false;
}
}
@@ -1980,6 +1513,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;
@@ -2002,9 +1536,9 @@
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_edit(component, event, helper);
+ this.set_doctor_list(component, event, helper);
},
//妯＄硦鏌ヨ浣跨敤浜у搧1(浜у搧鍨嬪彿)
@@ -2048,6 +1582,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;
@@ -2065,9 +1600,8 @@
component.set("v.UseProduct1s", accname);
component.set("v.UseProduct1", accname);
} else {
- //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
- this.error("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�");
+ this.showErrorToast(component);
}
},
//妯＄硦鏌ヨ浣跨敤浜у搧2
@@ -2128,9 +1662,8 @@
component.set("v.UseProduct2s", accname);
component.set("v.UseProduct2", accname);
} else {
- //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
- this.error("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�");
+ this.showErrorToast(component);
}
},
//妯＄硦鏌ヨ浣跨敤浜у搧3
@@ -2191,13 +1724,13 @@
component.set("v.UseProduct3s", accname);
component.set("v.UseProduct3", accname);
} else {
- //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�');
- this.error("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝�");
+ this.showErrorToast(component);
}
},
//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");
@@ -2234,11 +1767,9 @@
component.set("v.AWSsearch", awsmap.searchUrl);
component.set("v.AWStransactionURL", awsmap.transactionURL);
} else {
- // component.set('v.errorMessage', 'AWS url/token error.');
- this.error("AWS url/token error.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "AWS url/token error.");
+ this.showErrorToast(component);
component.set("v.login", false);
- component.set("v.loginEdit", false);
}
});
$A.enqueueAction(action);
@@ -2253,9 +1784,6 @@
helper,
hospitalName
) {
- console.log("newUrl = " + newUrl);
- console.log("payload = " + payload);
- console.log("token = " + token);
fetch(newUrl, {
method: "POST",
body: payload,
@@ -2268,7 +1796,6 @@
return data.json();
})
.then((result) => {
- console.log("result = " + JSON.stringify(result));
if (result.status == "0") {
$A.getCallback(function () {
helper.to_agencycontact(component, result, agencyHospitalid);
@@ -2323,20 +1850,17 @@
this.to_confirm(component, token, confirmUrl, JSON.stringify(data));
} else if (acMap.errormsg != "") {
- // component.set('v.errorMessage', acMap.errormsg);
- this.error(acMap.errormsg);
- //this.showErrorToast(component);
+ component.set("v.errorMessage", acMap.errormsg);
+ this.showErrorToast(component);
component.set("v.login", false);
} else {
- //component.set('v.errorMessage', 'agency contact insert id error.');
- this.error("agency contact insert id error.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "agency contact insert id error.");
+ this.showErrorToast(component);
component.set("v.login", false);
}
} else {
- //component.set('v.errorMessage', 'agency contact insert error.');
- this.error("agency contact insert error.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "agency contact insert error.");
+ this.showErrorToast(component);
component.set("v.login", false);
}
});
@@ -2372,35 +1896,30 @@
$A.util.addClass(modal_newAC, "disp_none");
component.set("v.successMessage", ".鎷滆浜哄凡鍒涘缓銆�");
this.showSuccessToast(component);
- component.set("v.login", false);
- this.set_doctor_list_edit(component);
+ this.set_doctor_list(component);
} else {
- //component.set('v.errorMessage', 'AWS confirm error.');
- this.error("AWS confirm error.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "AWS confirm error.");
+ this.showErrorToast(component);
component.set("v.login", false);
}
})
.catch((error) => {
- // component.set('v.errorMessage', 'AWS confirm error.');
- this.error("AWS confirm error.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "AWS confirm error.");
+ this.showErrorToast(component);
component.set("v.login", false);
});
},
//SWAG-CF58C3 fy end 璋冪敤pi
set_doctor_list: 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);
+ component.set("v.login", true);
this.set_doctor_list2(component);
} else {
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
var action = component.get("c.getDoctorList");
action.setParams({
hospital_id: hospital_id
@@ -2408,6 +1927,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");
@@ -2433,7 +1953,7 @@
}
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(
@@ -2445,7 +1965,6 @@
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) {
@@ -2466,7 +1985,7 @@
component.find("select_doctor").set("v.options", res);
}
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
},
staticResourceAgencyContact.token
);
@@ -2510,7 +2029,7 @@
component.find("select_doctor").set("v.options", res);
}
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
},
staticResourceAgencyContact.token
);
@@ -2521,14 +2040,13 @@
}
}
// component.set('v.default_select_doctor_id', '');
-
+ debugger;
component.set("v.doctor_list", res);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else {
- // component.set('v.errorMessage', 'set_doctor_list failed.');
- this.error("set_doctor_list failed.");
- //this.showErrorToast(component);
- component.set("v.loginEdit", false);
+ component.set("v.errorMessage", "set_doctor_list failed.");
+ this.showErrorToast(component);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -2540,166 +2058,14 @@
component.find("select_doctor").set("v.options", "");
}
}
- component.set("v.loginEdit", false);
}, //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;
@@ -2707,12 +2073,11 @@
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);
@@ -2731,9 +2096,8 @@
(p1bool && p0bool && product_category_id == pcId1) ||
(p2bool && p0bool && product_category_id == pcId2)
) {
- //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
- this.error("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
+ this.showErrorToast(component);
component.find("select_Product1").set("v.value", "");
}
},
@@ -2748,9 +2112,8 @@
(p1bool && p0bool && product_category_id == pcId1) ||
(p2bool && p0bool && product_category_id == pcId2)
) {
- //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
- this.error("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
+ this.showErrorToast(component);
component.set("v.UseProduct2_TEXT", "");
}
},
@@ -2768,9 +2131,8 @@
(p1bool && p0bool && product_category_id == pcId1) ||
(p2bool && p0bool && product_category_id == pcId2)
) {
- //component.set('v.errorMessage', '涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�');
- this.error("涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "涓嶈兘閫夋嫨鍚屾牱鐨勪骇鍝佸尯鍒�");
+ this.showErrorToast(component);
component.find("select_Product3").set("v.value", "");
}
},
@@ -2787,6 +2149,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++) {
@@ -2804,6 +2167,7 @@
},
//寮瑰嚭 鎴愬姛鎻愮ず
showSuccessToast: function (component) {
+ debugger;
$A.util.removeClass(component.find("successDiv"), "slds-hide");
window.setTimeout(
$A.getCallback(function () {
@@ -2814,6 +2178,7 @@
},
//寮瑰嚭 鎴愬姛鎻愮ず
showSuccessToast01: function (component) {
+ debugger;
$A.util.removeClass(component.find("successDiv01"), "slds-hide");
window.setTimeout(
$A.getCallback(function () {
@@ -2824,6 +2189,7 @@
},
//寮瑰嚭 閿欒鎻愮ず
showErrorToast: function (component) {
+ debugger;
$A.util.removeClass(component.find("errorDiv"), "slds-hide");
window.setTimeout(
$A.getCallback(function () {
@@ -2834,6 +2200,7 @@
},
//寮瑰嚭 閿欒鎻愮ず
showErrorToast01: function (component) {
+ debugger;
$A.util.removeClass(component.find("errorDiv01"), "slds-hide");
window.setTimeout(
$A.getCallback(function () {
@@ -2872,7 +2239,7 @@
$A.util.addClass(modal_newAC, "disp_none");
component.set("v.successMessage", ".鎷滆浜哄凡鍒涘缓銆�");
this.showSuccessToast(component);
- this.set_doctor_list_edit(component, event, helper);
+ this.set_doctor_list(component, event, helper);
},
createCancel: function (component, event, helper) {
component.set("v.truthy", false);
@@ -2940,6 +2307,7 @@
component.set("v.TargetFileName", output);
};
reader.onload = function (e) {
+ debugger;
var data = e.target.result;
component.set("v.fileContentData", data);
@@ -2958,15 +2326,9 @@
var content =
'<table class="table slds-table slds-table--bordered slds-table--cell-buffer">';
content += '<thead><tr class="slds-text-title--caps">';
- content += '<th scope="col" style="width:100px">' + "琛屽彿" + "</th>";
+ content += '<th scope="col">' + "琛屽彿" + "</th>";
for (i = 0; i < headers.length; i++) {
- if (headers[i] == "浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺") {
- content +=
- '<th scope="col" style="width:250px">' + headers[i] + "</th>";
- } else {
- content +=
- '<th scope="col" style="width:200px">' + headers[i] + "</th>";
- }
+ content += '<th scope="col">' + headers[i] + "</th>";
}
content += "</tr></thead>";
for (var i = 1; i < allTextLines.length; i++) {
@@ -3004,9 +2366,8 @@
var result = response.getReturnValue();
if (callback) callback(result);
} else {
- //component.set('v.errorMessage', 'AWS url/token error.');
- this.error("AWS url/token error.");
- //this.showErrorToast01(component);
+ component.set("v.errorMessage", "AWS url/token error.");
+ this.showErrorToast01(component);
component.set("v.login", false);
}
});
@@ -3032,15 +2393,13 @@
})
.catch((error) => {
console.log("AWS search error = " + JSON.stringify(error));
- // component.set('v.errorMessage', 'AWS search error.');
- this.error("AWS search error.");
- //this.showErrorToast01(component);
+ component.set("v.errorMessage", "AWS search error.");
+ this.showErrorToast01(component);
component.set("v.login", false);
});
},
saveRecords: function (component, event, helper) {
- //component.set('v.login', true);
- component.set("v.modal_import_spinner", true);
+ component.set("v.login", true);
//fy 瀵煎叆 202200506 start
var action1 = component.get("c.processDataAWSId");
action1.setParams({
@@ -3049,12 +2408,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) => {
@@ -3064,7 +2424,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);
@@ -3074,19 +2434,14 @@
(result) => {
var token = result.token;
var searchUrl = result.searchUrl;
- console.log("token = " + token);
- console.log("searchUrl = " + searchUrl);
- console.log("payload = " + payload);
this.search_core(
token,
searchUrl,
payload,
(result) => {
- console.log("result = " + JSON.stringify(result));
if (result.status == "0") {
if (result.object != null && result.object.length != 0) {
- //component.set('v.login', true);
- component.set("v.modal_import_spinner", true);
+ component.set("v.login", true);
this.saveRecordsEditFile(
component,
dataMap,
@@ -3094,18 +2449,17 @@
helper
);
} else {
- //component.set('v.errorMessage', 'AWS 鏌ヨ鏁版嵁涓虹┖ ');
- this.error("AWS 鏌ヨ鏁版嵁涓虹┖ ");
- //this.showErrorToast01(component);
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set("v.errorMessage", "AWS search status ");
+ this.showErrorToast01(component);
+ component.set("v.login", false);
}
} else {
- //component.set('v.errorMessage', 'AWS search status : ' + result.status);
- this.error("AWS search status : " + result.status);
- //this.showErrorToast01(component);
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set(
+ "v.errorMessage",
+ "AWS search status : " + result.status
+ );
+ this.showErrorToast01(component);
+ component.set("v.login", false);
}
},
component
@@ -3113,11 +2467,12 @@
}
);
} else {
- //component.set('v.errorMessage', valur[1] + '\n' + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- this.error(valur[1] + "\n" + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- //this.showErrorToast01(component);
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set(
+ "v.errorMessage",
+ valur[1] + "\n" + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶"
+ );
+ this.showErrorToast01(component);
+ component.set("v.login", false);
}
}
}
@@ -3176,10 +2531,8 @@
saveRecordsEditFile: function (component, dataMap, searchData, helper) {
var searchDataMap = new Map();
for (var i = 0; i < searchData.length; i++) {
- if (searchData[i].name != null) {
- var sd = searchData[i];
- searchDataMap.set(sd.name.replace(" ", ""), sd.dataId);
- }
+ var sd = searchData[i];
+ searchDataMap.set(sd.name.replace(" ", ""), sd.dataId);
}
console.log("searchDataMap=" + searchDataMap);
var error = "";
@@ -3207,6 +2560,7 @@
var nameDataId = searchDataMap.get(fileName.replace(" ", ""));
if (dataMap.get(nameDataId)) {
filelist[5] = dataMap.get(nameDataId); //zhj 鏂版柟妗堟敼閫� filelist[5]涓嶅啀瀛樼殑nameEncrpt 2022-12-21
+ console.log("filelist[5] = " + filelist[5]);
} else {
error += "error1 绗�" + i + "琛屾暟鎹嫓璁夸汉SF涓嶅瓨鍦�";
}
@@ -3249,116 +2603,16 @@
}
if (error != "") {
- console.log("zhj error = " + error);
- let errorArray = error.split("error1");
- let errorDatas = [];
- let errorDataRow = [];
-
- var fileContentData = component.get("v.fileContentData").split("\n");
- console.log("fileContentData = " + JSON.stringify(fileContentData));
- console.log("errorArray = " + JSON.stringify(errorArray));
- for (var i in errorArray) {
- // if (errorArray[i] != '') {
- // let errorData = {}
- // errorData.errorRow = errorArray[i].trim().substring(1, 2);
- // errorData.errorInfo = errorArray[i].trim().substring(5);
- // errorDatas.push(errorData);
- // }
- if (errorArray[i] != "") {
- let errorData = {};
- let index = errorDataRow.indexOf(
- errorArray[i].trim().substring(1, 2)
- );
- if (index == -1) {
- errorData.errorRow = errorArray[i].trim().substring(1, 2);
- errorDataRow.push(errorData.errorRow);
- errorData.errorInfo = errorArray[i].trim().substring(5);
- if (errorData.errorInfo == "鎷滆浜篈WS涓嶅瓨鍦�") {
- errorData.errorInfo =
- "鎷滆浜� " +
- fileContentData[errorData.errorRow].split(",")[5] +
- "涓嶅瓨鍦�";
- }
- errorDatas.push(errorData);
- } else {
- if (errorArray[i].trim().substring(5) == "鎷滆浜篈WS涓嶅瓨鍦�") {
- errorData[index].errorInfo =
- "; " +
- "鎷滆浜� " +
- fileContentData[errorDatas[index].errorRow].split(",")[5] +
- "涓嶅瓨鍦�";
- } else {
- errorDatas[index].errorInfo +=
- "; " + errorArray[i].trim().substring(5);
- }
- }
- }
- }
-
- var fileContentData = component.get("v.fileContentData").split("\n");
- console.log("fileContentData = " + JSON.stringify(fileContentData));
- let errorColumns = [
- {
- label: "閿欒琛�",
- fieldName: "errorRow",
- type: "text",
- hideDefaultActions: true,
- initialWidth: 100
- },
- {
- label: "閿欒淇℃伅",
- fieldName: "errorInfo",
- type: "text",
- hideDefaultActions: true,
- initialWidth: 300,
- wrapText: true
- }
- ];
- for (var i = 0; i < fileContentData[0].split(",").length - 1; i++) {
- let initialWidth = 180;
- if (
- fileContentData[0].split(",")[i] == "浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺" ||
- fileContentData[0].split(",")[i] == "浣跨敤浜у搧1(浜у搧鍨嬪彿)"
- ) {
- initialWidth = 250;
- }
- errorColumns.push({
- label: fileContentData[0].split(",")[i],
- fieldName: "field" + i,
- type: "text",
- hideDefaultActions: true,
- wrapText: true,
- initialWidth: initialWidth
- });
- }
-
- for (var i = 0; i < errorDatas.length; i++) {
- let data = fileContentData[errorDatas[i].errorRow];
- console.log("data = " + JSON.stringify(data));
- if (data) {
- for (var j = 0; j < data.split(",").length; j++) {
- let label = "field" + j;
- errorDatas[i][label] = data.split(",")[j];
- }
- }
- }
- console.log("errorDatas =" + JSON.stringify(errorDatas));
- component.set("v.errorColumns", errorColumns);
- component.set("v.errorData", errorDatas);
- component.set("v.showErrorInfo", true);
-
- console.log("error = " + error);
- //component.set('v.errorMessage', error);
- this.error(error);
- //this.showErrorToast01(component);
+ component.set("v.errorMessage", error);
+ this.showErrorToast01(component);
console.log("error=" + error);
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set("v.login", false);
return;
}
console.log("fileStr=" + fileStr);
$A.getCallback(function () {
+ debugger;
helper.ImportMethod(component, fileStr, helper);
})();
},
@@ -3379,124 +2633,32 @@
if (res != "success") {
var ress = res.split("=");
console.log(ress);
- let errorDatas = [];
- let errorDataRow = [];
- var fileContentData = component.get("v.fileContentData").split("\n");
- console.log(
- "fileContentData[1].split(,)[5] = " +
- fileContentData[1].split(",")[5]
- );
-
for (var i = 0; i < ress.length; i++) {
res1 += ress[i].substr(7) + "\n";
- if (ress[i] != "") {
- let errorData = {};
- let index = errorDataRow.indexOf(
- ress[i].substr(7).substring(1, 2)
- );
- if (index == -1) {
- errorData.errorRow = ress[i].substr(7).substring(1, 2);
- errorDataRow.push(errorData.errorRow);
- errorData.errorInfo = ress[i].substr(7).substring(5);
- if (errorData.errorInfo == "鎷滆浜轰笉瀛樺湪") {
- console.log("errorData.errorRow = " + errorData.errorRow);
- errorData.errorInfo =
- "鎷滆浜� " +
- fileContentData[errorData.errorRow].split(",")[5] +
- "涓嶅瓨鍦�";
- }
- errorDatas.push(errorData);
- } else {
- if (ress[i].substr(7).substring(5) == "鎷滆浜轰笉瀛樺湪") {
- errorDatas[index].errorInfo +=
- "; " +
- "鎷滆浜� " +
- fileContentData[errorDatas[index].errorRow].split(",")[5] +
- "涓嶅瓨鍦�";
- } 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
- }
- ];
- for (var i = 0; i < fileContentData[0].split(",").length - 1; i++) {
- let initialWidth = 180;
- if (
- fileContentData[0].split(",")[i] == "浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺" ||
- fileContentData[0].split(",")[i] == "浣跨敤浜у搧1(浜у搧鍨嬪彿)"
- ) {
- initialWidth = 250;
- }
- errorColumns.push({
- label: fileContentData[0].split(",")[i],
- fieldName: "field" + i,
- type: "text",
- hideDefaultActions: true,
- wrapText: true,
- initialWidth: initialWidth
- });
- }
-
- for (var i = 0; i < errorDatas.length; i++) {
- let data = fileContentData[errorDatas[i].errorRow];
- console.log("data = " + JSON.stringify(data));
- for (var j = 0; j < data.split(",").length; j++) {
- let label = "field" + j;
- errorDatas[i][label] = data.split(",")[j];
- }
- }
- component.set("v.errorColumns", errorColumns);
- component.set("v.errorData", errorDatas);
- component.set("v.showErrorInfo", true);
-
console.log("==" + res1);
- //component.set('v.errorMessage', res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- this.error(res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- //this.showErrorToast01(component);
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set("v.errorMessage", res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+ this.showErrorToast01(component);
+ component.set("v.login", false);
} else {
component.set("v.successMessage", "瀵煎叆鎴愬姛");
this.showSuccessToast01(component);
component.set("v.showMain", true);
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set("v.login", false);
this.doinit(component, event, helper);
}
} else if (state === "INCOMPLETE") {
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set("v.login", false);
} else if (state === "ERROR") {
var errors = response.getError();
if (errors) {
if (errors[0] && errors[0].message) {
console.log("Error message: " + errors[0].message);
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set("v.login", false);
}
} else {
console.log("Unknown error");
- //component.set('v.login', false);
- component.set("v.modal_import_spinner", false);
+ component.set("v.login", false);
}
}
});
@@ -3861,9 +3023,8 @@
component.set("v.doctor_list", res);
component.set("v.login", false);
} else {
- //component.set('v.errorMessage', 'newlyBuild failed.');
- this.error("newlyBuild failed.");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "newlyBuild failed.");
+ this.showErrorToast(component);
component.set("v.login", false);
}
});
@@ -3878,14 +3039,18 @@
if (sc.replace(/\D/gi, "")) {
component.set("v.select_ConsumptionOfConsumables", sc);
} else {
- //component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
- this.error("浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!");
- //this.showErrorToast(component);
+ component.set(
+ "v.errorMessage",
+ "浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!"
+ );
+ this.showErrorToast(component);
}
} else {
- //component.set('v.errorMessage', '浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
- this.error("浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!");
- //this.showErrorToast(component);
+ component.set(
+ "v.errorMessage",
+ "浜у搧1鍚岀被鑰楁潗绉戝鏈堜娇鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!"
+ );
+ this.showErrorToast(component);
}
}
},
@@ -3897,19 +3062,18 @@
if (sc.replace(/\D/gi, "")) {
component.set("v.select_warlocksNumber", sc);
} else {
- //component.set('v.errorMessage', '浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!');
- this.error("浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "浜у搧鐢ㄩ噺蹇呴』杈撳叆鏁板瓧!");
+ this.showErrorToast(component);
}
} else {
- //component.set('v.errorMessage', '浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!');
- this.error("浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!");
- //this.showErrorToast(component);
+ component.set("v.errorMessage", "浜у搧鐢ㄩ噺鏈�澶氳緭鍏�14浣嶆暟瀛�!");
+ this.showErrorToast(component);
}
}
},
//宸ヤ綔浼氳褰�
selectPurposeType: function (component, event, helper) {
+ debugger;
var doctor_value = component.find("select_purpose_type").get("v.value");
// alert(doctor_value);
if (doctor_value != "绉戝浼�") {
@@ -3918,7 +3082,7 @@
component.find("new_con").set("v.disabled", true);
}
if (doctor_value != "") {
- this.set_doctor_list_edit(component);
+ this.set_doctor_list(component);
var action = component.get("c.selectPurposeTypes");
action.setParams({
doctor_value: doctor_value
@@ -3939,6 +3103,7 @@
},
selectProductClassification: function (component, event, helper) {
+ debugger;
var select_ProductClassification = component
.find("select_ProductClassification")
.get("v.value");
@@ -3966,7 +3131,7 @@
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");
@@ -4014,6 +3179,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");
@@ -4035,86 +3201,6 @@
}
$A.enqueueAction(action);
- },
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
-
- //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 start
- exportErrorInfoHelper: function (component) {
- var errorData = component.get("v.errorData");
- var errorColumns = component.get("v.errorColumns");
-
- var datas = [];
- let errorColumnsArray = [];
- for (var i in errorColumns) {
- errorColumnsArray.push(errorColumns[i].label);
- }
- datas.push(errorColumnsArray);
- //datas.push(errorColumns);
-
- for (var i in errorData) {
- let data = [];
- data.push(errorData[i].errorRow);
- data.push(errorData[i].errorInfo);
- for (var j = 0; j < Object.keys(errorData[i]).length - 2; j++) {
- data.push(errorData[i]["field" + j]);
- }
- datas.push(data);
- }
-
- console.log("datas = " + JSON.stringify(datas));
- var csv = this.convertToCSV(component, datas);
- console.log("csv = " + JSON.stringify(csv));
- this.downloadCSV(component, csv);
- },
-
- convertToCSV: function (component, data) {
- console.log("enter convertToCSV");
- console.log("data = " + data);
- var csv = "";
- for (var i = 0; i < data.length; i++) {
- var row = data[i];
- console.log("row = " + JSON.stringify(row));
- for (var j = 0; j < row.length; j++) {
- var val = "";
- val = row[j] === null ? "" : row[j].toString();
- console.log("val = " + val);
- if (
- val.indexOf(",") !== -1 ||
- val.indexOf('"') !== -1 ||
- val.indexOf("\n") !== -1
- ) {
- //val = '"' + val.replace(/"/g,'""') + '"';
- }
- if (j > 0) {
- csv += ",";
- }
- csv += val;
- }
- csv += "\n";
- }
- return csv;
- },
-
- downloadCSV: function (component, csv) {
- var link = document.createElement("a");
- var bom = "\uFEFF";
- link.href = "data:text/csv;charset=utf-8," + encodeURIComponent(bom + csv);
- link.download = "data.csv";
- document.body.appendChild(link);
- link.click();
- document.body.removeChild(link);
- },
- error: function (message) {
- // $('toastMessage.forceToastManager').css('white-space', 'pre-wrap');
- var toastEvent = $A.get("e.force:showToast");
-
- toastEvent.setParams({
- title: "閿欒!",
- message: message,
- type: "error"
- //"duration" : "sticky"
- });
- toastEvent.fire();
}
- //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 end
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
});
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index 831f94a..2eef9b1 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -36,7 +36,6 @@
<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="loadOpp" type="Boolean" default="false" />
<aura:attribute name="reportPageData" type="Map" />
<aura:attribute name="selectbody" type="String" />
@@ -122,35 +121,22 @@
<aura:attribute name="contactawsurl" type="Map" />
<aura:attribute name="allselectlistAgencyPerson" type="Map" />
<!-- PIPL update Yin Mingjie 21/02/2022 end -->
-
- <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
- <aura:attribute name="errorData" type="Object" />
- <aura:attribute name="errorColumns" type="List" />
- <!-- show Error information -->
- <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
- <!-- end DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
-
<!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
<ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
<ltng:require scripts="{! $Resource.jquery183minjs }" />
<!--銉兗銉変腑...-->
<aura:renderIf isTrue="{!v.login}">
- <aura:renderIf isTrue="{!!v.loginEdit}">
- <!-- add by Deloitte-Link 2023-6-19 -->
- <div class="weeklyReportSpinner">
- <div class="slds-spinner_container">
- <div
- class="slds-spinner--brand slds-spinner slds-spinner--medium"
- role="alert"
- >
- <span id="aa" class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></div>
- </div>
- </div>
+ <div class="slds-spinner_container height100vh">
+ <div
+ class="slds-spinner--brand slds-spinner slds-spinner--medium"
+ role="alert"
+ >
+ <span id="aa" class="slds-assistive-text">Loading</span>
+ <div class="slds-spinner__dot-a"></div>
+ <div class="slds-spinner__dot-b"></div>
</div>
- </aura:renderIf>
+ </div>
</aura:renderIf>
<div aura:id="report" id="report" class="contents_wrapper">
@@ -186,7 +172,7 @@
/>
</div>
<div
- class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
+ class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
<ui:button
aura:id="new_button"
@@ -196,7 +182,7 @@
/>
</div>
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
<ui:button
aura:id="copy_button"
@@ -227,60 +213,34 @@
>
<thead>
<tr class="slds-line-height--reset">
- <th
- class="table_header slds-text-title--caps"
- style="width: 250px; font-size: 13px"
- >
- <span class="slds-truncate" title="Name">鍛ㄦ姤缂栧彿</span>
- </th>
- <th
- class="table_header slds-text-title--caps"
- style="width: 100px; font-size: 13px"
- >
+ <th class="table_header slds-text-title--caps"></th>
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.Person_In_Charge2__c}</span
>
</th>
- <th
- class="table_header slds-text-title--caps"
- style="width: 250px; font-size: 13px"
- >
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name">鍖婚櫌</span>
</th>
- <th
- class="table_header slds-text-title--caps"
- style="width: 100px; font-size: 13px"
- >
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.Department_Cateogy__c}</span
>
</th>
- <th
- class="table_header slds-text-title--caps"
- style="width: 100px; font-size: 13px"
- >
+ <th class="table_header slds-text-title--caps">
<!-- PIPL update Yin Mingjie 21/02/2022 start
<span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__r}</span>
PIPL update Yin Mingjie 21/02/2022 end-->
- <span
- class="slds-truncate"
- title="Name"
- style="width: 100px; font-size: 13px"
+ <span class="slds-truncate" title="Name"
>{!v.fieldsmap.Agency_Contact__c}</span
>
</th>
- <th
- class="table_header slds-text-title--caps"
- style="width: 100px; font-size: 13px"
- >
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.visitor_title__c}</span
>
</th>
- <th
- class="table_header slds-text-title--caps"
- style="width: 100px; font-size: 13px"
- >
+ <th class="table_header slds-text-title--caps">
<span class="slds-truncate" title="Name"
>{!v.fieldsmap.Purpose_Type__c}</span
>
@@ -378,13 +338,6 @@
aria-labelledby="headerTarget"
>
<div class="slds-modal__container">
- <aura:renderIf isTrue="{!v.loginEdit}">
- <lightning:spinner
- alternativeText="Loading"
- size="medium"
- style="width: 100%; height: 80%; top: 50px"
- />
- </aura:renderIf>
<div class="slds-modal__header">
<h4 id="headerTarget" class="slds-float--left"></h4>
<h2 id="headerTarget" class="slds-text-heading--medium">
@@ -429,27 +382,6 @@
onclick="{!c.cancel}"
/>
</div>
- <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
- <aura:if isTrue="{!v.showErrorInfo}">
- <div class="slds-p-around--large slds-align--absolute-center">
- <lightning:button
- label="瀵煎嚭閿欒淇℃伅"
- variant="brand"
- onclick="{!c.exportErrorInfo}"
- />
- </div>
- <div class="slds-p-around--large slds-align--absolute-center">
- <div style="height: 300px; overflow-x: scroll">
- <lightning:datatable
- keyField="id"
- data="{! v.errorData }"
- columns="{! v.errorColumns }"
- hideCheckboxColumn="true"
- />
- </div>
- </div>
- </aura:if>
- <!-- start DTT-zhj 澧炲姞閿欒淇℃伅table 2023-05-16-->
</aura:set>
</aura:if>
</div>
@@ -572,15 +504,8 @@
aria-labelledby="headerTarget"
>
<div class="slds-modal__container">
- <aura:renderIf isTrue="{!v.loginEdit}">
- <lightning:spinner
- alternativeText="Loading"
- size="medium"
- style="width: 100%; height: 80%; top: 50px"
- />
- </aura:renderIf>
<div class="slds-modal__header">
- <h4 id="headerTarget" class="slds-float--left"></h4>
+ <h4 id="headerTarget" class="slds-float--left">{!v.dialog_type}</h4>
<h2 id="headerTarget" class="slds-text-heading--medium">
鍛ㄦ姤({!v.selected_date} {!v.selected_agency_person})
</h2>
@@ -595,31 +520,26 @@
<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 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
娲诲姩鏃�
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
- <!-- <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/> -->
- <lightning:input
- type="date"
+ <force:inputField
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 marginTop"
+ 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"
>
- <!-- <ui:inputText aura:id="hospital_input_text" label="鍖婚櫌" class="field" value="{!v.hospital}" updateOn="keyup"/> -->
- 鍖婚櫌
- <lightning:input
+ <ui:inputText
aura:id="hospital_input_text"
+ label="鍖婚櫌"
class="field"
value="{!v.hospital}"
- variant="label-hidden"
updateOn="keyup"
/>
<div class="slds-lookup__menu" id="lookup-66">
@@ -650,7 +570,7 @@
<!-- 绉戝鍒嗙被 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
>
{!v.fieldsmap.Department_Cateogy__c}
<ui:inputSelect
@@ -662,7 +582,7 @@
<!-- 鍏堢敓 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
>
{!v.fieldsmap.doctor2__c}
<ui:inputSelect
@@ -673,7 +593,7 @@
</div>
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12"
>
<br />
<ui:button
@@ -687,14 +607,14 @@
<!-- 鑱屼綅 -->
<div
- class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
>
{!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 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
{!v.fieldsmap.Purpose_Type__c}
<ui:inputSelect
@@ -706,7 +626,7 @@
<!-- 璇环 -->
<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"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12"
>
{!v.fieldsmap.Opportunity__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -732,11 +652,11 @@
</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 marginTop"
+ class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12"
></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 marginTop"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
{!v.fieldsmap.StageName__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -745,7 +665,7 @@
</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 marginTop"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
{!v.fieldsmap.Amount__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -753,7 +673,7 @@
</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 marginTop"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
{!v.fieldsmap.OCMSale_Price__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -764,7 +684,7 @@
</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 marginTop"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
>
{!v.fieldsmap.Close_Forecasted_Date__c}
<!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
@@ -776,7 +696,7 @@
<!-- 瑁藉搧鍒嗛 -->
<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"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
>
{!v.fieldsmap.Product_Category1__c}
<!-- <force:inputField value="{!v.data.Product_Category1__c}" aura:id="input-product-category1"/> -->
@@ -788,7 +708,7 @@
</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 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
>
{!v.fieldsmap.Product_Category2__c}
<!-- <force:inputField value="{!v.data.Product_Category2__c}" aura:id="input-product-category2"/> -->
@@ -800,7 +720,7 @@
</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 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
>
{!v.fieldsmap.Product_Category3__c}
<!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
@@ -813,7 +733,7 @@
<!--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 marginTop"
+ class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
>
{!v.fieldsmap.SupportNeeds__c}
<ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
@@ -821,7 +741,7 @@
<!--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 marginTop"
+ class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
>
{!v.fieldsmap.Result__c}
<ui:inputSelect aura:id="select_result" class="slds-select" />
@@ -1004,13 +924,6 @@
class="disp_none slds-modal slds-fade-in-open"
>
<div class="slds-modal__container">
- <aura:renderIf isTrue="{!v.loginEdit}">
- <lightning:spinner
- alternativeText="Loading"
- size="medium"
- style="width: 100%; height: 80%; top: 50px"
- />
- </aura:renderIf>
<div class="slds-modal__header">
<h2 id="headertest" class="slds-text-heading--medium">鏂板缓.瀹㈡埛浜哄憳</h2>
</div>
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
index 8b2291b..642ebdb 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.css
@@ -4,10 +4,9 @@
.THIS.height100vh {
height: 100vh;
}
-/* .THIS.contents_wrapper {
- padding-top: 50px;
- width: 105%;
-} */
+.THIS.contents_wrapper {
+ padding-top: 50px;
+}
.THIS .mt5 {
margin-top: 5px;
}
@@ -24,7 +23,7 @@
margin: 0.5em 0;
}
.THIS.report_list_area {
- margin: 40px 0 20px 0px;
+ margin: 40px 0 20px 100px;
height: 60vh;
overflow-y: scroll;
}
@@ -141,30 +140,3 @@
.THIS tr:hover .encrypt {
display: none;
}
-
-/* add by Deloitte-Link 2023-6-19 start*/
-.THIS .weeklyReportSpinner {
- top: 100px;
-}
-
-.THIS .weeklyReportSpinnerEdit {
- top: 50px;
-}
-
-.THIS .slds-spinner_container {
- position: absolute;
- top: 100px;
-}
-
-.THIS .slds-spinner_containerEdit {
- position: absolute;
- top: 50px;
-}
-
-.THIS .marginTop {
- margin-top: 10px;
-}
-.THIS .custom-input .uiInput {
- height: 2rem;
-}
-/* add by Deloitte-Link 2023-6-19 end*/
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
index 02ef7bc..010e828 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
@@ -1,12 +1,11 @@
({
doInit: function (component, event, helper) {
- console.log("zhj 鏂版柟妗坵eeklyReport");
+ console.log("zhj 鏂版柟妗�");
if (window.location.href.endsWith("weekly-report")) {
helper.doinit(component, event, helper);
} else {
helper.hideCmp(component, event, helper);
}
- component.set("v.showErrorInfo", false);
},
createAopp: function (component, event, helper) {
@@ -16,12 +15,10 @@
recordTypeId: "012100000006KW7"
});
addRecordEvent.fire();
- component.set("v.showErrorInfo", false);
},
new_report: function (component, event, helper) {
component.find("save_button").set("v.label", "淇濆瓨骞舵柊寤�");
- component.set("v.data.Report_Date__c", "");
helper.new_report(component, event, helper);
},
@@ -144,7 +141,7 @@
var token = component.get("v.AWStoken");
var newUrl = component.get("v.AWSinsert") + "V2";
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
helper.insert_agencycontact(
component,
token,
@@ -285,12 +282,10 @@
// var fileInput = component.find("file").getElement();
// var file = fileInput.files[0];
helper.readFile(component, helper, files[0]);
- component.set("v.showErrorInfo", false);
},
processFileContent: function (component, event, helper) {
helper.saveRecords(component, event, helper);
- component.set("v.showErrorInfo", false);
},
cancel: function (component, event, helper) {
@@ -347,8 +342,5 @@
close_export: function (component, event, helper) {
component.set("v.showMain", true);
helper.close_export(component);
- },
- exportErrorInfo: function (component, event, helper) {
- helper.exportErrorInfoHelper(component);
}
});
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index b31c0f9..a656549 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -96,11 +96,11 @@
if (result.object != null) {
this.to_contact_list(result, contactData, component);
} else {
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
} else {
this.error("AWS search status1 : " + result.status);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
},
component
@@ -127,7 +127,7 @@
}
component.find("select_agency_person").set("v.options", res);
component.set("v.allselectlistAgencyPerson", res);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
},
search_contact_url: function (component, sobject, callback) {
@@ -142,7 +142,7 @@
if (callback) callback(result);
} else {
this.error("AWS url/token error.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -339,152 +339,6 @@
});
$A.enqueueAction(action);
},
- get_reports_edit: function (component, event, helper, date_str, person_str) {
- if (!date_str) {
- return false;
- }
-
- date_str = this.get_date_string(date_str);
-
- var action = component.get("c.getReports");
- action.setParams({
- date_str: date_str,
- person_str: person_str
- });
-
- component.set("v.loginEdit", true);
- action.setCallback(this, function (response) {
- var state = response.getState();
- if (state == "SUCCESS") {
- var res = response.getReturnValue();
- component.set("v.reports", res.reports);
-
- // 20220222 PI鏀归�� by Bright--start
- let dataIds = [];
- let dataIds1 = [];
- let mm = {};
- let b = false;
- let b1 = false;
- for (const rep of res.reports) {
- if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c) {
- dataIds.push(rep.doctor2__r.AWS_Data_Id__c);
- }
-
- if (
- rep.Person_In_Charge2__r &&
- rep.Person_In_Charge2__r.AWS_Data_Id__c
- ) {
- dataIds1.push(rep.Person_In_Charge2__r.AWS_Data_Id__c);
- }
- }
- let Foo = null;
- Foo = function () {
- if (b && b1) {
- for (const rep of res.reports) {
- if (
- rep.doctor2__r &&
- rep.doctor2__r.AWS_Data_Id__c &&
- mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)
- ) {
- rep.doctor2__r.awsdata = mm[rep.doctor2__r.AWS_Data_Id__c];
- }
- if (
- rep.Person_In_Charge2__r &&
- rep.Person_In_Charge2__r.AWS_Data_Id__c &&
- mm.hasOwnProperty(rep.Person_In_Charge2__r.AWS_Data_Id__c)
- ) {
- rep.Person_In_Charge2__r.awsdata =
- mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
- }
- }
-
- $A.getCallback(() => component.set("v.reports", res.reports))();
- } else {
- console.log("b=" + b + ",b1=" + b1 + ",continue");
- setTimeout(Foo, 100);
- }
- };
-
- if (dataIds.length > 0) {
- let awsurl = component.get("v.awsurl");
- helper.search_core(
- awsurl.token,
- awsurl.searchUrl,
- JSON.stringify({
- dataIds: dataIds
- }),
- (result) => {
- if (result.status == "0") {
- for (const m of result.object) {
- mm[m.dataId] = m;
- }
- b = true;
- Foo();
- } else {
- //this.error('AWS search status2 : ' + result.status);
- this.success("璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�");
- }
- },
- component
- );
- } else {
- b = true;
- }
-
- if (dataIds1.length > 0) {
- let contactawsurl = component.get("v.contactawsurl");
- helper.search_core(
- contactawsurl.token,
- contactawsurl.searchUrl,
- JSON.stringify({
- dataIds: dataIds1
- }),
- (result) => {
- if (result.status == "0") {
- for (const m of result.object) {
- mm[m.dataId] = m;
- }
- b1 = true;
- Foo();
- } else {
- this.error("AWS search status3 : " + result.status);
- }
- },
- component
- );
- } else {
- b1 = true;
- }
- // 20220222 PI鏀归�� by Bright--end
-
- component.set("v.report_count", res.reports.length);
-
- // 鏇存柊淇濆瓨寰屻伄select_data鐢�
- var report_id = component.get("v.update_select_report_data_id");
-
- if (report_id != "") {
- for (i = 0; i < res.reports.length; i++) {
- if (res.reports[i]["Id"] == report_id) {
- component.set("v.select_report_data", res.reports[i]);
- break;
- }
- }
- component.set("v.update_select_report_data_id", "");
- }
-
- if (res.reports.length > 0) {
- component.set("v.list_message", "");
- } else {
- component.set("v.list_message", "no_data");
- }
- component.set("v.loginEdit", false);
- } else {
- this.error("get_reports failed.");
- component.set("v.loginEdit", false);
- }
- });
- $A.enqueueAction(action);
- },
select_date_change: function (component, event, helper) {
this.get_reports(
@@ -550,7 +404,7 @@
// 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"
@@ -699,16 +553,12 @@
}
if (reportDate != null) {
- console.log("reportDate = " + reportDate);
component.set("v.data.Report_Date__c", reportDate);
}
component.set("v.edit_copy_select_report_id", "");
}
}
- setTimeout(function () {
- component.set("v.loginEdit", false);
- }, 1000);
} else {
// CLOSE
@@ -934,7 +784,6 @@
},
edit_button: function (component, event, helper) {
- component.set("v.login", true);
this.allclear(component);
component.set("v.loadOpp", true);
var index = event.getSource().get("v.value");
@@ -1137,7 +986,7 @@
}
// 淇濆瓨鍑︾悊
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
if (component.get("v.mode") == "edit") {
var Agency_Report__c = component.get("v.select_report_data").Id;
var action = component.get("c.editAgencyReport");
@@ -1191,7 +1040,7 @@
.set("v.options", select_agency_list);
component.set("v.update_select_report_data_id", report_id);
- this.get_reports_edit(
+ this.get_reports(
component,
event,
helper,
@@ -1200,7 +1049,7 @@
);
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else {
// var error = response.getError();
// alert(JSON.stringify(error));
@@ -1213,7 +1062,7 @@
// }
this.error("save_report failed.");
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -1253,7 +1102,7 @@
var report_id = response.getReturnValue();
component.set("v.create_agency_report_id", report_id);
- this.get_reports_edit(
+ this.get_reports(
component,
event,
helper,
@@ -1297,20 +1146,20 @@
} else {
this.error("get_reports_now failed.");
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action2);
this.allclear(component);
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else {
var error = response.getError();
// alert(JSON.stringify(error));
this.error("saveAgencyReport failed.");
component.find("save_button").set("v.disabled", false);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -1352,7 +1201,6 @@
component.find("select_Product1").set("v.value", "");
component.find("select_Product2").set("v.value", "");
component.find("select_Product3").set("v.value", "");
- console.log("reportDate = 绌�");
component.set("v.data.Report_Date__c", "");
component.set("v.oppdata.Close_Forecasted_Date__c", "");
component.set("v.oppdata.Amount__c", "");
@@ -1676,7 +1524,7 @@
component.set("v.AWStransactionURL", awsmap.transactionURL);
} else {
this.error("AWS url/token error.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -1722,7 +1570,7 @@
})();
} else {
console.log("AWS status error:" + result);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
if (result.status == "129") {
component
.find("OppMessage")
@@ -1736,7 +1584,7 @@
})
.catch((error) => {
console.log("AWS insert error:" + error);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
component.find("OppMessage").setError("AWS insert error.");
});
},
@@ -1771,14 +1619,14 @@
this.to_confirm(component, token, confirmUrl, JSON.stringify(data));
} else if (acMap.errormsg != "") {
this.error(acMap.errormsg);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else {
this.error("agency contact insert id error.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
} else {
this.error("agency contact insert error.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -1809,12 +1657,12 @@
this.set_doctor_list(component);
} else {
this.error("AWS confirm error.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
})
.catch((error) => {
this.error("AWS confirm error.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
});
},
// PIPL update Yin Mingjie 21/02/2022 end
@@ -1822,7 +1670,7 @@
set_doctor_list: function (component) {
var hospital_id = component.get("v.hospitalLinkId");
if (hospital_id) {
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
var action = component.get("c.getDoctorList");
action.setParams({
hospital_id: hospital_id
@@ -1862,7 +1710,7 @@
// PIPL update Yin Mingjie 21/02/2022 end
} else {
this.error("set_doctor_list failed.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -1882,7 +1730,7 @@
dataArr.push(key);
}
if (dataArr.length == 0) {
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
this.warning("娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�");
return;
}
@@ -1908,7 +1756,7 @@
this.to_doctor_list(result, retMap, component);
} else {
this.error("AWS search status4 : " + result.status);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
},
component
@@ -1945,13 +1793,13 @@
return data.json();
})
.then((result) => {
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
if (callback) callback(result);
})
.catch((error) => {
console.log("error = " + JSON.stringify(error));
this.error("AWS search error.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
});
},
@@ -1996,7 +1844,7 @@
component.set("v.default_select_doctor_id", "");
component.set("v.doctor_list", res);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
},
// PIPL update Yin Mingjie 21/02/2022 end
@@ -2083,7 +1931,7 @@
agency_hospital_link_id: component.get("v.hospitalLinkId")
});
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
action.setCallback(this, function (response) {
var state = response.getState();
if (state == "SUCCESS") {
@@ -2120,7 +1968,7 @@
// } else {
// component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
// }
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
return false;
}
//SWAG-CKH5M8 銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy start
@@ -2181,10 +2029,10 @@
);
}
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else {
this.error("selectOpportunityByIdAndHospitalLinkId failed.");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -2477,14 +2325,12 @@
},
saveRecords: function (component, event, helper) {
- debugger;
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
//fy 瀵煎叆 20220424 start
var action1 = component.get("c.processDataAWSId");
action1.setParams({
fileData: component.get("v.fileContentData")
});
- debugger;
action1.setCallback(this, function (response) {
console.log("response = " + JSON.stringify(response));
var state = response.getState();
@@ -2505,11 +2351,10 @@
dataMap.set(item.AWS_Data_Id__c, item.AWS_Data_Id__c); //zhj 鏂版柟妗堟敼閫� 2022-12-21
}
});
+ debugger;
let obj = Object.create(null);
obj["dataIds"] = dataArr;
var payload = JSON.stringify(obj);
- console.log("payload zhj = " + JSON.stringify(payload));
-
this.search_contact_url(
component,
"Agency_Contact__c",
@@ -2530,7 +2375,7 @@
// component.set('v.login',true);
// this.ImportMethod(component,resultjson);
// }
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
this.saveRecordsEditFile(
component,
dataMap,
@@ -2538,12 +2383,12 @@
helper
);
} else {
- this.error("AWS 鏌ヨ鏁版嵁涓虹┖ ");
- component.set("v.loginEdit", false);
+ this.error("AWS search status5 ");
+ component.set("v.login", false);
}
} else {
this.error("AWS search status6 : " + result.status);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
},
component
@@ -2618,11 +2463,7 @@
// });
// $A.enqueueAction(action);
},
- isNumber: function (str) {
- return /^\d+$/.test(str);
- },
ImportMethod: function (component, fileStr) {
- debugger;
var actionss = component.get("c.processData");
var selectDate = component.find("select_date").get("v.value");
var fieldsList = ["Name", "Phone", "AccountNumber"]; //Please write your code dynamic
@@ -2645,112 +2486,32 @@
if (res != "success") {
var ress = res.split("=");
console.log(ress);
- 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] != "") {
- let errorData = {};
- if (!this.isNumber(ress[i].substr(7).substring(1, 2))) {
- continue;
- }
- let index = errorDataRow.indexOf(
- ress[i].substr(7).substring(1, 2)
- );
- if (index == -1) {
- 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 {
- 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);
- }
- }
- }
}
- let errorColumns = [
- {
- label: "閿欒琛�",
- fieldName: "errorRow",
- type: "text",
- hideDefaultActions: true,
- initialWidth: 100
- },
- {
- label: "閿欒淇℃伅",
- fieldName: "errorInfo",
- type: "text",
- hideDefaultActions: true,
- initialWidth: 300,
- wrapText: true
- }
- ];
- for (var i = 0; i < fileContentData[0].split(",").length; i++) {
- errorColumns.push({
- label: fileContentData[0].split(",")[i],
- fieldName: "field" + i,
- type: "text",
- hideDefaultActions: true,
- wrapText: true,
- initialWidth: 120
- });
- }
-
- for (var i = 0; i < errorDatas.length; i++) {
- let data = fileContentData[errorDatas[i].errorRow];
- console.log("data = " + JSON.stringify(data));
- if (data) {
- for (var j = 0; j < data.split(",").length; j++) {
- let label = "field" + j;
- errorDatas[i][label] = data.split(",")[j];
- }
- }
- }
- component.set("v.errorColumns", errorColumns);
- component.set("v.errorData", errorDatas);
- component.set("v.showErrorInfo", true);
+ // $('.forceToastManager').css('white-space', 'pre-wrap');
console.log("==" + res1);
this.error(res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else {
component.set("v.showMain", true);
this.success("瀵煎叆鎴愬姛");
// alert('saved successfully');
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
} else if (state === "INCOMPLETE") {
// do something
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
} else if (state === "ERROR") {
var errors = response.getError();
if (errors) {
if (errors[0] && errors[0].message) {
console.log("Error message: " + errors[0].message);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
} else {
console.log("Unknown error");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
}
});
@@ -2791,99 +2552,9 @@
}
if (error != "") {
- console.log("zhj error = " + error);
- let errorArray = error.split("error1");
- 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] != "") {
- let errorData = {};
- if (!this.isNumber(errorArray[i].trim().substring(1, 2))) {
- continue;
- }
- let index = errorDataRow.indexOf(
- errorArray[i].trim().substring(1, 2)
- );
- if (index == -1) {
- 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 {
- 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);
- }
- }
- }
- }
- 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
- }
- ];
- for (var i = 0; i < fileContentData[0].split(",").length; i++) {
- errorColumns.push({
- label: fileContentData[0].split(",")[i],
- fieldName: "field" + i,
- type: "text",
- hideDefaultActions: true,
- wrapText: true,
- initialWidth: 120
- });
- }
-
- for (var i = 0; i < errorDatas.length; i++) {
- let data = fileContentData[errorDatas[i].errorRow];
- console.log("data = " + JSON.stringify(data));
- for (var j = 0; j < data.split(",").length; j++) {
- let label = "field" + j;
- errorDatas[i][label] = data.split(",")[j];
- }
- }
- console.log("errorDatas =" + JSON.stringify(errorDatas));
- component.set("v.errorColumns", errorColumns);
- component.set("v.errorData", errorDatas);
- component.set("v.showErrorInfo", true);
-
- console.log("error = " + error);
- component.set("v.errorMessage", error);
-
this.error(error);
console.log("error=" + error);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
return;
}
@@ -3062,7 +2733,7 @@
},
select_repores_date: function (component, event, helper) {
- component.set("v.loginEdit", true);
+ component.set("v.login", true);
var reportsdate1 = component.find("input-report-date1").get("v.value");
var reportsdate2 = component.find("input-report-date2").get("v.value");
console.log(
@@ -3080,7 +2751,7 @@
if (state === "SUCCESS") {
var res = response.getReturnValue();
console.log("杈撳叆鐨勫紑濮嬫棩鏈�3" + res);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
// PI 鏀归�� By Bright 20220328
if (true) {
@@ -3127,7 +2798,7 @@
}
helper.showExportDate(component, res);
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
},
awsurl.token
);
@@ -3139,7 +2810,7 @@
component.set("v.reports_date", res);
} else {
alert("瀵煎嚭澶辫触,璇锋鏌ユ椿鍔ㄦ棩");
- component.set("v.loginEdit", false);
+ component.set("v.login", false);
}
});
$A.enqueueAction(action);
@@ -3190,77 +2861,8 @@
}
$A.enqueueAction(action);
- },
- //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
-
- //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 start
- exportErrorInfoHelper: function (component) {
- var errorData = component.get("v.errorData");
- var errorColumns = component.get("v.errorColumns");
-
- var datas = [];
- let errorColumnsArray = [];
- for (var i in errorColumns) {
- errorColumnsArray.push(errorColumns[i].label);
- }
- datas.push(errorColumnsArray);
- //datas.push(errorColumns);
-
- for (var i in errorData) {
- let data = [];
- data.push(errorData[i].errorRow);
- data.push(errorData[i].errorInfo);
- for (var j = 0; j < Object.keys(errorData[i]).length - 2; j++) {
- data.push(errorData[i]["field" + j]);
- }
- datas.push(data);
- }
-
- console.log("datas = " + JSON.stringify(datas));
- var csv = this.convertToCSV(component, datas);
- console.log("csv = " + JSON.stringify(csv));
- this.downloadCSV(component, csv);
- },
-
- convertToCSV: function (component, data) {
- console.log("enter convertToCSV");
- console.log("data = " + data);
- var csv = "";
- for (var i = 0; i < data.length; i++) {
- var row = data[i];
- console.log("row = " + JSON.stringify(row));
- for (var j = 0; j < row.length; j++) {
- var val = "";
- val = row[j] === null ? "" : row[j].toString();
- console.log("val = " + val);
- if (
- val.indexOf(",") !== -1 ||
- val.indexOf('"') !== -1 ||
- val.indexOf("\n") !== -1
- ) {
- //val = '"' + val.replace(/"/g,'""') + '"';
- }
- if (j > 0) {
- csv += ",";
- }
- csv += val;
- }
- csv += "\n";
- }
- return csv;
- },
-
- downloadCSV: function (component, csv) {
- var link = document.createElement("a");
- // 璁剧疆瀛楃闆嗗拰鏂囦欢澶�
- var bom = "\uFEFF";
- link.href = "data:text/csv;charset=utf-8," + encodeURIComponent(bom + csv);
- link.download = "data.csv";
- document.body.appendChild(link);
- link.click();
- document.body.removeChild(link);
}
- //zhj 瀵煎嚭閿欒淇℃伅 2023-05-16 end
+ //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
// searchAgencyContact : function(res) {
// var agencyContacts = [];
diff --git a/force-app/main/default/classes/ArriveGoodsController.cls b/force-app/main/default/classes/ArriveGoodsController.cls
index 8e2988f..85af333 100644
--- a/force-app/main/default/classes/ArriveGoodsController.cls
+++ b/force-app/main/default/classes/ArriveGoodsController.cls
@@ -88,9 +88,8 @@
//public String[] proidList =new String[]{};
public Decimal orderCountAll = 0;
public Decimal orderCountNotarrive = 0;
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- public id return_Order_id = null;
- public id inventory_Order_id = null;
+ private id return_Order_id = null;
+ private id inventory_Order_id = null;
public boolean ReturnFLGbln { get; set; }
public boolean saveFLGbln { get; set; }
public String ArrType { get; set; }
@@ -103,14 +102,6 @@
public String product_Type = null;
public Boolean EngFlag = false;
public Boolean ETFlag = false;
-
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- public Boolean isLwc = false;
- public String returnError;
- public List<String> warningList;
- public List<String> errorList;
- public String urlType;
-
public ArriveGoodsController() {
baseUrl = URL.getSalesforceBaseUrl().toExternalForm();
ESetId = ApexPages.currentPage().getParameters().get('esetId');
@@ -130,29 +121,6 @@
consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
//add by rentx 20210602 CHAN-C3K4ZQ end
// OrderAllMap = new Map<String, String>();
- }
-
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- public ArriveGoodsController(String eSetId, String arrType) {
- this.ESetId = eSetId;
- this.ArrType = arrType;
- ConsumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsRecordserror = new List<ConsumableorderdetailsInfo>();
- ConsumableorderdetailsRecordsdummy = new List<ConsumableorderdetailsInfo>();
- consumableInventory = new List<ConsumableorderdetailsInfo>();
- consumableorderdetailsRecordsUse = new List<ConsumableorderdetailsInfo>();
- consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
- consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
- orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
- detailsSummary = new List<ConsumableorderdetailsInfo>();
- saveFLGbln = false;
- consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
- noboxBarcodeList = new Set<String>();
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- warningList = new List<String>();
- errorList = new List<String>();
- returnError = null;
- urlType = null;
}
//add by rentx 20210602 CHAN-C3K4ZQ start 鍑洪敊鐨勫師鍥犳槸椤甸潰鏈�澶氬睍绀�1000鏉℃暟鎹�,浣嗘槸闇�瑕佸睍绀虹殑鏁版嵁瓒呰繃浜�1000鏉�,鐜板湪鎶婂睍绀轰笂绾挎敼涓�1000 * 1000
@@ -392,18 +360,6 @@
//========20160311======ADD_End==================================
//鑾峰彇鏄庣粏
public void SearchPro() {
- //浠庝笅杈圭Щ涓婃潵 by Link 2023-5-23
- if (barcode == null || barcode.trim() == '') {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '璇疯緭鍏arCode鍙�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, '璇疯緭鍏arCode鍙枫��')
- );
- }
- return;
- }
notInlist = new List<String>();
otherAgencyMap = new Map<String, String>();
barMcodeMap = new Map<String, String>();
@@ -411,10 +367,6 @@
consumableInventoryUse = new List<ConsumableorderdetailsInfo>();
consumableorderdetails2Cancle = new List<Consumable_order_details2__c>();
orderdetails2trMap = new Map<String, Consumable_order_details2__c>();
- //update by Link 20230428
- if (isLwc) {
- noboxBarcodeList = new Set<String>();
- }
//add by rentx 2021-01-27 start
HosErrorList = new List<String>();
HosErrorMap = new Map<String, String>();
@@ -485,16 +437,12 @@
List<Consumable_order_details2__c> Ins = new List<Consumable_order_details2__c>();
List<Consumable_order_details2__c> reSet = new List<Consumable_order_details2__c>();
List<Consumable_order_details2__c> reSet1 = new List<Consumable_order_details2__c>();
- //绉诲埌鏈�涓婅竟 by Link 2023-5-23
- // if(barcode == null || barcode.trim() ==''){
- // //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- // if(isLwc){
- // returnError = '璇疯緭鍏arCode鍙�';
- // }else {
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO,'璇疯緭鍏arCode鍙枫��'));
- // }
- // return;
- // }
+ if (barcode == null || barcode.trim() == '') {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, '璇疯緭鍏arCode鍙枫��')
+ );
+ return;
+ }
//瀵规瘮鍏ㄩ儴搴撳瓨涓槸鍚﹀瓨鍦ㄧ鐞嗙紪鐮佷竴鏍凤紝barcode鍙蜂笉涓�鏍风殑浜у搧
reSet1 = [
SELECT Id, Name, TracingCode__c, Bar_Code__c, Report_Product_Expiration__c
@@ -520,21 +468,13 @@
} else {
for (String str : barMcodeMap.keySet()) {
if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
str +
' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- str +
- ' 鐨勭鐞嗙紪鐮佸凡缁忓瓨鍦ㄤ簬绯荤粺鐨勫簱瀛樹腑锛岃纭杈撳叆淇℃伅鏄惁鏈夎銆�'
- )
- );
- }
+ )
+ );
ErrorIdMap.put(str, str);
ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
}
@@ -586,8 +526,6 @@
}
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.INFO, '绠＄悊缂栫爜涓虹┖鐨勪骇鍝� ' + ErrorIdMap));
//鏁翠綋鍒拌揣
- System.debug('EsetId===>' + EsetId);
- System.debug('ArrType===>' + ArrType);
if (EsetId == null || EsetId == '') {
if (ArrType != 'ReG') {
//鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
@@ -651,65 +589,6 @@
}
}
}
- System.debug('reSet1===>' + reSet1);
- //add by Wang Xueqin
- //鍒拌揣浣嗕骇鍝佺被鍨嬩笌鐢ㄦ埛鐨勭被鍨嬩笉绗�
- reSet1 = [
- SELECT
- Id,
- Name,
- Intra_Trade_List_RMB__c,
- Asset_Model_No__c,
- Consumable_Product__c,
- Consumable_Product__r.Name,
- Consumable_Product__r.Name__c,
- Consumable_Product__r.Asset_Model_No__c,
- Sterilization_limit__c,
- Deliver_date__c,
- Bar_Code__c,
- Arrive_date__c,
- Send_Date__c,
- Consumable_order_minor__r.Name,
- Consumable_order_minor__c,
- Dealer_Arrive__c,
- Guarantee_period_for_products__c,
- CFDA_Status__c,
- ProductPacking_list_manual__c,
- Report_Product_Approbation__c,
- Report_Product_Expiration__c,
- Box_Piece__c,
- Rrturn_count__c,
- Product_Type__c,
- ContractNo_text__c,
- Consumable_order_minor__r.ContractNo__c
- FROM Consumable_order_details2__c
- WHERE
- Bar_Code__c IN :BarCodeListP
- AND (NOT Product_Type__c LIKE :userPro_Typestr)
- ];
-
- if (reSet1.size() > 0) {
- for (Integer i = 0; i < reSet1.size(); i++) {
- if (ErrorIdMap.containsKey(reSet1[i].Bar_Code__c)) {
- // 璺宠繃宸茬粡澶勭悊鐨勬秷鑰楀搧鏄庣粏
- continue;
- } else {
- String str =
- '浜у搧绫诲瀷[' +
- reSet1[i].Product_Type__c +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇';
- ConsumableorderdetailsRecordserror.add(
- new ConsumableorderdetailsInfo(reSet1[i], str)
- );
- ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
- }
- }
- }
- System.debug('reSet1===>1' + reSet1);
- //end
-
//閿�鍞骇鍝�
reSet1 = [
SELECT
@@ -1405,23 +1284,14 @@
reSet1[i].Lose_Flag__c == true &&
reSet1[i].ToDueDateDays__c >= 0
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.WARNING,
'浜у搧' +
reSet1[i].Consumable_Product__r.Name +
'瀛樺湪涓㈠け璁板綍'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.WARNING,
- '浜у搧' +
- reSet1[i].Consumable_Product__r.Name +
- '瀛樺湪涓㈠け璁板綍'
- )
- ); //濡傛灉涓㈠け浜у搧灏辩粰鎻愮ず銆�
- }
+ )
+ ); //濡傛灉涓㈠け浜у搧灏辩粰鎻愮ず銆�
}
if (
reSet1[i].Lose_Flag__c == true &&
@@ -1661,22 +1531,15 @@
reSet[i].Bar_Code__c != str &&
reSet[i].TracingCode__c == barMcodeMap.get(str)
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
+ // 20220815 ljh SWAG-CH65B7 start
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.WARNING,
'鏉″舰鐮佷负(' + str + ')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'
- );
- } else {
- // 20220815 ljh SWAG-CH65B7 start
- // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.WARNING,'姝ょ鐞嗙紪鐮佷笌瀹為檯鍙戣揣BarCode涓嶄竴鑷达紝璇锋牳瀵圭鐞嗙紪鐮�('+ str +')鐨勫叆搴撳強搴撳瓨鏁版嵁銆�'));
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.WARNING,
- '鏉″舰鐮佷负(' + str + ')鐨勫叆搴撴暟鎹笌鍙戣揣鏁版嵁涓嶄竴鑷�'
- )
- );
- // 20220815 ljh SWAG-CH65B7 end
- }
+ )
+ );
+ // 20220815 ljh SWAG-CH65B7 end
}
if (barMcodeMap.get(str) == reSet[i].TracingCode__c) {
reSet[i].Bar_Code__c = str;
@@ -1723,27 +1586,16 @@
} else {
for (String str : barMcodeMap.keySet()) {
if (barMcodeMap.get(str) == reSet1[i].TracingCode__c) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'barcode' +
str +
'涓庡嚭搴撳崟' +
reSet1[i].Sale_orderName__c +
' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'barcode' +
- str +
- '涓庡嚭搴撳崟' +
- reSet1[i].Sale_orderName__c +
- ' 涓殑绠＄悊缂栫爜涓�鑷达紝浣咮arcode涓嶅悓锛岃纭鍏蜂綋鏁版嵁銆�'
- )
- );
- }
+ )
+ );
ErrorIdMap.put(str, str);
ErrorIdMap.put(reSet1[i].Bar_Code__c, reSet1[i].Bar_Code__c);
}
@@ -1783,36 +1635,23 @@
if (ArrType != 'ReG') {
inventoryEntryNoESetId(notInlist);
if (notInStorelist.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
- )
- );
- }
- return;
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError =
- 'BarCode鍙�' +
- notInlist +
- '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱';
- } else {
ApexPages.addmessage(
new ApexPages.message(
ApexPages.severity.ERROR,
- 'BarCode鍙�' +
- notInlist +
- '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'
+ 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
)
);
+ return;
}
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�' +
+ notInlist +
+ '涓嶅瓨鍦紝鏃犲搴旂殑鍑哄簱鍗曪紝璇峰厛鎿嶄綔浜у搧鍏ュ簱銆�'
+ )
+ );
return;
}
}
@@ -1820,17 +1659,12 @@
//add by rentx 2021-01-27 start
if (HosErrorList.size() > 0) {
for (String str : HosErrorList) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('BarCode鍙�:' + str + HosErrorMap.get(str) + '');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�:' + str + HosErrorMap.get(str) + ''
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�:' + str + HosErrorMap.get(str) + ''
+ )
+ );
}
}
//add by rentx 2021-01-27 end
@@ -2327,17 +2161,12 @@
if (notInlist.size() > 0) {
inventoryEntry(notInlist);
if (notInStorelist.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�' + notInStorelist + '涓嶅瓨鍦ㄣ��'
+ )
+ );
return;
}
}
@@ -2346,17 +2175,12 @@
//add by rentx 2021-01-27 start 褰撹鍗曚负鍖婚櫌鐗逛环绫诲瀷鐨勮鍗曟椂,濡傛灉鎵句笉鍒癰arcode,涓嶈В鏋�,骞朵笖榛樿璇arcode瀵瑰簲鐨勬槑缁�2涓洪潪鍖婚櫌鐗逛环浜у搧,鐩存帴鎶ラ敊
if (HosErrorList.size() > 0) {
for (String str : HosErrorList) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ 'BarCode鍙�:' + str + '鏄潪鍖婚櫌鐗逛环浜у搧'
+ )
+ );
}
}
//add by rentx 2021-01-27 end
@@ -2392,23 +2216,14 @@
//鐢熶骇鏃ユ湡
List<String> janCode = new List<String>();
if (barCodeList[i].length() < 16) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
} else {
//if(barCodeList[i].substring(0,2) !='01'){
@@ -2419,19 +2234,12 @@
try {
Decimal test = Decimal.valueOf(janCodeMark);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -2443,19 +2251,12 @@
barCodeList[i].length() - 5
) != '250'
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].substring(16, 18) == '11') {
@@ -2468,27 +2269,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 32) {
@@ -2517,27 +2307,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 42) {
@@ -2582,27 +2361,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 34) {
@@ -2656,42 +2424,30 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
+ )
+ );
continue;
}
}
+ // String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
+ // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'浜у搧BarCode(' + barCodeList[i] + ')绠＄悊缂栫爜涓湁鏁板瓧锛岃涓庣鐞嗗憳纭鏄惁閿欒锛�'));
+ // continue;
+ // gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -2788,41 +2544,25 @@
barCodeList[i].length() - 5
) != '250'
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
+ )
+ );
continue;
}
List<String> otCodeList = new List<String>();
Map<String, String> otCodeMap = new Map<String, String>();
if (barCodeList[i].length() < 7) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
} else if (barCodeList[i].length() == 11) {
String otCode4 = barCodeList[i].substring(3, 7);
@@ -2864,31 +2604,21 @@
barOtcodeMap.put(barCodeList[i], otCodeMap);
barCode241List.add(barCodeList[i]);
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
- )
- );
- }
- continue;
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒');
- } else {
ApexPages.addmessage(
new ApexPages.message(
ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
)
);
+ continue;
}
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')涓嶇鍚堣姹傦紒'
+ )
+ );
continue;
}
}
@@ -2951,9 +2681,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -2961,21 +2691,8 @@
']涓庣敤鎴风被鍨媅' +
userPro_Type +
']涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风被鍨媅' +
- userPro_Type +
- ']涓嶇'
- )
- );
- }
+ )
+ );
}
}
}
@@ -3011,9 +2728,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -3021,21 +2738,8 @@
']涓庣敤鎴穂' +
userPro_Type +
']绫诲瀷涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- )
- );
- }
+ )
+ );
}
product2InStore = [
SELECT
@@ -3076,27 +2780,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 16) {
@@ -3150,27 +2843,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 25) {
@@ -3254,27 +2936,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 20) {
@@ -3332,24 +3003,15 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3359,19 +3021,12 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3448,42 +3103,26 @@
//鐢熶骇鏃ユ湡
List<String> janCode = new List<String>();
if (barCodeList[i].length() < 16) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
} else {
janCodeMark = barCodeList[i].substring(2, 16);
try {
Decimal test = Decimal.valueOf(janCodeMark);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨刯anCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3495,19 +3134,12 @@
barCodeList[i].length() - 5
) != '250'
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].substring(16, 18) == '11') {
@@ -3520,27 +3152,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 32) {
@@ -3569,27 +3190,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 42) {
@@ -3634,27 +3244,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (barCodeList[i].length() >= 34) {
@@ -3705,24 +3304,15 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3732,19 +3322,12 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')鐨則racingCode閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3830,39 +3413,25 @@
barCodeList[i].length() - 5
) != '250'
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + barCodeList[i] + ')娌℃湁绠＄悊缂栫爜锛�'
+ )
+ );
continue;
}
List<String> otCodeList = new List<String>();
Map<String, String> otCodeMap = new Map<String, String>();
if (barCodeList[i].length() < 7) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')鐨勪綅鏁颁笉瓒�16锛屼笉绗﹀悎瑕佹眰閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
} else if (barCodeList[i].length() == 11) {
String otCode4 = barCodeList[i].substring(3, 7);
@@ -3904,23 +3473,14 @@
barOtcodeMap.put(barCodeList[i], otCodeMap);
barCode241List.add(barCodeList[i]);
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
barCodeList[i] +
')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- barCodeList[i] +
- ')娌℃湁janCode鎴朞Tcode锛屼笉绗﹀悎瑕佹眰锛�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -3960,9 +3520,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -3970,21 +3530,8 @@
']涓庣敤鎴风殑绫诲瀷[' +
userPro_Type +
']涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴风殑绫诲瀷[' +
- userPro_Type +
- ']涓嶇'
- )
- );
- }
+ )
+ );
}
}
product2InStore = [
@@ -4076,9 +3623,9 @@
}
}
if (errorMap.size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'BarCode鍙穂' +
errorMap.values() +
']浜у搧绫诲瀷[' +
@@ -4086,21 +3633,8 @@
']涓庣敤鎴穂' +
userPro_Type +
']绫诲瀷涓嶇'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- 'BarCode鍙穂' +
- errorMap.values() +
- ']浜у搧绫诲瀷[' +
- product_Type +
- ']涓庣敤鎴穂' +
- userPro_Type +
- ']绫诲瀷涓嶇'
- )
- );
- }
+ )
+ );
}
product2InStore = [
SELECT
@@ -4140,27 +3674,16 @@
'-01';
productionDate = Date.valueOf(productDateStr);
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勭敓浜ф棩鏈�' +
productDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勭敓浜ф棩鏈�' +
- productDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 16) {
@@ -4215,27 +3738,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 3 + 25) {
@@ -4314,27 +3826,16 @@
expirationDate = Date.valueOf(expirationDateStr);
}
} catch (Exception e) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')鐨勬粎鑿屾湁鍔规湡闄�' +
expirationDateStr +
'閿欒锛�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')鐨勬粎鑿屾湁鍔规湡闄�' +
- expirationDateStr +
- '閿欒锛�'
- )
- );
- }
+ )
+ );
continue;
}
if (bar.length() >= oTcodeLength + 20) {
@@ -4384,24 +3885,15 @@
Pattern.compile('[0-9]').matcher(Atr).find() ||
Pattern.compile('[0-9]').matcher(Ctr).find()
) {
- String str = '绠＄悊缂栫爜涓嶆纭紝璇蜂笌绠＄悊鍛樼‘璁ゆ槸鍚﹂敊璇��';
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add(
+ String str = '绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�';
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
'浜у搧BarCode(' +
bar +
')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' +
- bar +
- ')绠＄悊缂栫爜鏈夎锛岃妫�鏌ユ潯褰㈢爜鏁版嵁銆�'
- )
- );
- }
+ )
+ );
continue;
}
}
@@ -4411,17 +3903,12 @@
// gzw DB202305352696 鍏ュ簱绠＄悊缂栫爜楠岃瘉绋嬪簭璋冩暣 end
}
} else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- errorList.add('浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.ERROR,
+ '浜у搧BarCode(' + bar + ')鐨則racingCode閿欒锛�'
+ )
+ );
continue;
}
}
@@ -4469,30 +3956,20 @@
if (notEqualBARcodeCunMap.size() > 0) {
for (String widget : notEqualBARcodeCunMap.keySet()) {
if (notEqualBARcodeCunMap.get(widget).size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add('浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��');
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.INFO,
- '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.INFO,
+ '浠ヤ笅barcode浜у搧涓庤璐т骇鍝佷笉涓�鑷淬��'
+ )
+ );
for (
String barcodeListTTT : (List<String>) notEqualBARcodeCunMap.get(
widget
)
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(barcodeListTTT);
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
+ );
}
}
}
@@ -4921,14 +4398,9 @@
ConsumableorderdetailsRecords.size() < 1 &&
consumableInventory.size() < 1
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '涓嶅瓨鍦ㄥ埌璐ф槑缁�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.ERROR, '涓嶅瓨鍦ㄥ埌璐ф槑缁�')
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.ERROR, '涓嶅瓨鍦ㄥ埌璐ф槑缁�')
+ );
return null;
}
if (EsetId != null && EsetId != '') {
@@ -4936,40 +4408,24 @@
if (resultcheck.length() > 0) {
for (String widget : overOrderBARcodeCunMap.keySet()) {
if (overOrderBARcodeCunMap.get(widget).size() > 0) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(
+ ApexPages.addmessage(
+ new ApexPages.message(
+ ApexPages.severity.INFO,
'浜у搧' +
widget +
'鏈鍒拌揣鏁伴噺瓒呰繃' +
overOrderBARcodeCunMap.get(widget).size() +
'涓璐х殑鏁伴噺銆�'
- );
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.INFO,
- '浜у搧' +
- widget +
- '鏈鍒拌揣鏁伴噺瓒呰繃' +
- overOrderBARcodeCunMap.get(widget).size() +
- '涓璐х殑鏁伴噺銆�'
- )
- );
- }
+ )
+ );
for (
String barcodeListTTT : (List<String>) overOrderBARcodeCunMap.get(
widget
)
) {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- warningList.add(barcodeListTTT);
- } else {
- ApexPages.addmessage(
- new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.INFO, barcodeListTTT)
+ );
}
}
}
@@ -5002,7 +4458,6 @@
arriveId = orderMain.id;
Decimal arriveAmount = 0;
for (ConsumableorderdetailsInfo ass : consumableorderdetailsRecordsUse) {
- //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------1------'));
Consumable_order_details2__c insDetails = new Consumable_order_details2__c();
insDetails.Id = ass.esd.Id;
insDetails.Consumable_Arrived_order__c = orderMain.id;
@@ -5129,7 +4584,6 @@
if (updateconsumableorderdetails2.size() > 0) {
update updateconsumableorderdetails2;
}
-
List<Consumable_order_details2__c> insertconsumableorderdetails2 = new List<Consumable_order_details2__c>();
for (Consumable_order_details2__c Cod2 : consumableorderdetails2Insert) {
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'------4------'));
@@ -5167,7 +4621,7 @@
i++;
}
- //return null;
+ // return null;
if (insertconsumableorderdetails2.size() > 0) {
insert insertconsumableorderdetails2;
@@ -5227,12 +4681,7 @@
// Integer a = 1/0;
} catch (Exception e) {
Database.rollback(sp);
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = e.getLineNumber() + '---' + e.getMessage();
- } else {
- ApexPages.addMessages(e);
- }
+ ApexPages.addMessages(e);
return null;
}
if (resultcheck.length() > 0) {
@@ -5240,7 +4689,6 @@
} else if (resultcheckWithoutOrder.size() > 0) {
return null;
} else {
- urlType = 'UnabletoEdit';
return UnabletoEdit();
// return null;
}
@@ -5650,7 +5098,11 @@
Inventory_Order_Sheet.Order_ProType__c = userPro_Type;
insert Inventory_Order_Sheet;
inventory_Order_id = Inventory_Order_Sheet.id;
- //List<Consumable_order__c> consumable_order_Inv = [SELECT Name FROM Consumable_order__c WHERE id =:Inventory_Order_Sheet.id]; //Commented By Li Jun 20230616
+ List<Consumable_order__c> consumable_order_Inv = [
+ SELECT Name
+ FROM Consumable_order__c
+ WHERE id = :Inventory_Order_Sheet.id
+ ];
// WYIN-BLZE48鐩樼偣涓㈠け浜у搧澧炲姞鍏ュ簱鏂瑰紡 update by vivek 2020-03-05 end
List<Consumable_order_details2__c> codcList = new List<Consumable_order_details2__c>();
@@ -5671,11 +5123,7 @@
codi.esd.Return_reason__c == null ||
codi.esd.Return_reason__c == ''
) {
- if (isLwc) {
- returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
- } else {
- codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
- }
+ codi.esd.Return_reason__c.addError('璇疯ˉ鍏呰繑鍝佸師鍥�');
return null;
}
@@ -5686,11 +5134,7 @@
codi.esd.Bar_Code__c;
Integer deliverycnt = BarcodeCntMap.get(key);
if (codi.esd.Rrturn_count__c > deliverycnt) {
- if (isLwc) {
- returnError = '瓒呭嚭鍑哄簱鏁伴噺';
- } else {
- codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
- }
+ codi.esd.Rrturn_count__c.addError('瓒呭嚭鍑哄簱鏁伴噺');
return null;
}
}
@@ -5911,7 +5355,6 @@
codcList.add(codi.esd);
}
}
-
//鏄庣粏2涓嶅瓨鍦ㄧ殑瀵瑰簲鐨勫埌璐ц鍗曟槑缁� 2017-07-05
Integer i = 1;
//for(ConsumableorderdetailsInfo ass : consumableInventoryUse){
@@ -5925,17 +5368,9 @@
// }
if (ass.ReturnReason == null || ass.ReturnReason == '') {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '璇疯ˉ鍏呰繑鍝佸師鍥�';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '璇疯ˉ鍏呰繑鍝佸師鍥�'
- )
- );
- }
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.ERROR, '璇疯ˉ鍏呰繑鍝佸師鍥�')
+ );
return null;
}
@@ -6034,33 +5469,13 @@
// WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
// return ToReturnGoodsPage();
if (hasLoseGoods) {
- urlType = 'ToInventoryGoodsPage';
return ToInventoryGoodsPage();
// return null;
} else {
- urlType = 'ToReturnGoodsPage';
return ToReturnGoodsPage();
// return null;
}
// WYIN-BPE3T4 铏氭嫙鐩樼偣鍗� update by vivek 2020-05-11 start
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
- } else {
- ApexPages.addmessage(
- new ApexPages.message(
- ApexPages.severity.ERROR,
- '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'
- )
- );
- }
- return null;
- }
- } else {
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧';
} else {
ApexPages.addmessage(
new ApexPages.message(
@@ -6068,17 +5483,17 @@
'娌℃湁闇�瑕佺櫥褰曠殑杩斿搧'
)
);
+ return null;
}
+ } else {
+ ApexPages.addmessage(
+ new ApexPages.message(ApexPages.severity.ERROR, '娌℃湁闇�瑕佺櫥褰曠殑杩斿搧')
+ );
return null;
}
} catch (Exception e) {
Database.rollback(sp);
- //LWC:Lwcflag鍜屾姤閿欐彁閱� update by Link 2023-04-27
- if (isLwc) {
- returnError = e.getLineNumber() + '---' + e.getMessage();
- } else {
- ApexPages.addMessages(e);
- }
+ ApexPages.addMessages(e);
return null;
}
}
@@ -6160,7 +5575,7 @@
return ref;
}
- public class ConsumableorderdetailsInfo implements Comparable {
+ class ConsumableorderdetailsInfo implements Comparable {
public Consumable_order_details2__c esd { get; set; }
public Product2__c Prod { get; set; }
public String ProductName { get; set; }
@@ -6178,10 +5593,6 @@
public Decimal arrivedCount { get; set; }
public String ReportProductExpirationDate { get; set; }
-
- public ConsumableorderdetailsInfo() {
- }
-
public ConsumableorderdetailsInfo(
Consumable_order_details2__c e,
string str
diff --git a/force-app/main/default/classes/ArriveGoodsControllerTest.cls b/force-app/main/default/classes/ArriveGoodsControllerTest.cls
index 910aeb3..786dab4 100644
--- a/force-app/main/default/classes/ArriveGoodsControllerTest.cls
+++ b/force-app/main/default/classes/ArriveGoodsControllerTest.cls
@@ -1,5 +1,236 @@
@isTest
private class ArriveGoodsControllerTest {
+ @isTest
+ static void myUnitTest() {
+ // // TO DO: implement unit test
+ List<RecordType> rectCo = [
+ SELECT Id
+ FROM RecordType
+ WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁２搴�'
+ ];
+ if (rectCo.size() == 0) {
+ return;
+ }
+ // Profile prof = [select Id from Profile where Name ='901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET Email)'];
+ Profile prof = [
+ SELECT Id
+ FROM Profile
+ WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'
+ ];
+
+ Account myAccount2 = new Account(
+ name = 'Testaccount002',
+ Dealer_discount__c = 20,
+ RecordTypeId = rectCo[0].Id,
+ AgentCode_Ext__c = '9999900'
+ );
+ Account myAccount1 = new Account(
+ name = 'Testaccount001',
+ Dealer_discount__c = 30,
+ RecordTypeId = rectCo[0].Id
+ );
+ insert new List<account>{ myAccount1, myAccount2 };
+
+ Contact core = new Contact(
+ email = 'jplumber@salesforce.com',
+ firstname = 'Joe',
+ lastname = 'Plumber',
+ accountid = myAccount1.id
+ );
+ insert core;
+ user MyUser_Test = new User(
+ ContactId = core.id,
+ Alias = 'newUser',
+ Email = 'newuser@testorg.com',
+ EmailEncodingKey = 'UTF-8',
+ LastName = 'TestUser',
+ LanguageLocaleKey = 'zh_CN',
+ LocaleSidKey = 'zh_CN',
+ ProfileId = prof.Id,
+ TimeZoneSidKey = 'Asia/Shanghai',
+ UserName = 'testUser@testorg.com',
+ UserPro_Type__c = 'ET'
+ );
+ System.runAs(new User(Id = UserInfo.getUserId())) {
+ insert MyUser_Test;
+ }
+
+ // User MyUser_Test = [select id,Contact.accountid from User WHERE ProfileId = :prof.Id and IsActive = true and UserPro_Type__c = 'ET' limit 1 ];
+ // Product2 prod01 = new Product2(Name='Test01',ProductCode='Test01',Asset_Model_No__c = 'Test01',SFDA_Status__c = '鏈夊姽',JANCODE__c = '04953170200311',Dealer_special_Object__c = true,Manual_Entry__c = false);
+ // Product2 prod02 = new Product2(Name='Test02',ProductCode='Test02',Asset_Model_No__c = 'Test02',SFDA_Status__c = '鏈夊姽',JANCODE__c = '04953170200312',Dealer_special_Object__c = true,Manual_Entry__c = false);
+ // insert new Product2[] {prod01,prod02};
+ System.runAs(MyUser_Test) {
+ Product2 prod01 = new Product2(
+ Name = 'Test01',
+ ProductCode = 'Test01',
+ Asset_Model_No__c = 'Test01',
+ SFDA_Status__c = '鏈夊姽',
+ JANCODE__c = '04953170200311',
+ Dealer_special_Object__c = true,
+ Manual_Entry__c = false
+ );
+ Product2 prod02 = new Product2(
+ Name = 'Test02',
+ ProductCode = 'Test02',
+ Asset_Model_No__c = 'Test02',
+ SFDA_Status__c = '鏈夊姽',
+ JANCODE__c = '04953170200312',
+ Dealer_special_Object__c = true,
+ Manual_Entry__c = false
+ );
+ insert new List<Product2>{ prod01, prod02 };
+ Product2__c pro1 = new Product2__c(
+ Name = 'Pro001',
+ OT_CODE_Text__c = 'Test001',
+ Product2__c = prod01.Id
+ );
+ Product2__c pro2 = new Product2__c(
+ Name = 'Pro002',
+ OT_CODE_Text__c = 'Test002',
+ Product2__c = prod02.Id
+ );
+ insert new List<Product2__c>{ pro1, pro2 };
+ //璁㈠崟
+ Consumable_order__c Order1 = new Consumable_order__c();
+ Order1.Name = 'OCM_01_001';
+ Order1.Order_status__c = '鎵瑰噯';
+ Order1.Order_type__c = '璁㈠崟';
+ // Order1.Dealer_Info__c = myAccount1.id;
+ Order1.Dealer_Info__c = myAccount1.id;
+ Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
+ Order1.Total_num__c = 3;
+ Order1.OrderNumber_arrived__c = 1;
+ Order1.Delivery_detail_count__c = 1;
+ Order1.Order_ProType__c = 'ET';
+ insert Order1;
+
+ //璁㈠崟鏄庣粏
+ //fahuo
+ Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
+ Orderdet.Name = 'OCM_01_00101';
+ Orderdet.Consumable_order__c = Order1.Id;
+ Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
+ Orderdet.Consumable_Product__c = pro1.Id;
+ Orderdet.Consumable_count__c = 40;
+ insert Orderdet;
+
+ //鍙戣揣鏄庣粏
+ //鍒拌揣姝ｇ‘淇℃伅
+ Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
+ Orderdet1.Name = 'OCM_01_001002';
+ Orderdet1.Consumable_order_minor__c = Order1.Id;
+ Orderdet1.Consumable_Product__c = pro1.Id;
+ Orderdet1.Asset_Model_No__c = 'Test01';
+ Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRA';
+ Orderdet1.TracingCode__c = 'BXJRA';
+
+ //鍙栨秷浜у搧
+ Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
+ Orderdet2.Name = 'OCM_01_001003';
+ Orderdet2.Consumable_order_minor__c = Order1.Id;
+ Orderdet2.Consumable_Product__c = pro1.Id;
+ Orderdet2.Asset_Model_No__c = 'Test01';
+ //Orderdet2.Consumable_Arrived_order__c = Order1.Id;
+ Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRB';
+ Orderdet2.Cancellation_Date__c = Date.today();
+ Orderdet2.TracingCode__c = 'BXJRB';
+ //閿�鍞骇鍝�
+ Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
+ Orderdet3.Name = 'OCM_01_001004';
+ Orderdet3.Consumable_order_minor__c = Order1.Id;
+ Orderdet3.Consumable_Product__c = pro1.Id;
+ Orderdet3.Asset_Model_No__c = 'Test01';
+ Orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet3.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRC';
+ Orderdet3.Used_date__c = Date.today();
+ Orderdet3.Arrive_date__c = Date.today();
+ Orderdet3.TracingCode__c = 'BXJRC';
+ //Orderdet3.Box_Piece__c = '鐩�';
+
+ //鍑哄簱浜у搧
+ Consumable_order_details2__c Orderdet4 = new Consumable_order_details2__c();
+ Orderdet4.Name = 'OCM_01_001005';
+ Orderdet4.Consumable_order_minor__c = Order1.Id;
+ Orderdet4.Consumable_Product__c = pro1.Id;
+ Orderdet4.Asset_Model_No__c = 'Test01';
+ Orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet4.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRD';
+ Orderdet4.Send_Date__c = Date.today();
+ Orderdet4.Arrive_date__c = Date.today();
+ Orderdet4.TracingCode__c = 'BXJRD';
+
+ //宸插埌璐т骇鍝�
+ Consumable_order_details2__c Orderdet5 = new Consumable_order_details2__c();
+ Orderdet5.Name = 'OCM_01_001006';
+ Orderdet5.Consumable_order_minor__c = Order1.Id;
+ Orderdet5.Consumable_Product__c = pro1.Id;
+ Orderdet5.Asset_Model_No__c = 'Test01';
+ Orderdet5.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet5.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRE';
+ Orderdet5.Arrive_date__c = Date.today();
+ Orderdet5.TracingCode__c = 'BXJRE';
+
+ //鍙戣揣鏄庣粏
+ //绠＄悊缂栫爜鍖呭惈鏁板瓧
+ Consumable_order_details2__c Orderdet6 = new Consumable_order_details2__c();
+ Orderdet6.Name = 'OCM_01_001002';
+ Orderdet6.Consumable_order_minor__c = Order1.Id;
+ Orderdet6.Consumable_Product__c = pro1.Id;
+ Orderdet6.Asset_Model_No__c = 'Test01';
+ Orderdet6.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet6.Bar_Code__c = '01049531702003111115120017181000105ZK250BX123';
+ Orderdet6.TracingCode__c = 'BX123';
+
+ //鍙戦敊搴� 鏈埌璐�
+ Consumable_order_details2__c Orderdets8 = new Consumable_order_details2__c();
+ Orderdets8.Name = 'OCM_01_001011';
+ Orderdets8.Consumable_order_minor__c = Order1.Id;
+ Orderdets8.Consumable_Product__c = pro1.Id;
+ Orderdets8.Asset_Model_No__c = 'Test01';
+ Orderdets8.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdets8.Bar_Code__c = '01049531702003111115120017181000105ZK250BXsys';
+ Orderdets8.Box_Piece__c = '鐩�';
+ Orderdets8.TracingCode__c = 'BXsys';
+
+ insert new List<Consumable_order_details2__c>{
+ Orderdet1,
+ Orderdet2,
+ Orderdet3,
+ Orderdet4,
+ Orderdet5,
+ Orderdet6,
+ Orderdets8
+ };
+
+ List<Consumable_orderdetails__c> cod1 = [
+ SELECT Id
+ FROM Consumable_orderdetails__c
+ WHERE Consumable_order__c = :Order1.Id
+ ];
+ System.assertEquals(1, cod1.size());
+
+ PageReference page = new PageReference(
+ '/apex/ArriveGoods?Esetid=' + Order1.Id
+ );
+
+ System.Test.setCurrentPage(page);
+ ArriveGoodsController Controller = new ArriveGoodsController();
+ //鍒濆鍖栨祴璇�
+ System.Test.startTest();
+ Controller.init();
+ //鎺掑簭
+ Controller.barcode = '';
+ Controller.SearchPro();
+ Controller.barcode = '01049531702003111115120017181000105ZK250BXJRA\n01049531702003111115120017181000105ZK250BXsys\n01049531702003111115120017181000105ZK250BXsun\n01049531702003111115120017181000105ZK250BXJRB\n01049531702003111115120017181000105ZK250BXJRC\n01049531702003111115120017181000105ZK250BX111\n01049531702003111115120017181000105ZK250BXJRD\n01049531702003111115120017181000105ZK250BXJRE\n01049531702003111115120017181000105ZK250BXJRF\n01049531702003111115120017181000105ZK250BXJRG\n01049531702003111115120017181000105ZK250BX123';
+ Controller.SearchPro();
+
+ // System.assertEquals(3, controller.ConsumableorderdetailsRecordsdummy.size()); //tcm
+ Controller.ArriveGoodsConfim();
+ System.Test.stopTest();
+ }
+ }
//閫夋嫨绛夊緟鍏ュ簱,鍖呮嫭01 鍜�241
@isTest
static void arriveWithID() {
@@ -1061,27 +1292,27 @@
//鍙戣揣鏄庣粏
//fahuo
/*Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
- Orderdet1.Name = 'OCM_01_001001';
- Orderdet1.Consumable_order_minor__c = Order1.Id;
- Orderdet1.Consumable_Product__c = pro1.Id;
- Orderdet1.Asset_Model_No__c = 'Pro001';
- Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- Orderdet1.Box_Piece__c ='鐩�';
- Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
- //daohuo
- Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
- Orderdet2.Name = 'OCM_01_001002';
- Orderdet2.Consumable_order_minor__c = Order1.Id;
- Orderdet2.Consumable_Product__c = pro1.Id;
- Orderdet2.Asset_Model_No__c = 'Pro001';
- Orderdet2.Consumable_Arrived_order__c = Order1.Id;
- //Orderdet2.IsArrival__c = true;
- Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- Orderdet2.Box_Piece__c ='鐩�';
- Orderdet2.Arrive_date__c = Date.today();
- //Orderdet2.Send_Date__c = Date.today();
- //Orderdet2.Used_date__c= Date.today();
- Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';*/
+ Orderdet1.Name = 'OCM_01_001001';
+ Orderdet1.Consumable_order_minor__c = Order1.Id;
+ Orderdet1.Consumable_Product__c = pro1.Id;
+ Orderdet1.Asset_Model_No__c = 'Pro001';
+ Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet1.Box_Piece__c ='鐩�';
+ Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
+ //daohuo
+ Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
+ Orderdet2.Name = 'OCM_01_001002';
+ Orderdet2.Consumable_order_minor__c = Order1.Id;
+ Orderdet2.Consumable_Product__c = pro1.Id;
+ Orderdet2.Asset_Model_No__c = 'Pro001';
+ Orderdet2.Consumable_Arrived_order__c = Order1.Id;
+ //Orderdet2.IsArrival__c = true;
+ Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
+ Orderdet2.Box_Piece__c ='鐩�';
+ Orderdet2.Arrive_date__c = Date.today();
+ //Orderdet2.Send_Date__c = Date.today();
+ //Orderdet2.Used_date__c= Date.today();
+ Orderdet2.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';*/
//sale
Consumable_order_details2__c Orderdet3 = new Consumable_order_details2__c();
Orderdet3.Name = 'OCM_01_001003';
@@ -3822,163 +4053,6 @@
Controller.UpdateGoodsOfReturn();
Controller.ToReturnGoodsPage();
Controller.geterrorsize();
- System.Test.stopTest();
- }
- }
-
- @isTest
- static void makeRecordsVieweTest() {
- Integer count = 1001;
- List<ArriveGoodsController.ConsumableorderdetailsInfo> conList = new List<ArriveGoodsController.ConsumableorderdetailsInfo>();
- for (Integer i = 0; i < 1001; i++) {
- conList.add(new ArriveGoodsController.ConsumableorderdetailsInfo());
- }
- ArriveGoodsController arr = new ArriveGoodsController();
- arr.makeRecordsView(conList);
- ArriveGoodsController arr1 = new ArriveGoodsController('', '');
- }
-
- @isTest
- static void compareToTest() {
- ArriveGoodsController.ConsumableorderdetailsInfo c1 = new ArriveGoodsController.ConsumableorderdetailsInfo();
- ArriveGoodsController.ConsumableorderdetailsInfo c2 = new ArriveGoodsController.ConsumableorderdetailsInfo();
- c1.compareTo(c2);
- }
-
- @isTest
- static void searchProTest1() {
- List<RecordType> rectCo = [
- SELECT Id
- FROM RecordType
- WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁２搴�'
- ];
- if (rectCo.size() == 0) {
- return;
- }
- Profile prof = [
- SELECT Id
- FROM Profile
- WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'
- ];
- Account myAccount2 = new Account(
- name = 'Testaccount002',
- Dealer_discount__c = 20,
- RecordTypeId = rectCo[0].Id,
- AgentCode_Ext__c = '9999900'
- );
- Account myAccount1 = new Account(
- name = 'Testaccount001',
- Dealer_discount__c = 30,
- RecordTypeId = rectCo[0].Id
- );
- insert new List<account>{ myAccount1, myAccount2 };
- Contact core = new Contact(
- email = 'jplumber@salesforce.com',
- firstname = 'Joe',
- lastname = 'Plumber',
- accountid = myAccount1.id
- );
- insert core;
- user MyUser_Test = new User(
- ContactId = core.id,
- Alias = 'newUser',
- Email = 'newuser@testorg.com',
- EmailEncodingKey = 'UTF-8',
- LastName = 'TestUser',
- LanguageLocaleKey = 'zh_CN',
- LocaleSidKey = 'zh_CN',
- ProfileId = prof.Id,
- TimeZoneSidKey = 'Asia/Shanghai',
- UserName = 'testUser@testorg.com',
- UserPro_Type__c = 'ET'
- );
- System.runAs(new User(Id = UserInfo.getUserId())) {
- insert MyUser_Test;
- }
-
- System.runAs(MyUser_Test) {
- Product2 prod01 = new Product2(
- Name = 'Test01',
- ProductCode = 'Test01',
- Asset_Model_No__c = 'Test01',
- SFDA_Status__c = '鏈夊姽',
- JANCODE__c = '04953170200311',
- Dealer_special_Object__c = true,
- Manual_Entry__c = false
- );
- Product2 prod02 = new Product2(
- Name = 'Test02',
- ProductCode = 'Test02',
- Asset_Model_No__c = 'Test02',
- SFDA_Status__c = '鏈夊姽',
- JANCODE__c = '04953170200312',
- Dealer_special_Object__c = true,
- Manual_Entry__c = false
- );
- insert new List<Product2>{ prod01, prod02 };
- Product2__c pro1 = new Product2__c(
- Name = 'Pro001',
- OT_CODE_Text__c = 'N3047730',
- Product2__c = prod01.Id
- );
- Product2__c pro2 = new Product2__c(
- Name = 'Pro002',
- OT_CODE_Text__c = 'N3047731',
- Product2__c = prod02.Id
- );
- insert new List<Product2__c>{ pro1, pro2 };
-
- Consumable_order__c Order1 = new Consumable_order__c();
- Order1.Name = 'OCM_01_001';
- Order1.Order_status__c = '鎵瑰噯';
- Order1.Order_type__c = '璁㈠崟';
- Order1.Dealer_Info__c = myAccount1.id;
- Order1.RecordTypeid = System.Label.RT_ConOrder_Delivery;
- Order1.Order_ProType__c = 'ET';
- insert Order1;
- Consumable_orderdetails__c Orderdet = new Consumable_orderdetails__c();
- Orderdet.Name = 'OCM_01_00101';
- Orderdet.Consumable_order__c = Order1.Id;
- Orderdet.RecordTypeId = System.Label.RT_ConOrderDetail1_Order;
- Orderdet.Consumable_Product__c = pro1.Id;
- Orderdet.Consumable_count__c = 4;
- insert Orderdet;
- Consumable_order_details2__c Orderdet1 = new Consumable_order_details2__c();
- Orderdet1.Name = 'OCM_01_001001';
- Orderdet1.Consumable_order_minor__c = Order1.Id;
- Orderdet1.Consumable_Product__c = pro1.Id;
- Orderdet1.Asset_Model_No__c = 'Test01';
- Orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- Orderdet1.Bar_Code__c = '01049531702003111115120017181000105ZK250BXJRF';
- Orderdet1.Cancellation_Date__c = null;
- Orderdet1.TracingCode__c = 'BXJRF';
- Orderdet1.SerialLotNo__c = '5ZK';
- insert Orderdet1;
- System.debug('Orderdet1:' + Orderdet1);
- Consumable_order_details2__c Orderdet2 = new Consumable_order_details2__c();
- Orderdet2.Name = 'OCM_01_001001';
- Orderdet2.Consumable_order_minor__c = Order1.Id;
- Orderdet2.Consumable_Product__c = pro1.Id;
- Orderdet2.Asset_Model_No__c = 'Test01';
- Orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail2_Delivery;
- Orderdet2.Bar_Code__c = '01049531702003111115120017181234105ZK250BXJRF';
- Orderdet1.Cancellation_Date__c = null;
- Orderdet2.TracingCode__c = 'BXJRF';
- Orderdet2.SerialLotNo__c = '5ZK';
- insert Orderdet2;
-
- PageReference page = new PageReference('/apex/ArriveGoods?ArrType=Arr');
- System.Test.setCurrentPage(page);
- ArriveGoodsController Controller = new ArriveGoodsController();
- System.Test.startTest();
- Controller.init();
- Controller.barcode = '01049531702003111115120017181000105ZK250BXJRF';
- Controller.SearchPro();
- Controller.ArriveGoodsConfim();
- List<Consumable_order_details2__c> ins = [
- SELECT Id, Name
- FROM Consumable_order_details2__c
- ];
System.Test.stopTest();
}
}
diff --git a/force-app/main/default/classes/DealerInquiryModifyStateController.cls b/force-app/main/default/classes/DealerInquiryModifyStateController.cls
index 2d8fda5..0cbe0b6 100644
--- a/force-app/main/default/classes/DealerInquiryModifyStateController.cls
+++ b/force-app/main/default/classes/DealerInquiryModifyStateController.cls
@@ -51,9 +51,6 @@
private String strColumus;
private String strRtColumus;
- //add by Link 2023-6-2
- public String remindMsg { get; set; }
-
@TestVisible
private String accTypeForSort = null;
private static Integer oppLimit = 500;
@@ -132,7 +129,6 @@
}
public PageReference init() {
- remindMsg = '';
PartnerSoapSforceCom.Soap soap = new PartnerSoapSforceCom.Soap();
soap.SessionHeader = new PartnerSoapSforceCom.SessionHeader_element();
soap.SessionHeader.sessionId = UserInfo.getSessionId();
@@ -424,8 +420,6 @@
'鍙栧緱鏈�杩戠殑 ' + oppCount + ' 鏉℃暟鎹�'
)
);
- //add by Link 2023-6-2
- remindMsg = '鍙栧緱鏈�杩戠殑 ' + oppCount + ' 鏉℃暟鎹�';
} else if (!String.isBlank(this.sortKey)) {
if (oppCount > oppLimit) {
ApexPages.addmessage(
@@ -434,8 +428,6 @@
'鏁版嵁瓒呰繃' + oppLimit + '浠讹紝鍙樉绀哄墠' + oppLimit + '浠�'
)
);
- //add by Link 2023-6-2
- remindMsg = '鏁版嵁瓒呰繃' + oppLimit + '浠讹紝鍙樉绀哄墠' + oppLimit + '浠�';
} else {
ApexPages.addmessage(
new ApexPages.message(
@@ -443,8 +435,6 @@
'鍏辨湁 ' + oppCount + ' 鏉℃暟鎹�'
)
);
- //add by Link 2023-6-2
- remindMsg = '鍏辨湁 ' + oppCount + ' 鏉℃暟鎹�';
}
} else {
ApexPages.addmessage(
@@ -453,8 +443,6 @@
'鍏辨湁 ' + oppCount + ' 鏉℃暟鎹�'
)
);
- //add by Link 2023-6-2
- remindMsg = '鍏辨湁 ' + oppCount + ' 鏉℃暟鎹�';
}
}
//妫�绱㈡潯浠讹細鏁版嵁瀛楁1锛屾暟鎹瓧娈�2锛屾暟鎹瓧娈�3鍧囨弧瓒宠繘鍏ユ鏂规硶 鍒ゆ柇澶氱鎯呭喌
@@ -657,8 +645,6 @@
ApexPages.addmessage(
new ApexPages.message(ApexPages.severity.INFO, '淇濆瓨瀹屼簡')
);
- //add by Link 2023-6-2
- remindMsg = '淇濆瓨瀹屼簡';
} catch (Exception e) {
//ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇风‘瀹氱瀹ゅ垎绫诲拰浜у搧鍖哄垎鐨勫叧绯�'));
}
diff --git a/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls b/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls
index b1f09b4..e4670e5 100644
--- a/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls
+++ b/force-app/main/default/classes/DealerInquiryModifyStateControllerTest.cls
@@ -64,7 +64,7 @@
opp.Name = 'GZ-SP-NFM007_1';
opp.Trade__c = '鍐呰部';
opp.StageName = '寮曞悎';
- opp.CloseDate = Date.today();
+ opp.CloseDate = date.newinstance(2022, 11, 30);
opp.Stock_apply_status__c = '鐢宠涓�';
insert opp;
Test.startTest();
@@ -102,9 +102,8 @@
user.Alias = '銉嗐儲';
user.CommunityNickname = '銉嗐偣銉堛儲銉笺偠銉�';
user.SalesManager__c = UserInfo.getUserId();
- System.runAs(new User(Id = UserInfo.getUserId())) {
- insert user;
- }
+
+ insert user;
List<user> users = [
SELECT Id, Name, LastName, FirstName
FROM User
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index c3ea4d3..2ec7082 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -206,8 +206,8 @@
fieldName: "prodName",
wrapText: true,
hideDefaultActions: true,
- sortable: true,
- initialWidth: 150
+ sortable: true
+ // initialWidth: 150
});
cols.push({
label: "瑙勬牸",
@@ -222,28 +222,28 @@
fieldName: "prodSFDAStatus",
wrapText: true,
hideDefaultActions: true,
- initialWidth: 97
+ initialWidth: 84
});
cols.push({
label: "娉ㄥ唽璇佺紪鐮佸彿",
fieldName: "approbation_No",
wrapText: true,
hideDefaultActions: true,
- initialWidth: 120
+ initialWidth: 104
});
cols.push({
label: "娉ㄥ唽璇佹晥鏈�",
fieldName: "expiration_Date",
wrapText: true,
hideDefaultActions: true,
- initialWidth: 105
+ initialWidth: 95
});
cols.push({
label: "绗�3鍒嗙被",
fieldName: "prodCategory3",
wrapText: true,
hideDefaultActions: true,
- initialWidth: 78,
+ initialWidth: 84,
sortable: true
});
cols.push({
@@ -251,7 +251,7 @@
fieldName: "prodCategory4",
wrapText: true,
hideDefaultActions: true,
- initialWidth: 107,
+ initialWidth: 84,
sortable: true
});
cols.push({
@@ -259,7 +259,7 @@
fieldName: "prodCategory5",
wrapText: true,
hideDefaultActions: true,
- initialWidth: 80,
+ initialWidth: 84,
sortable: true
});
if (this.cansee) {
@@ -269,7 +269,7 @@
typeAttributes: { minimumFractionDigits: 2 },
fieldName: "prodIntraTradeList",
hideDefaultActions: true,
- initialWidth: 80
+ initialWidth: 78
});
}
if (this.editAble) {
@@ -285,14 +285,14 @@
valueType: "Number"
},
hideDefaultActions: true,
- initialWidth: 80
+ initialWidth: 78
});
} else {
cols.push({
label: "閲囪喘鏁伴噺",
fieldName: "consumableCount",
hideDefaultActions: true,
- initialWidth: 80,
+ initialWidth: 78,
cellAttributes: { alignment: "right" }
});
}
@@ -300,14 +300,14 @@
label: "鍦ㄥ簱鏁颁笅闄�",
fieldName: "lowerlimit",
hideDefaultActions: true,
- initialWidth: 100,
+ initialWidth: 86,
cellAttributes: { alignment: "right" }
});
cols.push({
label: "鍦ㄥ簱鏁颁笂闄�",
fieldName: "upperlimit",
hideDefaultActions: true,
- initialWidth: 100,
+ initialWidth: 86,
cellAttributes: { alignment: "right" }
});
// cols.push({label:'鏈夋晥鏈熷簱瀛�(鐩�)',fieldName:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
@@ -322,14 +322,14 @@
boxPrice: "鐩�"
},
hideDefaultActions: true,
- initialWidth: 146,
+ initialWidth: 122,
sortable: true
});
cols.push({
label: "鏈夋晥鏈熷簱瀛�(涓�)",
fieldName: "allnumber_piece",
hideDefaultActions: true,
- initialWidth: 126,
+ initialWidth: 112,
cellAttributes: { alignment: "right" }
});
return cols;
diff --git a/force-app/main/default/pages/DealerInquiryModifyState.page b/force-app/main/default/pages/DealerInquiryModifyState.page
index 9041254..5ffea39 100644
--- a/force-app/main/default/pages/DealerInquiryModifyState.page
+++ b/force-app/main/default/pages/DealerInquiryModifyState.page
@@ -1,11 +1,9 @@
<apex:page
controller="DealerInquiryModifyStateController"
- docType="html-5.0"
showHeader="false"
sidebar="false"
id="allPage"
action="{!init}"
- lightningStyleSheets="true"
>
<head>
<title>缁忛攢鍟嗘壒閲忎慨鏀硅浠风姸鎬�</title>
@@ -24,48 +22,42 @@
div.inline {
float: left;
}
-
.clearBoth {
clear: both;
}
-
div.reportBlock table.list {
width: auto;
}
-
div#out_Div {
/* 銇撱亾銇儤銉冦儉銈掓牸绱� */
position: relative;
overflow: hidden;
float: left;
- width: 50% !important;
+ width: 50.3%;
}
-
div#out_Div_L {
position: relative;
overflow: hidden;
float: left;
- width: 50% !important;
- border-right: 2px solid #808383;
+ width: 48%;
+ border-right: 2px solid #000;
}
-
div#in_Div {
/* tbody銇屽叆銇ｃ仸銇勩倠銆傘亾銇撱亴銈广偗銉兗銉璞�*/
position: relative;
overflow: auto; /*銈广偗銉兗銉儛銉�*/
float: left;
- width: 50% !important;
- height: 600px;
+ width: 51.8%;
+ height: 373px; /* tbody銈掕〃绀恒仚銈嬮珮銇曘�佸緦銇s銇仸瑾挎暣 */
}
-
div#in_Div_L {
position: relative;
overflow-x: auto;
overflow-y: hidden;
float: left;
- width: 50% !important;
- height: 600px;
- border-right: 2px solid #808383;
+ width: 48%;
+ height: 373px;
+ border-right: 2px solid #000;
}
body .pbBody table.list tr.headerRow td {
@@ -74,13 +66,11 @@
font-weight: normal;
padding: 0px 0px 0px 1px;
}
-
body .pbBody table.list tr.headerRow td.header1 {
text-align: center;
font-weight: normal;
padding: 0px 0px 0px 0px;
}
-
body .pbBody table.list tr.dataRow td {
box-sizing: border-box;
padding: 0px 0px 0px 1px;
@@ -88,7 +78,6 @@
vertical-align: middle;
word-break: break-all;
}
-
body .pbBody table.list tr.dataRow td.dataCellBorder {
/* 銇勩倝銇亜銆佷娇銇ｃ仸銇勩仾銇� */
padding: 0px 0px 0px 1px;
@@ -96,14 +85,12 @@
vertical-align: middle;
word-break: break-all;
}
-
body .pbBody table.list tr.dataRow td.dataCellBorder1 {
padding: 0px 0px 0px 1px;
border-width: 0px 0px 1px 1px;
vertical-align: middle;
word-break: break-all;
}
-
@-moz-document url-prefix() {
body .pbBody table.list tr.dataRow td.dataCellBorder1 {
padding: 0px 0px 0px 0px;
@@ -116,15 +103,12 @@
table.list td {
width: 100px;
}
-
table.list td select {
width: 95%;
}
-
table.list td input {
width: 95%;
}
-
table.list td textarea {
height: 50px;
width: 90%;
@@ -305,12 +289,14 @@
table.list .col_OPD_USG400__c {
width: 118px;
} /*OPD瀵硅薄锛歎SG-400*/
+
table.list .col_Hospital_Name__c {
width: 139px;
} /*鍖婚櫌鍚�*/
table.list .col_Department_Name__c {
width: 60px;
} /*绉戝鍚嶇О*/
+
table.list .col_Province_formula__c {
width: 78px;
} /*鐪�(鍏紡)*/
@@ -333,13 +319,14 @@
width: 178px;
} /*娲诲姩璁″垝(閿�鍞�)*/
/*table.list .col_Link1 {width:58px;}
- table.list .col_Link2 {width:58px;}
- table.list .col_Link3 {width:58px;}
- table.list .col_Link4 {width:58px;}
- table.list .col_Link5 {width:58px;}
- table.list .col_Link6 {width:58px;}
- table.list .col_Link7 {width:58px;}
- table.list .col_Link8 {width:58px;}*/
+table.list .col_Link2 {width:58px;}
+table.list .col_Link3 {width:58px;}
+table.list .col_Link4 {width:58px;}
+table.list .col_Link5 {width:58px;}
+table.list .col_Link6 {width:58px;}
+table.list .col_Link7 {width:58px;}
+table.list .col_Link8 {width:58px;}*/
+
body .pbBody table.list tr.headerRow td.colViewing {
/* 銉囥儠銈┿儷銉堝�ゃ�佹渶灏忓寲銈€偆銈炽兂銈掕〃绀� */
background-image: url("{!URLFOR($Resource.IconResizeMinus_5)}");
@@ -361,19 +348,8 @@
border-width: 0px;
}
/*.zxk{
- margin-bottom: 3px;
- }*/
- .buttonStyle {
- font-size: 14px !important;
- font-family: "sans-serif" !important;
- font-weight: 500 !important;
- width: 70px !important;
- height: 32px !important;
- border-radius: 4px !important;
- opacity: 1 !important;
- background: #090f84 !important;
- color: #ffffff !important;
- }
+ margin-bottom: 3px;
+}*/
</style>
<script type="text/javascript">
var heightAjustment = 120;
@@ -385,23 +361,12 @@
}
</script>
</head>
- <apex:slds />
- <div id="spinner" class="slds-spinner_container" style="display: none">
- <div
- role="status"
- class="slds-spinner slds-spinner_medium slds-spinner_brand"
- >
- <span class="slds-assistive-text">Loading</span>
- <div class="slds-spinner__dot-a"></div>
- <div class="slds-spinner__dot-b"></div>
- </div>
- </div>
<apex:form id="allForm">
<apex:actionFunction
name="saveAndSearch"
action="{!save}"
rerender="allPanel"
- oncomplete="closeSpinner();expandAll();"
+ oncomplete="unblockUI();expandAll();"
>
<apex:param name="firstParam" assignTo="{!saveType}" value="" />
</apex:actionFunction>
@@ -409,7 +374,7 @@
name="saveAndSort"
action="{!save}"
rerender="allPanel"
- oncomplete="closeSpinner();expandAll();"
+ oncomplete="unblockUI();expandAll();"
>
<apex:param name="firstParam" assignTo="{!saveType}" value="" />
<apex:param name="secondParam" assignTo="{!sortKey}" value="" />
@@ -418,163 +383,128 @@
name="searchOpp"
action="{!chick}"
rerender="allPanel"
- oncomplete="closeSpinner();expandAll();"
+ oncomplete="unblockUI();expandAll();"
/>
<apex:actionFunction
name="sortTable"
action="{!sortTable}"
rerender="allPanel"
- oncomplete="closeSpinner();expandAll();"
+ oncomplete="unblockUI();expandAll();"
>
<apex:param name="firstParam" assignTo="{!sortKey}" value="" />
</apex:actionFunction>
<apex:outputPanel id="allPanel">
<div id="zxk" style="margin-bottom: -15px">
<apex:pageBlock id="searchBlock" mode="maindetail">
- <table
- style="border-bottom-width: 0px; font-size: 14px; color: #696969"
- >
+ <!-- tabStyle="Report"绾㈣壊 mode="maindetail" 娑堝け mode="edit" 鍙樺ぇ -->
+ <!-- <apex:pageMessages ></apex:pageMessages> -->
+ <!-- <table style="border-bottom-width: 0px; font-size:12px;">
+ <tr>
+ <td width="150px">
+ <apex:commandButton action="{!save}" value="淇濆瓨" rerender="allPanel" onclick="blockme();" oncomplete="unblockUI();expandAll();" style="height:30px;width:50px;"/>
+ <apex:commandButton value="妫�绱�" onclick="searchOppJs_Account();return false;" style="height:30px;width:70px;"/>
+ </td>
+ <td width="1000px">
+ <apex:pageMessages />
+ </td>
+ </tr>
+ </table> -->
+ <table style="border-bottom-width: 0px; font-size: 12px">
<tr>
- <td width="283px">
- <div style="color: #696969">
- 缁忛攢鍟嗗尰闄�
- <apex:inputText
- styleClass="slds-input"
- value="{!accSearch}"
- style="width: 170px"
- />
- </div>
- </td>
+ <!-- <td width="150px">鍒嗙被 <apex:selectList value="{!accType}" size="1" style="width:80px" id="accType"><apex:selectOptions value="{!accTypeOpts}" id="accTypeOptsId"/></apex:selectList></td> -->
<td width="250px">
- <div style="color: #696969">
- 閿�鍞媴褰�
- <apex:inputText
- styleClass="slds-input"
- value="{!aooSearch}"
- style="width: 150px"
- />
- </div>
+ 缁忛攢鍟嗗尰闄� <apex:inputText
+ value="{!accSearch}"
+ style="width: 170px"
+ />銆�
+ </td>
+ <td></td>
+ <td width="250px">
+ 閿�鍞媴褰� <apex:inputText
+ value="{!aooSearch}"
+ style="width: 150px"
+ />銆�
</td>
<td width="230px">
- <div style="color: #696969">
- 鏄剧ず
- <apex:selectList
- styleClass="slds-input slds-combobox__input"
- style="width: 100px"
- value="{!limits}"
- size="1"
- onchange="searchOppJs_Account();return false;"
- >
- <apex:selectOptions value="{!limitOpts}" />
- </apex:selectList>
- 鏉℃暟鎹�
- </div>
+ 鏄剧ず
+ <apex:selectList
+ value="{!limits}"
+ size="1"
+ onchange="searchOppJs_Account();return false;"
+ >
+ <apex:selectOptions value="{!limitOpts}" /></apex:selectList
+ >銆�鏉℃暟鎹�
</td>
- <td>
+ <!-- <td width="10px"></td> -->
+ <td width="70px">
<a
href="#"
onclick="expandAll();return false;"
- style="text-decoration: underline; color: #696969"
+ style="text-decoration: underline"
>鍏ㄩ儴灞曞紑</a
>
</td>
+ <!-- text-decoration: underline; -->
</tr>
</table>
- <p style="height: 10px"></p>
- <table
- style="
- border-bottom-width: 0px;
- font-size: 12px;
- font-size: 14px;
- color: #696969;
- "
- >
+ <table style="border-bottom-width: 0px; font-size: 12px">
<tr>
- <td width="220px">
- <div style="color: #696969">
- <font>鏁� 鎹� 瀛� 娈�</font
- >
- <apex:selectList
- styleClass="slds-input slds-combobox__input"
- value="{!numtext1}"
- size="1"
- style="width: 110px"
- >
- <apex:selectOptions value="{!textOpts}" />
- </apex:selectList>
- </div>
+ <td width="200px">
+ <font>鏁� 鎹� 瀛� 娈� </font>
+ <apex:selectList
+ value="{!numtext1}"
+ size="1"
+ style="width: 110px"
+ ><apex:selectOptions value="{!textOpts}"
+ /></apex:selectList>
</td>
<td width="130px">
<apex:selectList
- styleClass="slds-input slds-combobox__input"
value="{!numtext2}"
size="1"
style="width: 110px"
- >
- <apex:selectOptions value="{!equalOpts}" />
- </apex:selectList>
+ ><apex:selectOptions value="{!equalOpts}"
+ /></apex:selectList>
</td>
- <td width="183px">
- <apex:inputText
- styleClass="slds-input"
- style="width: 150px"
- value="{!numtext}"
- />
+ <td width="200px">
+ <apex:inputText style="width: 150px" value="{!numtext}" />
</td>
- <td width="188px">
- <!-- slds-button slds-button_brand -->
+ <td width="150px">
<apex:commandButton
- styleClass="buttonStyle"
value="妫�绱�"
onclick="searchOppJs_Account();return false;"
- style="height: 30px; width: 70px"
+ style="height: 30px; width: 50px"
/>
<apex:commandButton
- styleClass="buttonStyle"
action="{!save}"
value="淇濆瓨"
rerender="allPanel"
- onclick="showSpinner();"
- oncomplete="closeSpinner();expandAll();"
- style="height: 30px; width: 70px"
+ onclick="blockme();"
+ oncomplete="unblockUI();expandAll();"
+ style="height: 30px; width: 50px"
/>
</td>
- <td>
- <!-- <apex:pageMessages /> -->
- <!-- add by Link 2023-6-2 -->
- <apex:outputPanel
- rendered="{! remindMsg != '' && remindMsg != null}"
- >
- <div
- style="
- border: 1px solid #d4d4d4;
- height: 32px;
- border-radius: 5px;
- color: #ff6a00;
- font-size: 18px;
- "
- >
- <span
- class="slds-icon_container slds-icon-custom-custom53 slds-icon-text-default"
- >
- <svg aria-hidden="true" class="slds-icon">
- <use
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xlink:href="/apexpages/slds/latest/assets/icons/custom-sprite/svg/symbols.svg#custom53"
- ></use>
- </svg>
- <span class="slds-assistive-text">Custom 53</span>
- </span>
- <strong style="padding-top: 2px"> {!remindMsg}</strong>
- </div>
- </apex:outputPanel>
+ <td width="500px">
+ <apex:pageMessages />
</td>
</tr>
+ <!-- <tr>
+ <td width="110px">
+ <font> 鏃� 鏈� </font>
+ <apex:selectList value="{!timetext1}" size="1" style="width:110px"><apex:selectOptions value="{!timeOpts}"/></apex:selectList>
+ </td>
+ <td>
+ 浠�<apex:inputField style="width:150px" value="{!tmpAO.MaxActivityDate__c}"/> -->
+ <!-- <apex:selectList value="{!timetext2}" size="1" style="width:110px"><apex:selectOptions value="{!timeequalOpts}"/></apex:selectList> -->
+ <!-- </td>
+ <td>
+ 鍒�<apex:inputField style="width:150px" value="{!tmpBO.MaxActivityDate__c}"/>
+ </td>
+ </tr> -->
</table>
</apex:pageBlock>
</div>
- <!-- <div style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;"> -->
- <apex:pageBlock id="oppBlock" mode="maindetail">
+ <apex:pageBlock id="oppBlock">
<!-- <apex:pageblocksection columns="1" id="oppSection"> -->
<apex:outputPanel>
<apex:inputHidden id="oppCount" value="{!oppCount}" />
@@ -585,7 +515,7 @@
style="
border-bottom-width: 0px;
width: 1100px;
- font-size: 14px !important;
+ font-size: 11px;
border-spacing: 0;
"
border=""
@@ -606,12 +536,7 @@
<a
href="#"
onclick="sortTableJs_Account1('{!cnt + titleLeft.size}');return false;"
- style="
- text-decoration: underline;
- color: black;
- font-size: 14px !important;
- font-weight: bold;
- "
+ style="text-decoration: underline"
><apex:outputText value="{!t}" /></a
>{!sortOrder[cnt + titleLeft.size]}
</td>
@@ -627,7 +552,7 @@
style="
border-bottom-width: 0px;
width: 2000px;
- font-size: 14px !important;
+ font-size: 11px;
border-spacing: 0;
"
border=""
@@ -647,12 +572,7 @@
<a
href="#"
onclick="sortTableJs_Account1('{!cnt}');return false;"
- style="
- text-decoration: underline;
- color: black;
- font-size: 14px !important;
- font-weight: bold;
- "
+ style="text-decoration: underline"
><apex:outputText value="{!t}" /></a
>{!sortOrder[cnt]}
</td>
@@ -670,7 +590,7 @@
style="
border-bottom-width: 0px;
width: 1100px;
- font-size: 13px;
+ font-size: 11px;
border-spacing: 0;
"
border=""
@@ -680,7 +600,6 @@
<apex:repeat value="{!oppRecords}" var="or" id="oppTable">
<tr
class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}"
- style="height: 35px"
onmouseover="if (window.hiOn){hiOn(this);} "
onmouseout="if (window.hiOff){hiOff(this);} "
onblur="if (window.hiOff){hiOff(this);}"
@@ -695,7 +614,7 @@
<!-- <apex:outputLink rendered="{!c[0]=='Name'}" value="/{!or.opp.Id}" target="LINK_{!or.opp.Id}"><apex:outputField rendered="{!c[0]=='Name'}" value="{!or.opp[c[0]]}" /></apex:outputLink> -->
<!-- vivek end -->
<!-- <apex:outputField id="q1111111111" rendered="{!(c.size==1 && columnRightRW[c[0]]=='r' && or.opp.Id <> null && c[0] <> 'Name' && (c[0] <> 'Opp_Changed_Field__c' ||(c[0] == 'Opp_Changed_Field__c' &&
- or.opp.Opp_Changed_Field__c != '璇环闃舵鍙戠敓浜嗗彉鍖�' &&or.opp.Opp_Changed_Field__c != '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' &&or.opp.Opp_Changed_Field__c != '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' && or.opp.Opp_Changed_Field__c != '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�')))}" value="{!or.opp[c[0]]}" /> && or.opp.Oly_Inquiry_Status1__c <> null AgcOpp -->
+ or.opp.Opp_Changed_Field__c != '璇环闃舵鍙戠敓浜嗗彉鍖�' &&or.opp.Opp_Changed_Field__c != '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' &&or.opp.Opp_Changed_Field__c != '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' && or.opp.Opp_Changed_Field__c != '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�')))}" value="{!or.opp[c[0]]}" /> && or.opp.Oly_Inquiry_Status1__c <> null AgcOpp -->
<apex:outputField
rendered="{!c[0] == 'Change_To_Opportunity_T__c' }"
value="{!or.opp[c[0]]}"
@@ -706,20 +625,20 @@
value="{!or.opp[c[0]]}"
/>
<!-- <apex:outputField id="q1111111111" rendered="{!( columnRightRW[c[0]]=='r' && c[0] <> 'Name' && (c[0] <> 'StageName__c' ||(c[0] == 'StageName__c' &&
- or.opp.Oly_Inquiry_Stage__c != '璇环闃舵鍙戠敓浜嗗彉鍖�' &&or.opp.Oly_Inquiry_Stage__c != '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' &&or.opp.Oly_Inquiry_Stage__c != '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' && or.opp.Oly_Inquiry_Stage__c != '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�')))}" value="{!or.opp[c[0]]}" /> -->
+ or.opp.Oly_Inquiry_Stage__c != '璇环闃舵鍙戠敓浜嗗彉鍖�' &&or.opp.Oly_Inquiry_Stage__c != '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' &&or.opp.Oly_Inquiry_Stage__c != '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' && or.opp.Oly_Inquiry_Stage__c != '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�')))}" value="{!or.opp[c[0]]}" /> -->
<!-- <div style ="color:red"> -->
<!-- <apex:outputField id="q2222222" rendered="{!(c.size==1 && columnRightRW[c[0]]=='r' && or.opp.Id <> null && c[0] <> 'Name' && c[0] == 'Opp_Changed_Field__c' && (
- or.opp.Opp_Changed_Field__c == '璇环闃舵鍙戠敓浜嗗彉鍖�' || or.opp.Opp_Changed_Field__c == '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' || or.opp.Opp_Changed_Field__c == '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' || or.opp.Opp_Changed_Field__c == '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�'))}" value="{!or.opp[c[0]]}" /> -->
+ or.opp.Opp_Changed_Field__c == '璇环闃舵鍙戠敓浜嗗彉鍖�' || or.opp.Opp_Changed_Field__c == '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' || or.opp.Opp_Changed_Field__c == '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' || or.opp.Opp_Changed_Field__c == '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�'))}" value="{!or.opp[c[0]]}" /> -->
<!-- <apex:outputField id="q2222222" rendered="{!(c.size==1 && columnRightRW[c[0]]=='r' && c[0] <> 'Name' && c[0] == 'StageName__c' && (
or.opp.Oly_Inquiry_Stage__c == '璇环闃舵鍙戠敓浜嗗彉鍖�' || or.opp.Oly_Inquiry_Stage__c == '棰勬祴绛剧害鏃ュ彂鐢熶簡鍙樺寲' || or.opp.Oly_Inquiry_Stage__c == '鍖婚櫌鍚堝悓閲戦鍙戠敓浜嗗彉鍖�' || or.opp.Oly_Inquiry_Stage__c == '璁㈣揣閲戦鍙戠敓浜嗗彉鍖�'))}" value="{!or.opp[c[0]]}" />
-
- </div> -->
+
+ </div> -->
<!-- <apex:inputField rendered="{!(c.size==1 && columnRightRW[c[0]]=='w' && or.opp.Id <> null && c[0] <> 'Name')}" value="{!or.opp[c[0]]}" onchange="setChangeFlgRight('{!or.lineNo}')"/>
- <apex:outputPanel rendered="{!(c.size==1 && columnRightRW[c[0]]=='wm' && c[0] <> 'Name' && or.opp.Id <> null)}" layout="none">
- <div class="requiredInput_r">
- <div class="requiredBlock_r"></div>
- <apex:inputField value="{!or.Opp[c[0]]}" onchange="setChangeFlg('{!or.lineNo}')"/>
- </div>
+ <apex:outputPanel rendered="{!(c.size==1 && columnRightRW[c[0]]=='wm' && c[0] <> 'Name' && or.opp.Id <> null)}" layout="none">
+ <div class="requiredInput_r">
+ <div class="requiredBlock_r"></div>
+ <apex:inputField value="{!or.Opp[c[0]]}" onchange="setChangeFlg('{!or.lineNo}')"/>
+ </div>
</apex:outputPanel> -->
<apex:outputField
rendered="{!c[0] == 'Strategic_department_Class_Name__c'}"
@@ -727,7 +646,6 @@
/>
<apex:inputField
- styleClass="slds-form-element"
rendered="{!( columnRightRW[c[0]]=='w' && c[0] <> 'Strategic_department_Class_Name__c' && c[0] <> 'Change_To_Opportunity_T__c' && c[0] <> 'Name')}"
value="{!or.opp[c[0]]}"
onchange="setChangeFlgRight('{!or.lineNo}')"
@@ -739,7 +657,6 @@
<div class="requiredInput_r">
<div class="requiredBlock_r"></div>
<apex:inputField
- styleClass="slds-form-element"
value="{!or.Opp[c[0]]}"
onchange="setChangeFlg('{!or.lineNo}')"
/>
@@ -790,7 +707,7 @@
style="
border-bottom-width: 0px;
width: 2000px;
- font-size: 13px;
+ font-size: 11px;
border-spacing: 0;
"
border=""
@@ -800,7 +717,6 @@
<apex:repeat value="{!oppRecords}" var="or" id="oppTable_L">
<tr
class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}"
- style="height: 35px"
onmouseover="if (window.hiOn){hiOn(this);} "
onmouseout="if (window.hiOff){hiOff(this);} "
onblur="if (window.hiOff){hiOff(this);}"
@@ -848,11 +764,10 @@
<!-- OCSM璇环 -->
<!-- <apex:outputLink target="_blank" rendered="{!c[0]=='Change_To_Opportunity__c'}" value="/{!or.AgcOpp[c[0]]}" >
<apex:outputText value="{!or.AgcOpp.Agency__r.Name }" />
- </apex:outputLink> -->
+ </apex:outputLink> -->
<!-- 蹇呭～瀛楁 -->
<!-- <apex:outputField rendered="{!(c[0]<>'Name' && c[0]<>'Agency_Hospital__c' && c[0]<>'Product_Category1__c' && c[0]<>'Product_Category2__c' && c[0]<>'Product_Category3__c' && c[0]<>'Agency_Person__c' && c[0]<>'Agency__c' && c[0]<>'Change_To_Opportunity__c' && columnLeftRW[c[0]]=='wm')}" value="{!or.AgcOpp[c[0]] }"/> -->
<apex:inputField
- styleClass="slds-form-element"
rendered="{!(c[0]<>'Name' && c[0]<>'Product_Category1__c' && c[0]<>'Product_Category2__c' && c[0]<>'Product_Category3__c' && c[0]<>'Agency_Person__c' && c[0]<>'Agency__c' && c[0]<>'Change_To_Opportunity__c' && columnLeftRW[c[0]]=='wm')}"
value="{!or.AgcOpp[c[0]] }"
onchange="setChangeFlg('{!or.lineNo}')"
@@ -866,7 +781,6 @@
<!-- <apex:outputField rendered="{!(c[0]<>'Name' && columnLeftRW[c[0]]<>'w')}" value="{!or.AgcOpp[c[0]] }"/> -->
<!-- 鍙紪杈戠殑瀛楁 -->
<apex:inputField
- styleClass="slds-form-element"
value="{!or.AgcOpp[c[0]]}"
rendered="{!columnLeftRW[c[0]]=='w'}"
onchange="setChangeFlg('{!or.lineNo}')"
@@ -883,7 +797,6 @@
<!-- /in_Div -->
</apex:outputPanel>
</apex:pageBlock>
- <!-- </div> -->
<script type="text/javascript">
j$(function () {
var tableWidth = 0;
@@ -903,7 +816,6 @@
// list 銇� headerRow 銇� td銇� toggleWidth() 銈掕拷鍔�
bindTdToggleWidth();
- // j$("input").attr("styleClass","slds-input");
});
var elements = document.getElementsByTagName("select");
for (i = 0; i < elements.length; i++) {
diff --git a/force-app/main/default/pages/DealerInquiryModifyState.page-meta.xml b/force-app/main/default/pages/DealerInquiryModifyState.page-meta.xml
index 1ff0fd6..5831e52 100644
--- a/force-app/main/default/pages/DealerInquiryModifyState.page-meta.xml
+++ b/force-app/main/default/pages/DealerInquiryModifyState.page-meta.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>39.0</apiVersion>
+ <apiVersion>35.0</apiVersion>
<availableInTouch>true</availableInTouch>
<confirmationTokenRequired>false</confirmationTokenRequired>
<label>DealerInquiryModifyState</label>
diff --git a/force-app/main/default/staticresources/lexdatatable.css b/force-app/main/default/staticresources/lexdatatable.css
index 1b80c8f..97cb13c 100644
--- a/force-app/main/default/staticresources/lexdatatable.css
+++ b/force-app/main/default/staticresources/lexdatatable.css
@@ -18,7 +18,7 @@
.slds-table th,
.slds-table td {
- font-size: 16px;
+ font-size: 14px;
}
diff --git a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
index c99b289..ae0c34a 100644
--- a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
+++ b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
@@ -333,11 +333,14 @@
update consumableOrderlist;
}
}
- //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
+
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鑾峰彇鎵�鏈夌殑record ID start by 寮犵帀灞�
- //List<RecordType> allrtList = [select Id,DeveloperName from RecordType where SobjectType = 'Consumable_orderdetails__c'];
+ List<RecordType> allrtList = [
+ SELECT Id, DeveloperName
+ FROM RecordType
+ WHERE SobjectType = 'Consumable_orderdetails__c'
+ ];
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鑾峰彇鎵�鏈夌殑record ID end by 寮犵帀灞�
- //Back up by DTT - Li Jun 2023-06-14 Start
//鍒拌揣鍜岃繑鍝佹椂,鐢熸垚鎴栦慨鏀规秷璐瑰搧璁㈣揣鏄庣粏
Set<String> arrivedSet = new Set<String>();
Set<String> returnSet = new Set<String>();
@@ -434,27 +437,22 @@
ar.get('Asset_Model_No__c');
keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
}
- //Back up by DTT - Li Jun 2023-06-14 Start
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select start by 寮犵帀灞�
- // List<RecordType> rtList = new List<RecordType>();
- // for(RecordType rtl : allrtList){
- // if('Detail1_Arrival'.equals(rtl.DeveloperName)){
- // rtList.add(rtl);
- // }
- // }
+ List<RecordType> rtList = new List<RecordType>();
+ for (RecordType rtl : allrtList) {
+ if ('Detail1_Arrival'.equals(rtl.DeveloperName)) {
+ rtList.add(rtl);
+ }
+ }
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select end by 寮犵帀灞�
- //Back up by DTT - Li Jun 2023-06-14 End
/* 2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype start by 寮犵帀灞�
List<RecordType> rtList = [select Id from RecordType where DeveloperName = 'Detail1_Arrival' and SobjectType = 'Consumable_orderdetails__c'];
2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype end by 寮犵帀灞� */
- //Back up by DTT - Li Jun 2023-06-14 Start
- // Id recordTypeId = null;
- // if (rtList.size() > 0) recordTypeId = rtList[0].Id;
- //Back up by DTT - Li Jun 2023-06-14 End
- Id recordtypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName()
- .get('Detail1_Arrival')
- .getRecordTypeId();
+ Id recordTypeId = null;
+ if (rtList.size() > 0)
+ recordTypeId = rtList[0].Id;
+
results = [
SELECT Consumable_order__c, count(Id) noCount
FROM Consumable_orderdetails__c
@@ -697,24 +695,23 @@
ar.get('Asset_Model_No__c');
keyCount.put(key, Integer.valueOf(ar.get('recordCount')));
}
- //Back up by DTT - Li Jun 2023-06-14 Start for reduce soql times
+
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select start by 寮犵帀灞�
- // List<RecordType> rtList = new List<RecordType>();
- // for(RecordType rtl : allrtList){
- // if('Detail1_ReturnGoods'.equals(rtl.DeveloperName)){
- // rtList.add(rtl);
- // }
- // }
+ List<RecordType> rtList = new List<RecordType>();
+ for (RecordType rtl : allrtList) {
+ if ('Detail1_ReturnGoods'.equals(rtl.DeveloperName)) {
+ rtList.add(rtl);
+ }
+ }
// 2018骞�8鏈�9鏃� HWAG-B3D9UV 鏇夸唬涓嬮潰SQL select end by 寮犵帀灞�
- //Back up by DTT - Li Jun 2023-06-14 End
+
/* 2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype start by 寮犵帀灞�
List<RecordType> rtList = [select Id from RecordType where DeveloperName = 'Detail1_ReturnGoods' and SobjectType = 'Consumable_orderdetails__c'];
2018骞�8鏈�9鏃� HWAG-B3D9UV 鍘熻幏鍙� recordtype end by 寮犵帀灞� */
- Id recordTypeId = Schema.SObjectType.Consumable_Orderdetails__c.getRecordTypeInfosByDeveloperName()
- .get('Detail1_ReturnGoods')
- .getRecordTypeId();
- //if (rtList.size() > 0) recordTypeId = rtList[0].Id;
+ Id recordTypeId = null;
+ if (rtList.size() > 0)
+ recordTypeId = rtList[0].Id;
results = [
SELECT Consumable_order__c, count(Id) noCount
diff --git a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml
index b571e13..2a09c48 100644
--- a/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml
+++ b/force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<ApexTrigger xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>50.0</apiVersion>
+ <apiVersion>40.0</apiVersion>
<status>Active</status>
</ApexTrigger>
--
Gitblit v1.9.1